From 1e6cbb76b7ceb0d1445edc90ef7d260209464d08 Mon Sep 17 00:00:00 2001 From: bernd Date: Fri, 4 Nov 2005 07:36:10 +0000 Subject: [PATCH] Update to gimp-2.2.9. ok fgsch@ --- graphics/gimp/stable/Makefile | 6 +- graphics/gimp/stable/distinfo | 8 +- .../gimp/stable/patches/patch-configure_in | 89 +++++-------------- .../gimp/stable/patches/patch-etc_Makefile_in | 8 +- graphics/gimp/stable/pkg/PFRAG.shared | 18 ++-- graphics/gimp/stable/pkg/PLIST | 22 ++--- 6 files changed, 52 insertions(+), 99 deletions(-) diff --git a/graphics/gimp/stable/Makefile b/graphics/gimp/stable/Makefile index 61839d5773b..8a026f2f7d6 100644 --- a/graphics/gimp/stable/Makefile +++ b/graphics/gimp/stable/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2005/07/08 07:50:55 fgsch Exp $ +# $OpenBSD: Makefile,v 1.7 2005/11/04 07:36:10 bernd Exp $ COMMENT= "GNU Image Manipulation Program" -DISTNAME= gimp-2.2.8 +DISTNAME= gimp-2.2.9 CATEGORIES= graphics DIR= gimp/v2.2 MASTER_SITES= ftp://ftp.gimp.org/pub/${DIR}/ \ @@ -44,7 +44,7 @@ AUTOCONF_VERSION= 2.59 CONFIGURE_STYLE= autoconf CONFIGURE_ARGS= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --disable-print --disable-gtkhtml --disable-svg \ +CONFIGURE_ARGS+= --disable-print --without-gtkhtml2 --without-librsvg \ --disable-sse CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/gimp/stable/distinfo b/graphics/gimp/stable/distinfo index 933cd119a9d..1459501656d 100644 --- a/graphics/gimp/stable/distinfo +++ b/graphics/gimp/stable/distinfo @@ -1,4 +1,4 @@ -MD5 (gimp-2.2.8.tar.gz) = 4147deec71221b3110f259901bbd2f27 -RMD160 (gimp-2.2.8.tar.gz) = a22527536fb492ca630f7d8721f22884716deb27 -SHA1 (gimp-2.2.8.tar.gz) = 1f6c9be3cc5feedf9b8526fee2ede4e2ac9de31e -SIZE (gimp-2.2.8.tar.gz) = 20186953 +MD5 (gimp-2.2.9.tar.gz) = 79fc876b112c088af14ba84c08c6abd3 +RMD160 (gimp-2.2.9.tar.gz) = 1290980d0a6a91fd76c812ce034a75a82e468706 +SHA1 (gimp-2.2.9.tar.gz) = cd8a9269b72376e8497c02c5e01b4d6dca679b33 +SIZE (gimp-2.2.9.tar.gz) = 18400967 diff --git a/graphics/gimp/stable/patches/patch-configure_in b/graphics/gimp/stable/patches/patch-configure_in index 2a10c2b2310..c21953d9031 100644 --- a/graphics/gimp/stable/patches/patch-configure_in +++ b/graphics/gimp/stable/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $ ---- configure.in.orig Fri May 13 13:01:31 2005 -+++ configure.in Wed Jul 6 02:37:31 2005 -@@ -883,7 +883,7 @@ AC_ARG_WITH(libtiff, [ --without-libti +$OpenBSD: patch-configure_in,v 1.2 2005/11/04 07:36:10 bernd Exp $ +--- configure.in.orig Tue Sep 20 18:23:58 2005 ++++ configure.in Thu Nov 3 14:14:41 2005 +@@ -896,7 +896,7 @@ AC_ARG_WITH(libtiff, [ --without-libti if test x$with_libtiff != xno && test -z "$LIBTIFF"; then AC_CHECK_LIB(tiff, TIFFReadScanline, [AC_CHECK_HEADER(tiffio.h, @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $ [AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])], [AC_CHECK_LIB(tiff, TIFFWriteScanline, [AC_CHECK_HEADER(tiffio.h, -@@ -893,7 +893,7 @@ AC_ARG_WITH(libtiff, [ --without-libti +@@ -906,7 +906,7 @@ AC_ARG_WITH(libtiff, [ --without-libti [AC_CHECK_HEADER(tiffio.h, TIFF='tiff$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz', [AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)])], @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $ fi if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -@@ -1019,9 +1019,9 @@ AC_ARG_WITH(libmng, [ --without-libmng +@@ -1032,9 +1032,9 @@ AC_ARG_WITH(libmng, [ --without-libmng test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then AC_CHECK_LIB(mng, mng_create, [AC_CHECK_HEADER(libmng.h, mng_ok=yes)], @@ -31,7 +31,7 @@ $OpenBSD: patch-configure_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $ else AC_MSG_WARN(*** MNG plug-in will not be built (MNG header file not found) ***) fi -@@ -1058,9 +1058,9 @@ AC_ARG_WITH(aa, [ --without-aa +@@ -1071,9 +1071,9 @@ AC_ARG_WITH(aa, [ --without-aa if test x$with_aa != xno && test -z "$LIBAA"; then AC_CHECK_LIB(aa, aa_printf, [AC_CHECK_HEADER(aalib.h, @@ -43,64 +43,17 @@ $OpenBSD: patch-configure_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $ fi AC_SUBST(AA) -@@ -1096,11 +1096,17 @@ AC_SUBST(LIBXPM) - # Check for gtkhtml2 - #################### - --PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version, -- have_gtkhtml2=yes, -- AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***])) --AC_SUBST(GTKHTML2_CFLAGS) --AC_SUBST(GTKHTML2_LIBS) -+AC_ARG_ENABLE(gtkhtml, [ --disable-gtkhtml do not build the Help Browser plug-in]) -+ -+have_gtkhtml2=no -+if test "x$enable_gtkhtml" != "xno"; then -+ have_gtkhtml2=yes -+ PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version, -+ have_gtkhtml2=yes, -+ AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***])) -+ AC_SUBST(GTKHTML2_CFLAGS) -+ AC_SUBST(GTKHTML2_LIBS) -+fi - AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes) - - -@@ -1108,14 +1114,17 @@ AM_CONDITIONAL(BUILD_HELPBROWSER, test x - # Check for librsvg - ################### - --PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version, -- SVG='svg$(EXEEXT)' -- LIBSVG=$SVG_LIBS, -- AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***])) --AC_SUBST(SVG) --AC_SUBST(SVG_CFLAGS) --AC_SUBST(LIBSVG) -+AC_ARG_ENABLE(svg, [ --enable-svg do not build the SVG import plug-in]) - -+if test "x$enable_svg" != "xno"; then -+ PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version, -+ SVG='svg$(EXEEXT)' -+ LIBSVG=$SVG_LIBS, -+ AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***])) -+ AC_SUBST(SVG) -+ AC_SUBST(SVG_CFLAGS) -+ AC_SUBST(LIBSVG) -+fi - - ###################### - # Check for gimp-print -@@ -1193,10 +1202,10 @@ AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile - AC_DEFINE(HAVE_LCMS_LCMS_H, 1, - [Define to 1 if the lcms header must be included as lcms/lcms.h])) - ]) --]) -+], , -lm) - - if test $have_lcms = yes; then -- LCMS_LIBS="-llcms" -+ LCMS_LIBS="-llcms -lm" - else - AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***]) - fi +@@ -1224,10 +1224,10 @@ if test "x$with_lcms" != xno; then + have_lcms=yes + AC_DEFINE(HAVE_LCMS_LCMS_H, 1, + [Define to 1 if the lcms header must be included as lcms/lcms.h])) +- ]) +- ]) ++ ], , -lm) ++ ], , -lm) + if test $have_lcms = yes; then +- LCMS_LIBS="-llcms" ++ LCMS_LIBS="-llcms -lm" + else + AC_MSG_WARN([*** color proof module will not be built (lcms not found or unusable) ***]) + fi diff --git a/graphics/gimp/stable/patches/patch-etc_Makefile_in b/graphics/gimp/stable/patches/patch-etc_Makefile_in index 433e3956b50..d6913995daa 100644 --- a/graphics/gimp/stable/patches/patch-etc_Makefile_in +++ b/graphics/gimp/stable/patches/patch-etc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-etc_Makefile_in,v 1.1 2005/07/08 07:50:56 fgsch Exp $ ---- etc/Makefile.in.orig Tue Jun 28 02:55:14 2005 -+++ etc/Makefile.in Tue Jun 28 02:55:38 2005 -@@ -341,7 +341,7 @@ exec_prefix = @exec_prefix@ +$OpenBSD: patch-etc_Makefile_in,v 1.2 2005/11/04 07:36:10 bernd Exp $ +--- etc/Makefile.in.orig Thu Oct 27 17:11:40 2005 ++++ etc/Makefile.in Thu Nov 3 12:51:23 2005 +@@ -367,7 +367,7 @@ exec_prefix = @exec_prefix@ gimpdatadir = @gimpdatadir@ gimpdir = @gimpdir@ gimpplugindir = @gimpplugindir@ diff --git a/graphics/gimp/stable/pkg/PFRAG.shared b/graphics/gimp/stable/pkg/PFRAG.shared index 1e6b7384f9d..1ec1a0fd9aa 100644 --- a/graphics/gimp/stable/pkg/PFRAG.shared +++ b/graphics/gimp/stable/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2005/07/08 07:50:56 fgsch Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2005/11/04 07:36:10 bernd Exp $ lib/gimp/2.0/modules/libcdisplay_colorblind.so lib/gimp/2.0/modules/libcdisplay_gamma.so lib/gimp/2.0/modules/libcdisplay_highcontrast.so @@ -7,11 +7,11 @@ lib/gimp/2.0/modules/libcolorsel_cmyk.so lib/gimp/2.0/modules/libcolorsel_triangle.so lib/gimp/2.0/modules/libcolorsel_water.so lib/gimp/2.0/modules/libcontroller_midi.so -@lib lib/libgimp-2.0.so.200.8 -@lib lib/libgimpbase-2.0.so.200.8 -@lib lib/libgimpcolor-2.0.so.200.8 -@lib lib/libgimpmath-2.0.so.200.8 -@lib lib/libgimpmodule-2.0.so.200.8 -@lib lib/libgimpthumb-2.0.so.200.8 -@lib lib/libgimpui-2.0.so.200.8 -@lib lib/libgimpwidgets-2.0.so.200.8 +@lib lib/libgimp-2.0.so.200.9 +@lib lib/libgimpbase-2.0.so.200.9 +@lib lib/libgimpcolor-2.0.so.200.9 +@lib lib/libgimpmath-2.0.so.200.9 +@lib lib/libgimpmodule-2.0.so.200.9 +@lib lib/libgimpthumb-2.0.so.200.9 +@lib lib/libgimpui-2.0.so.200.9 +@lib lib/libgimpwidgets-2.0.so.200.9 diff --git a/graphics/gimp/stable/pkg/PLIST b/graphics/gimp/stable/pkg/PLIST index 8c7825c45bd..ae932e3e55a 100644 --- a/graphics/gimp/stable/pkg/PLIST +++ b/graphics/gimp/stable/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2005/07/08 07:50:56 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.7 2005/11/04 07:36:10 bernd Exp $ %%SHARED%% bin/gimp bin/gimp-2.2 @@ -1349,6 +1349,7 @@ share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpRGB.html share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp share/gtk-doc/html/libgimpcolor/libgimpcolor.html share/gtk-doc/html/libgimpcolor/right.png +share/gtk-doc/html/libgimpcolor/style.css share/gtk-doc/html/libgimpcolor/up.png share/gtk-doc/html/libgimpmath/ share/gtk-doc/html/libgimpmath/home.png @@ -1362,6 +1363,7 @@ share/gtk-doc/html/libgimpmath/libgimpmath-GimpVector.html share/gtk-doc/html/libgimpmath/libgimpmath.devhelp share/gtk-doc/html/libgimpmath/libgimpmath.html share/gtk-doc/html/libgimpmath/right.png +share/gtk-doc/html/libgimpmath/style.css share/gtk-doc/html/libgimpmath/up.png share/gtk-doc/html/libgimpmodule/ share/gtk-doc/html/libgimpmodule/GimpModule.html @@ -1373,6 +1375,7 @@ share/gtk-doc/html/libgimpmodule/left.png share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp share/gtk-doc/html/libgimpmodule/libgimpmodule.html share/gtk-doc/html/libgimpmodule/right.png +share/gtk-doc/html/libgimpmodule/style.css share/gtk-doc/html/libgimpmodule/up.png share/gtk-doc/html/libgimpthumb/ share/gtk-doc/html/libgimpthumb/GimpThumbnail.html @@ -1427,6 +1430,7 @@ share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpHelpUI.html share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpQueryBox.html share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpStock.html +@comment share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpStock.html~ share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpWidgets.html share/gtk-doc/html/libgimpwidgets/libgimpwidgets-cell-renderers.html share/gtk-doc/html/libgimpwidgets/libgimpwidgets-colordisplay.html @@ -1746,8 +1750,6 @@ share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo share/locale/en_CA/LC_MESSAGES/gimp20-script-fu.mo share/locale/en_CA/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/en_CA/LC_MESSAGES/gimp20.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo share/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo @@ -1756,8 +1758,6 @@ share/locale/es/LC_MESSAGES/gimp20-libgimp.mo share/locale/es/LC_MESSAGES/gimp20-script-fu.mo share/locale/es/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/es/LC_MESSAGES/gimp20.mo -share/locale/eu/ -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/gimp20-libgimp.mo share/locale/eu/LC_MESSAGES/gimp20-script-fu.mo share/locale/eu/LC_MESSAGES/gimp20-std-plug-ins.mo @@ -1770,8 +1770,6 @@ share/locale/fr/LC_MESSAGES/gimp20-libgimp.mo share/locale/fr/LC_MESSAGES/gimp20-script-fu.mo share/locale/fr/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/fr/LC_MESSAGES/gimp20.mo -share/locale/ga/ -share/locale/ga/LC_MESSAGES/ share/locale/ga/LC_MESSAGES/gimp20-libgimp.mo share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo @@ -1814,6 +1812,12 @@ share/locale/lt/LC_MESSAGES/gimp20-libgimp.mo share/locale/lt/LC_MESSAGES/gimp20-script-fu.mo share/locale/lt/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/lt/LC_MESSAGES/gimp20.mo +share/locale/mk/ +share/locale/mk/LC_MESSAGES/ +share/locale/mk/LC_MESSAGES/gimp20-libgimp.mo +share/locale/mk/LC_MESSAGES/gimp20-script-fu.mo +share/locale/mk/LC_MESSAGES/gimp20-std-plug-ins.mo +share/locale/mk/LC_MESSAGES/gimp20.mo share/locale/ms/ share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo @@ -1862,8 +1866,6 @@ share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo share/locale/sk/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/sk/LC_MESSAGES/gimp20.mo -share/locale/sr/ -share/locale/sr/LC_MESSAGES/ share/locale/sr/LC_MESSAGES/gimp20-libgimp.mo share/locale/sr/LC_MESSAGES/gimp20-script-fu.mo share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo @@ -1886,8 +1888,6 @@ share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo share/locale/uk/LC_MESSAGES/gimp20-script-fu.mo share/locale/uk/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/uk/LC_MESSAGES/gimp20.mo -share/locale/vi/ -share/locale/vi/LC_MESSAGES/ share/locale/vi/LC_MESSAGES/gimp20-libgimp.mo share/locale/vi/LC_MESSAGES/gimp20-script-fu.mo share/locale/vi/LC_MESSAGES/gimp20-std-plug-ins.mo