head 1.14; access; symbols pkgsrc-2026Q1:1.14.0.122 pkgsrc-2026Q1-base:1.14 pkgsrc-2025Q4:1.14.0.120 pkgsrc-2025Q4-base:1.14 pkgsrc-2025Q3:1.14.0.118 pkgsrc-2025Q3-base:1.14 pkgsrc-2025Q2:1.14.0.116 pkgsrc-2025Q2-base:1.14 pkgsrc-2025Q1:1.14.0.114 pkgsrc-2025Q1-base:1.14 pkgsrc-2024Q4:1.14.0.112 pkgsrc-2024Q4-base:1.14 pkgsrc-2024Q3:1.14.0.110 pkgsrc-2024Q3-base:1.14 pkgsrc-2024Q2:1.14.0.108 pkgsrc-2024Q2-base:1.14 pkgsrc-2024Q1:1.14.0.106 pkgsrc-2024Q1-base:1.14 pkgsrc-2023Q4:1.14.0.104 pkgsrc-2023Q4-base:1.14 pkgsrc-2023Q3:1.14.0.102 pkgsrc-2023Q3-base:1.14 pkgsrc-2023Q2:1.14.0.100 pkgsrc-2023Q2-base:1.14 pkgsrc-2023Q1:1.14.0.98 pkgsrc-2023Q1-base:1.14 pkgsrc-2022Q4:1.14.0.96 pkgsrc-2022Q4-base:1.14 pkgsrc-2022Q3:1.14.0.94 pkgsrc-2022Q3-base:1.14 pkgsrc-2022Q2:1.14.0.92 pkgsrc-2022Q2-base:1.14 pkgsrc-2022Q1:1.14.0.90 pkgsrc-2022Q1-base:1.14 pkgsrc-2021Q4:1.14.0.88 pkgsrc-2021Q4-base:1.14 pkgsrc-2021Q3:1.14.0.86 pkgsrc-2021Q3-base:1.14 pkgsrc-2021Q2:1.14.0.84 pkgsrc-2021Q2-base:1.14 pkgsrc-2021Q1:1.14.0.82 pkgsrc-2021Q1-base:1.14 pkgsrc-2020Q4:1.14.0.80 pkgsrc-2020Q4-base:1.14 pkgsrc-2020Q3:1.14.0.78 pkgsrc-2020Q3-base:1.14 pkgsrc-2020Q2:1.14.0.74 pkgsrc-2020Q2-base:1.14 pkgsrc-2020Q1:1.14.0.54 pkgsrc-2020Q1-base:1.14 pkgsrc-2019Q4:1.14.0.76 pkgsrc-2019Q4-base:1.14 pkgsrc-2019Q3:1.14.0.72 pkgsrc-2019Q3-base:1.14 pkgsrc-2019Q2:1.14.0.70 pkgsrc-2019Q2-base:1.14 pkgsrc-2019Q1:1.14.0.68 pkgsrc-2019Q1-base:1.14 pkgsrc-2018Q4:1.14.0.66 pkgsrc-2018Q4-base:1.14 pkgsrc-2018Q3:1.14.0.64 pkgsrc-2018Q3-base:1.14 pkgsrc-2018Q2:1.14.0.62 pkgsrc-2018Q2-base:1.14 pkgsrc-2018Q1:1.14.0.60 pkgsrc-2018Q1-base:1.14 pkgsrc-2017Q4:1.14.0.58 pkgsrc-2017Q4-base:1.14 pkgsrc-2017Q3:1.14.0.56 pkgsrc-2017Q3-base:1.14 pkgsrc-2017Q2:1.14.0.52 pkgsrc-2017Q2-base:1.14 pkgsrc-2017Q1:1.14.0.50 pkgsrc-2017Q1-base:1.14 pkgsrc-2016Q4:1.14.0.48 pkgsrc-2016Q4-base:1.14 pkgsrc-2016Q3:1.14.0.46 pkgsrc-2016Q3-base:1.14 pkgsrc-2016Q2:1.14.0.44 pkgsrc-2016Q2-base:1.14 pkgsrc-2016Q1:1.14.0.42 pkgsrc-2016Q1-base:1.14 pkgsrc-2015Q4:1.14.0.40 pkgsrc-2015Q4-base:1.14 pkgsrc-2015Q3:1.14.0.38 pkgsrc-2015Q3-base:1.14 pkgsrc-2015Q2:1.14.0.36 pkgsrc-2015Q2-base:1.14 pkgsrc-2015Q1:1.14.0.34 pkgsrc-2015Q1-base:1.14 pkgsrc-2014Q4:1.14.0.32 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.30 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.28 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.26 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.24 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.22 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.20 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.18 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.14.0.16 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.14 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.12 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.10 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.14.0.8 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.14.0.6 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.14.0.4 pkgsrc-2011Q2-base:1.14 pkgsrc-2011Q1:1.14.0.2 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.13.0.70 pkgsrc-2010Q4-base:1.13 pkgsrc-2010Q3:1.13.0.68 pkgsrc-2010Q3-base:1.13 pkgsrc-2010Q2:1.13.0.66 pkgsrc-2010Q2-base:1.13 pkgsrc-2010Q1:1.13.0.64 pkgsrc-2010Q1-base:1.13 pkgsrc-2009Q4:1.13.0.62 pkgsrc-2009Q4-base:1.13 pkgsrc-2009Q3:1.13.0.60 pkgsrc-2009Q3-base:1.13 pkgsrc-2009Q2:1.13.0.58 pkgsrc-2009Q2-base:1.13 pkgsrc-2009Q1:1.13.0.56 pkgsrc-2009Q1-base:1.13 pkgsrc-2008Q4:1.13.0.54 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.52 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.50 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.48 pkgsrc-2008Q2-base:1.13 cwrapper:1.13.0.46 pkgsrc-2008Q1:1.13.0.44 pkgsrc-2008Q1-base:1.13 pkgsrc-2007Q4:1.13.0.42 pkgsrc-2007Q4-base:1.13 pkgsrc-2007Q3:1.13.0.40 pkgsrc-2007Q3-base:1.13 pkgsrc-2007Q2:1.13.0.38 pkgsrc-2007Q2-base:1.13 pkgsrc-2007Q1:1.13.0.36 pkgsrc-2007Q1-base:1.13 pkgsrc-2006Q4:1.13.0.34 pkgsrc-2006Q4-base:1.13 pkgsrc-2006Q3:1.13.0.32 pkgsrc-2006Q3-base:1.13 pkgsrc-2006Q2:1.13.0.30 pkgsrc-2006Q2-base:1.13 pkgsrc-2006Q1:1.13.0.28 pkgsrc-2006Q1-base:1.13 pkgsrc-2005Q4:1.13.0.26 pkgsrc-2005Q4-base:1.13 pkgsrc-2005Q3:1.13.0.24 pkgsrc-2005Q3-base:1.13 pkgsrc-2005Q2:1.13.0.22 pkgsrc-2005Q2-base:1.13 pkgsrc-2005Q1:1.13.0.20 pkgsrc-2005Q1-base:1.13 pkgsrc-2004Q4:1.13.0.18 pkgsrc-2004Q4-base:1.13 pkgsrc-2004Q3:1.13.0.16 pkgsrc-2004Q3-base:1.13 pkgsrc-2004Q2:1.13.0.14 pkgsrc-2004Q2-base:1.13 pkgsrc-2004Q1:1.13.0.12 pkgsrc-2004Q1-base:1.13 pkgsrc-2003Q4:1.13.0.10 pkgsrc-2003Q4-base:1.13 netbsd-1-6-1:1.13.0.6 netbsd-1-6-1-base:1.13 netbsd-1-6:1.13.0.8 netbsd-1-6-RELEASE-base:1.13 pkgviews:1.13.0.4 pkgviews-base:1.13 buildlink2:1.13.0.2 buildlink2-base:1.13 netbsd-1-5-PATCH003:1.13 netbsd-1-5-PATCH001:1.11 netbsd-1-5-RELEASE:1.11 netbsd-1-4-PATCH003:1.11 netbsd-1-4-PATCH002:1.9 comdex-fall-1999:1.8 netbsd-1-4-PATCH001:1.6 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.14 date 2011.01.23.16.16.39; author wiz; state Exp; branches; next 1.13; 1.13 date 2002.03.19.16.16.08; author wiz; state Exp; branches; next 1.12; 1.12 date 2001.08.13.11.14.31; author rh; state Exp; branches; next 1.11; 1.11 date 2000.06.17.01.09.36; author wiz; state Exp; branches; next 1.10; 1.10 date 2000.06.09.11.06.21; author wiz; state dead; branches; next 1.9; 1.9 date 99.10.28.00.23.10; author jlam; state Exp; branches; next 1.8; 1.8 date 99.10.24.16.49.33; author tron; state Exp; branches; next 1.7; 1.7 date 99.10.09.20.12.10; author jlam; state Exp; branches; next 1.6; 1.6 date 99.03.09.23.00.38; author tron; state Exp; branches; next 1.5; 1.5 date 99.03.05.23.46.19; author tron; state Exp; branches; next 1.4; 1.4 date 99.01.06.00.42.37; author tron; state Exp; branches; next 1.3; 1.3 date 99.01.01.02.41.16; author garbled; state Exp; branches; next 1.2; 1.2 date 98.12.21.16.50.01; author tron; state Exp; branches; next 1.1; 1.1 date 98.09.04.13.13.17; author agc; state Exp; branches; next ; desc @@ 1.14 log @Fix build with png-1.5. From Marko Schuetz Schmuck in PR 44419. @ text @$NetBSD: patch-aa,v 1.13 2002/03/19 16:16:08 wiz Exp $ Fix build with png-1.5. --- gdk_imlib/io-png.c.orig 2002-03-04 17:06:29.000000000 +0000 +++ gdk_imlib/io-png.c @@@@ -40,13 +40,13 @@@@ loader_png (FILE * f, int *w, int *h, in return NULL; } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; } - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; @@@@ -275,13 +275,13 @@@@ inline_png(unsigned char *data, int data return NULL; } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; } - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; @@@@ -301,6 +301,9 @@@@ inline_png(unsigned char *data, int data /* Setup Translators */ if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_expand(png_ptr); + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + png_set_expand(png_ptr); + png_set_strip_16(png_ptr); png_set_packing(png_ptr); if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) @@@@ -440,13 +443,13 @@@@ _loader_alpha_png (FILE * f, int *w, int return NULL; } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; } - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; @@@@ -635,7 +638,7 @@@@ saver_png (GdkImlibImage *im, char *file png_destroy_write_struct(&png_ptr, (png_infopp) NULL); return 0; } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { fclose(f); png_destroy_write_struct(&png_ptr, (png_infopp) NULL); @ 1.13 log @Update to 1.9.13. Bugfix release. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 --- gdk_imlib/io-png.c.orig Mon Mar 4 17:26:51 2002 d7 33 a39 1 @@@@ -301,6 +301,9 @@@@ d49 25 @ 1.12 log @Update imlib to 1.9.11. Changes are bugfixes and the addition of man pages @ text @d3 1 a3 1 --- gdk_imlib/io-png.c.orig Sat Jul 28 16:15:16 2001 d5 1 a5 1 @@@@ -299,6 +299,9 @@@@ @ 1.11 log @Fix grayscale PNG display. Patch supplied by Dieter Baron in private mail. @ text @d3 3 a5 3 --- gdk_imlib/io-png.c.orig Sun Oct 3 21:17:35 1999 +++ gdk_imlib/io-png.c Sat Jun 17 02:58:44 2000 @@@@ -61,6 +61,9 @@@@ a14 26 @@@@ -97,7 +100,8 @@@@ png_read_image(png_ptr, lines); png_destroy_read_struct(&png_ptr, &info_ptr, NULL); ptr = data; - if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + if (color_type == PNG_COLOR_TYPE_GRAY + || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { for (y = 0; y < *h; y++) { @@@@ -122,6 +126,7 @@@@ } } } +#if 0 else if (color_type == PNG_COLOR_TYPE_GRAY) { for (y = 0; y < *h; y++) @@@@ -136,6 +141,7 @@@@ } } } +#endif else { for (y = 0; y < *h; y++) @ 1.10 log @USE_LIBTOOL & LTCONFIG_OVERRIDE -> minus one patch Also add some missing libraries to PLIST. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 1999/10/28 00:23:10 jlam Exp $ d3 8 a10 22 --- configure.orig Mon Oct 18 19:52:34 1999 +++ configure Wed Oct 27 20:20:38 1999 @@@@ -1531,6 +1531,7 @@@@ fi +if false; then # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" @@@@ -1831,6 +1832,7 @@@@ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. exec 5>>./config.log +fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 @@@@ -2400,6 +2402,9 @@@@ LIBS="$oLIBS" CFLAGS="$oCFLAGS" fi d12 29 a40 5 +# NetBSD's ld.so doesn't support library dependencies +dynworks=false if $dynworks; then imlib_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config" @ 1.9 log @Update to imlib-1.9.8. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Update "imlib" package to version 1.9.7 included in GNOME 1.0.53 release. @ text @d3 3 a5 4 --- configure.orig Tue Sep 7 01:53:10 1999 +++ configure Fri Oct 22 21:38:23 1999 @@@@ -1530,7 +1530,7 @@@@ ac_tool_prefix= d8 1 a8 1 - d13 4 a16 4 @@@@ -1827,6 +1827,7 @@@@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' a18 5 # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. @@@@ -5378,10 +5379,12 @@@@ top_srcdir="$ac_dots$ac_given_srcdir" ;; esac d20 8 a27 6 +if false; then case "$ac_given_INSTALL" in [/$]*) INSTALL="$ac_given_INSTALL" ;; *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac +fi d29 2 a30 2 echo creating "$ac_file" rm -f "$ac_file" @ 1.7 log @* change to use libungif instead of giflib * install library documentation @ text @d3 4 a6 3 --- configure.orig Wed Feb 24 18:44:38 1999 +++ configure Fri Oct 8 14:46:40 1999 @@@@ -1533,6 +1533,7 @@@@ d9 7 a16 1 +if false; then a17 6 # Check for any special flags to pass to ltconfig. @@@@ -1764,6 +1765,7 @@@@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } d22 1 a22 1 @@@@ -5325,10 +5327,12 @@@@ @ 1.6 log @Fix problem caused by Slowlaris support. @ text @d3 2 a4 2 --- configure.orig Thu Feb 25 00:44:38 1999 +++ configure Tue Mar 9 23:51:33 1999 d21 1 a21 9 @@@@ -2118,6 +2120,7 @@@@ else GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + GTK_LIBS=`echo "$GTK_LIBS -lintl"` gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ @@@@ -5325,10 +5328,12 @@@@ @ 1.5 log @Update "imlib" package to version 1.9.4. Because "imlib" works with our updated "png" package the included "libpng-1.0.1" has been removed. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 1999/01/06 00:42:37 tron Exp $ d3 4 a6 4 --- configure.orig Wed Dec 16 04:14:28 1998 +++ configure Wed Jan 6 01:36:14 1999 @@@@ -1174,6 +1174,7 @@@@ d12 3 a14 3 @@@@ -1253,6 +1254,7 @@@@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ d19 3 a21 3 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 @@@@ -1533,6 +1535,7 @@@@ d29 13 @ 1.4 log @"imlib" really doesn't work with "libpng-1.0.2". Because we can't upgrade "libpng" and don't want to downgrade it disable PNG support for now. @ text @d1 1 a1 1 $NetBSD$ a28 20 @@@@ -4130,7 +4133,7 @@@@ echo "configure: warning: *** Native GIF support will not be built (GIF header not found) ***" 1>&2 fi - +if false; then echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6 echo "configure:4136: checking for png_read_info in -lpng" >&5 ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'` @@@@ -4252,6 +4255,10 @@@@ png_ok=yes fi rm -f conftest* + +else + png_ok=no +fi echo "$ac_t""$png_ok" 1>&6 @ 1.3 log @apparently gtk now needs -lintl. Silence the beast. @ text @d2 3 a4 2 --- configure.orig Tue Dec 15 20:14:28 1998 +++ configure Thu Dec 31 19:35:27 1998 d29 2 a30 3 @@@@ -4234,24 +4237,6 @@@@ else echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2 d32 1 d34 12 a45 17 -echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6 -echo "configure:4240: checking for libpng version other than 1.0.2" >&5 -cat > conftest.$ac_ext < -PNG_LIBPNG_VER_STRING -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep ""1.0.2"" >/dev/null 2>&1; then - rm -rf conftest* - echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit -else - rm -rf conftest* - png_ok=yes -fi -rm -f conftest* @ 1.2 log @Update "imlib" package to version 1.8.2. @ text @d2 2 a3 3 --- configure.orig Wed Dec 16 04:14:28 1998 +++ configure Mon Dec 21 16:58:20 1998 d20 9 a28 1 @@@@ -4234,24 +4236,6 @@@@ @ 1.1 log @Add imlib-1.7, an image manipulation library for X11, to the NetBSD packages collection. @ text @d3 4 a6 6 Use NetBSD's libtool --- configure.orig Tue Sep 1 16:50:33 1998 +++ configure Tue Sep 1 16:51:04 1998 @@@@ -1209,6 +1209,7 @@@@ fi d12 1 a12 1 # Check for any special flags to pass to ltconfig. d19 27 a45 2 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @