head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.122 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.120 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.118 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.116 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.114 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.112 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.110 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.108 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.106 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.104 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.102 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.100 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.98 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.96 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.94 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.92 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.90 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.88 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.86 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.84 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.82 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.80 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.78 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.74 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.54 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.76 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.72 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.70 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.68 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.66 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.64 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.62 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.60 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.58 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.56 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.52 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.50 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.48 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.46 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.44 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.42 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.40 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.38 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.36 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.34 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.32 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.30 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.28 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.26 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.24 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.22 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.20 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.18 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.16 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.14 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.12 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.10 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.8 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.6 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.4 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.2 pkgsrc-2011Q1-base:1.9 pkgsrc-2009Q4:1.8.0.46 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.36 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.34 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.32 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.30 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.28 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.26 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.24 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.22 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.20 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.18 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.16 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.14 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.12 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.10 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.8 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.6 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 netbsd-1-6:1.7.0.8 netbsd-1-6-RELEASE-base:1.7 pkgviews:1.7.0.4 pkgviews-base:1.7 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.3; locks; strict; comment @# @; 1.9 date 2011.01.23.16.16.39; author wiz; state Exp; branches; next 1.8; 1.8 date 2002.08.25.18.39.12; author jlam; state dead; branches; next 1.7; 1.7 date 2002.03.29.18.01.14; author wiz; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2001.08.23.04.47.54; author jlam; state Exp; branches; next 1.5; 1.5 date 2001.08.13.11.14.31; author rh; state Exp; branches; next 1.4; 1.4 date 2001.06.16.19.56.16; author jlam; state Exp; branches; next 1.3; 1.3 date 2001.03.10.13.04.08; author wiz; state Exp; branches; next 1.2; 1.2 date 99.03.05.23.46.20; author tron; state dead; branches; next 1.1; 1.1 date 99.01.16.02.38.43; author tron; state Exp; branches; next ; 1.7.2.1 date 2002.06.24.06.03.42; author jlam; state dead; branches; next ; desc @@ 1.9 log @Fix build with png-1.5. From Marko Schuetz Schmuck in PR 44419. @ text @$NetBSD$ Fix build with png-1.5. --- Imlib/save.c.orig 2004-09-21 00:22:59.000000000 +0000 +++ Imlib/save.c @@@@ -342,7 +342,7 @@@@ Imlib_save_image(ImlibData * id, ImlibIm 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.8 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2002/03/29 18:01:14 wiz Exp $ d3 13 a15 52 --- configure.in.orig Fri Mar 22 15:51:24 2002 +++ configure.in @@@@ -32,6 +32,8 @@@@ fi ]) +AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + dynworks=false if test x$with_modules = xno; then AC_MSG_RESULT(no) @@@@ -41,8 +43,8 @@@@ if test "x$GDK_IMLIB" != x; then oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" - CFLAGS="$CFLAGS `glib-config --cflags gmodule`" + LIBS="$LIBS `$GLIB_CONFIG --libs gmodule`" + CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gmodule`" AC_TRY_RUN([ #include #include @@@@ -74,8 +76,8 @@@@ if $dynworks; then AC_DEFINE(USE_GMODULE) - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" + GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" + GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" AC_SUBST(GMODULE_LIBS) AC_SUBST(GMODULE_FLAGS) fi @@@@ -139,7 +141,9 @@@@ GX_LIBS="$GTK_LIBS" fi -CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" +if test -z "$X_LDFLAGS"; then + X_LDFLAGS= +fi SUPPORT_LIBS="" @@@@ -309,6 +313,7 @@@@ AC_SUBST(CPPFLAGS) AC_SUBST(X_CFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(X_LDFLAGS) AC_SUBST(X_PRE_LIBS) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) @ 1.7 log @Update to 1.9.14. Changes since 1.9.13: * load.c: Fixed reported bug. If Imlib thought it needed a fallback, bad things will happen. * utils.c: Removed the open/close_helper functions. A little less bloat now removed. @ text @d1 1 a1 1 $NetBSD$ @ 1.7.2.1 log @Simplify some patches and remove others now that buildlink2 does most of the work. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2002/03/29 18:01:14 wiz Exp $ @ 1.6 log @Fix typo (-jpeg -> -ljpeg) that was propagated to imlib-config. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2001/08/13 11:14:31 rh Exp $ d3 1 a3 1 --- configure.in.orig Wed Aug 1 00:12:24 2001 d36 1 a36 1 @@@@ -153,7 +155,9 @@@@ d47 1 a47 12 @@@@ -245,8 +249,8 @@@@ dnl Test for libtiff AC_CHECK_LIB(tiff, TIFFReadScanline, AC_CHECK_HEADER(tiffio.h, - TIFFLIBS="-ltiff" - SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; AC_DEFINE(HAVE_LIBTIFF), + TIFFLIBS="-ltiff -ljpeg -lz" + SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; AC_DEFINE(HAVE_LIBTIFF), AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header files not found) ***)), AC_CHECK_LIB(tiff, TIFFWriteScanline, AC_CHECK_HEADER(tiffio.h, @@@@ -334,6 +338,7 @@@@ @ 1.5 log @Update imlib to 1.9.11. Changes are bugfixes and the addition of man pages @ text @d1 1 a1 1 $NetBSD$ d54 1 a54 1 + SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -jpeg -lz"; AC_DEFINE(HAVE_LIBTIFF), @ 1.4 log @Refer to glib-config as $GLIB_CONFIG in configure script, and add X_LDFLAGS variable for X libraries linker flags. @ text @d3 3 a5 3 --- configure.in.orig Sat May 20 02:24:10 2000 +++ configure.in Fri Jun 15 22:52:42 2001 @@@@ -34,6 +34,8 @@@@ d14 1 a14 1 @@@@ -43,8 +45,8 @@@@ d25 1 a25 1 @@@@ -76,8 +78,8 @@@@ d35 2 a36 2 AC_MSG_RESULT(yes) @@@@ -157,7 +159,9 @@@@ d47 12 a58 1 @@@@ -338,6 +342,7 @@@@ @ 1.3 log @Fix path for convert and other ImageMagick tools. Addresses pkg/11313. Also comment out broken parts of libpng and libjpeg tests (though it doesn't seem to change much). @ text @d3 5 a7 5 --- configure.in.orig Sat May 20 08:24:10 2000 +++ configure.in @@@@ -98,10 +98,12 @@@@ AC_PATH_PROG(DJPEG_PROG, djpeg) AC_PATH_PROG(CJPEG_PROG, cjpeg) d9 17 a25 11 -AC_PATH_PROG(CONVERT_PROG, convert) -echo "CONVERT_PROG is $CONVERT_PROG" -CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'` -echo "CONVERT_PATH is $CONVERT_PATH" +#AC_PATH_PROG(CONVERT_PROG, convert) +#echo "CONVERT_PROG is $CONVERT_PROG" +#CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'` +#echo "CONVERT_PATH is $CONVERT_PATH" +echo "overriding CONVERT_PATH=@@LOCALBASE@@/bin" +CONVERT_PATH=@@LOCALBASE@@/bin AC_SUBST(CONVERT_PATH) d27 12 a38 30 AC_PATH_PROG(GIFTOPNM_PROG, giftopnm) @@@@ -228,23 +230,23 @@@@ jpeg_ok=yes, jpeg_ok=no AC_MSG_WARN(*** Native JPEG support will not be built (JPEG library not found) ***), $GX_LIBS) -if test "$jpeg_ok" = yes; then - AC_MSG_CHECKING([for jpeglib.h]) - AC_TRY_CPP( -[#include +#if test "$jpeg_ok" = yes; then +# AC_MSG_CHECKING([for jpeglib.h]) +# AC_TRY_CPP( +#[#include #undef PACKAGE #undef VERSION #include ], - jpeg_ok=yes, - jpeg_ok=no) - AC_MSG_RESULT($jpeg_ok) +# jpeg_ok=yes, +# jpeg_ok=no) +# AC_MSG_RESULT($jpeg_ok) if test "$jpeg_ok" = yes; then JPEGLIBS="-ljpeg" SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; AC_DEFINE(HAVE_LIBJPEG) else AC_MSG_WARN(*** Native JPEG support will not be built (JPEG header file not found) ***) fi -fi +#fi d40 4 a43 34 dnl Test for libtiff AC_CHECK_LIB(tiff, TIFFReadScanline, @@@@ -284,20 +286,20 @@@@ png_ok=yes, png_ok=no), AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), -lz -lm $GX_LIBS) -if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png_structp in png.h]) - AC_TRY_COMPILE([#include ], - [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct -; png_set_IHDR;], - png_ok=yes, - png_ok=no) - AC_MSG_RESULT($png_ok) - if test "$png_ok" = no; then - AC_MSG_WARN(*** Native PNG support will not be built (PNG library is too old) ***) - fi -else - AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) -fi +#if test "$png_ok" = yes; then +# AC_MSG_CHECKING([for png_structp in png.h]) +# AC_TRY_COMPILE([#include ], +# [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct +#; png_set_IHDR;], +# png_ok=yes, +# png_ok=no) +# AC_MSG_RESULT($png_ok) +# if test "$png_ok" = no; then +# AC_MSG_WARN(*** Native PNG support will not be built (PNG library is too old) ***) +# fi +#else +# AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) +#fi d45 10 a54 2 dnl If we HAVE libpng at all, we make this check :) #if test "$png_ok" = yes; then @ 1.2 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-ad,v 1.1 1999/01/16 02:38:43 tron Exp $ d3 5 a7 3 --- utils/Makefile.in.orig Wed Dec 16 04:15:44 1998 +++ utils/Makefile.in Tue Jan 12 00:29:33 1999 @@@@ -94,7 +94,7 @@@@ d9 11 a19 1 imlib_config_SOURCES = imlib_config.c icons.c testimg.c d21 68 a88 14 -LDADD = ../gdk_imlib/libgdk_imlib.la $(GTK_LIBS) +LDADD = ../gdk_imlib/libgdk_imlib.la ../../libpng-1.0.1/libpng101.la $(GTK_LIBS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@@@ -105,7 +105,7 @@@@ LIBS = @@LIBS@@ imlib_config_OBJECTS = imlib_config.o icons.o testimg.o imlib_config_LDADD = $(LDADD) -imlib_config_DEPENDENCIES = ../gdk_imlib/libgdk_imlib.la +imlib_config_DEPENDENCIES = ../gdk_imlib/libgdk_imlib.la ../../libpng-1.0.1/libpng101.la imlib_config_LDFLAGS = CFLAGS = @@CFLAGS@@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @ 1.1 log @The never ending gnome story: Update "imlib" package to version 1.9.0 and bundle "libpng" 1.0.1 with it. @ text @d1 1 a1 1 $NetBSD$ @