From 1961eea567fe41070f1d2a95c808fc2484617a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarci=C5=84ski?= Date: Fri, 12 Mar 2004 09:34:09 +0000 Subject: [PATCH] Closer to the release --- gimp-current/Makefile | 26 ++++++++++----------- gimp-current/PLIST | 43 +++++++++++++++++++++-------------- gimp-current/TODO | 4 ---- gimp-current/distinfo | 10 +++----- gimp-current/patches/patch-aa | 21 ----------------- gimp-current/patches/patch-ab | 27 ---------------------- gimp-current/patches/patch-ac | 26 --------------------- gimp-current/patches/patch-ad | 12 ---------- 8 files changed, 42 insertions(+), 127 deletions(-) delete mode 100644 gimp-current/patches/patch-aa delete mode 100644 gimp-current/patches/patch-ab delete mode 100644 gimp-current/patches/patch-ac delete mode 100644 gimp-current/patches/patch-ad diff --git a/gimp-current/Makefile b/gimp-current/Makefile index 0c08cb9baa..df31813116 100644 --- a/gimp-current/Makefile +++ b/gimp-current/Makefile @@ -1,24 +1,24 @@ -# $NetBSD: Makefile,v 1.27 2004/02/25 11:57:06 moubctez Exp $ +# $NetBSD: Makefile,v 1.28 2004/03/12 09:34:09 moubctez Exp $ # -DISTNAME= gimp-${GIMP_VER} -PKGNAME= gimp-current-${GIMP_VER} -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.0/testing/ \ - ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v2.0/testing/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gimp/v2.0/testing/ \ - ftp://ftp.tuwien.ac.at/graphics/gimp/gimp/v2.0/testing/ -EXTRACT_SUFX= .tar.bz2 +DISTNAME= gimp-${GIMP_VER} +PKGNAME= gimp-current-${GIMP_VER} +CATEGORIES= graphics +MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.0/testing/ \ + ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v2.0/testing/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gimp/v2.0/testing/ \ + ftp://ftp.tuwien.ac.at/graphics/gimp/gimp/v2.0/testing/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://www.gimp.org/ -COMMENT= Image manipulation program similar to Photoshop[tm] +MAINTAINER= adam@NetBSD.org +HOMEPAGE= http://www.gimp.org/ +COMMENT= Image manipulation program similar to Photoshop[tm] BUILD_USES_MSGFMT= yes CONFLICTS+= gimp<=1.2.3 -GIMP_VER= 2.0pre3 +GIMP_VER= 2.0pre4 USE_BUILDLINK3= yes USE_LIBTOOL= yes diff --git a/gimp-current/PLIST b/gimp-current/PLIST index b45eaaac23..9651be70f7 100644 --- a/gimp-current/PLIST +++ b/gimp-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2004/02/09 14:55:56 moubctez Exp $ +@comment $NetBSD: PLIST,v 1.17 2004/03/12 09:34:09 moubctez Exp $ bin/gimp-1.3 bin/gimp-remote-1.3 bin/gimptool-2.0 @@ -310,43 +310,43 @@ lib/gimp/1.3/plug-ins/zealouscrop lib/libgimp-1.3.a lib/libgimp-1.3.la lib/libgimp-1.3.so -lib/libgimp-1.3.so.26 -lib/libgimp-1.3.so.26.0 +lib/libgimp-1.3.so.27 +lib/libgimp-1.3.so.27.0 lib/libgimpbase-1.3.a lib/libgimpbase-1.3.la lib/libgimpbase-1.3.so -lib/libgimpbase-1.3.so.26 -lib/libgimpbase-1.3.so.26.0 +lib/libgimpbase-1.3.so.27 +lib/libgimpbase-1.3.so.27.0 lib/libgimpcolor-1.3.a lib/libgimpcolor-1.3.la lib/libgimpcolor-1.3.so -lib/libgimpcolor-1.3.so.26 -lib/libgimpcolor-1.3.so.26.0 +lib/libgimpcolor-1.3.so.27 +lib/libgimpcolor-1.3.so.27.0 lib/libgimpmath-1.3.a lib/libgimpmath-1.3.la lib/libgimpmath-1.3.so -lib/libgimpmath-1.3.so.26 -lib/libgimpmath-1.3.so.26.0 +lib/libgimpmath-1.3.so.27 +lib/libgimpmath-1.3.so.27.0 lib/libgimpmodule-1.3.a lib/libgimpmodule-1.3.la lib/libgimpmodule-1.3.so -lib/libgimpmodule-1.3.so.26 -lib/libgimpmodule-1.3.so.26.0 +lib/libgimpmodule-1.3.so.27 +lib/libgimpmodule-1.3.so.27.0 lib/libgimpthumb-1.3.a lib/libgimpthumb-1.3.la lib/libgimpthumb-1.3.so -lib/libgimpthumb-1.3.so.26 -lib/libgimpthumb-1.3.so.26.0 +lib/libgimpthumb-1.3.so.27 +lib/libgimpthumb-1.3.so.27.0 lib/libgimpui-1.3.a lib/libgimpui-1.3.la lib/libgimpui-1.3.so -lib/libgimpui-1.3.so.26 -lib/libgimpui-1.3.so.26.0 +lib/libgimpui-1.3.so.27 +lib/libgimpui-1.3.so.27.0 lib/libgimpwidgets-1.3.a lib/libgimpwidgets-1.3.la lib/libgimpwidgets-1.3.so -lib/libgimpwidgets-1.3.so.26 -lib/libgimpwidgets-1.3.so.26.0 +lib/libgimpwidgets-1.3.so.27 +lib/libgimpwidgets-1.3.so.27.0 lib/pkgconfig/gimp-2.0.pc lib/pkgconfig/gimpthumb-2.0.pc lib/pkgconfig/gimpui-2.0.pc @@ -561,6 +561,8 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-curve-smooth-16.png share/doc/html/${PKGNAME}/libgimpwidgets/stock-default-colors-12.png share/doc/html/${PKGNAME}/libgimpwidgets/stock-device-status-16.png share/doc/html/${PKGNAME}/libgimpwidgets/stock-device-status-24.png +share/doc/html/${PKGNAME}/libgimpwidgets/stock-display-filter-16.png +share/doc/html/${PKGNAME}/libgimpwidgets/stock-display-filter-24.png share/doc/html/${PKGNAME}/libgimpwidgets/stock-duplicate-16.png share/doc/html/${PKGNAME}/libgimpwidgets/stock-edit-16.png share/doc/html/${PKGNAME}/libgimpwidgets/stock-error-64.png @@ -1049,6 +1051,7 @@ share/gimp/1.3/gradients/Yellow_Contrast.ggr share/gimp/1.3/gradients/Yellow_Orange.ggr share/gimp/1.3/images/gimp_logo.png share/gimp/1.3/images/gimp_splash.png +share/gimp/1.3/images/wilber-devel-icon.png share/gimp/1.3/images/wilber-icon.png share/gimp/1.3/images/wilber-tips.png share/gimp/1.3/images/wilber-wizard.png @@ -1328,6 +1331,8 @@ share/gimp/1.3/themes/Default/images/stock-curve-smooth-16.png share/gimp/1.3/themes/Default/images/stock-default-colors-12.png share/gimp/1.3/themes/Default/images/stock-device-status-16.png share/gimp/1.3/themes/Default/images/stock-device-status-24.png +share/gimp/1.3/themes/Default/images/stock-display-filter-16.png +share/gimp/1.3/themes/Default/images/stock-display-filter-24.png share/gimp/1.3/themes/Default/images/stock-duplicate-16.png share/gimp/1.3/themes/Default/images/stock-edit-16.png share/gimp/1.3/themes/Default/images/stock-error-64.png @@ -1563,6 +1568,10 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gimp20-libgimp.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gimp20-script-fu.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gimp20.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gimp20-script-fu.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gimp20-std-plug-ins.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gimp20.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo diff --git a/gimp-current/TODO b/gimp-current/TODO index 3882adbe24..0fefa7c336 100644 --- a/gimp-current/TODO +++ b/gimp-current/TODO @@ -1,5 +1,3 @@ -2.0pre4 out. - Doesn't compile, lots of: gimp-composite-mmx.c: In function `gimp_composite_valueonly_rgba8_rgba8_rgba8_mmx': gimp-composite-mmx.c:1422: unknown register name `%mm0' in `asm' @@ -11,5 +9,3 @@ gimp-composite-mmx.c:1441: unknown register name `%mm4' in `asm' gimp-composite-mmx.c:1441: unknown register name `%mm3' in `asm' gimp-composite-mmx.c:1441: unknown register name `%mm2' in `asm' gimp-composite-mmx.c:1441: unknown register name `%mm1' in `asm' - -Compiles fine on current/i386 as of December 14, 2003. diff --git a/gimp-current/distinfo b/gimp-current/distinfo index 13ab4ee779..0b5815d245 100644 --- a/gimp-current/distinfo +++ b/gimp-current/distinfo @@ -1,8 +1,4 @@ -$NetBSD: distinfo,v 1.17 2004/03/07 17:56:11 jmmv Exp $ +$NetBSD: distinfo,v 1.18 2004/03/12 09:34:09 moubctez Exp $ -SHA1 (gimp-2.0pre3.tar.bz2) = 2d832766891d676fdb327b5e70eed1cc3a782c2d -Size (gimp-2.0pre3.tar.bz2) = 12102800 bytes -SHA1 (patch-aa) = 2045d6025f054d1a8264d57b90b963e6325c4b44 -SHA1 (patch-ab) = 8ceb0d3320950381f4323faca80d67f975d143b8 -SHA1 (patch-ac) = b79fa601db849d255f25ba898209a56fcd72b22c -SHA1 (patch-ad) = 534c4919ad45b239cd6bfff16c3d850bacdea73d +SHA1 (gimp-2.0pre4.tar.bz2) = 09ccaf75dc832237a253b11a257deea6b0cd044f +Size (gimp-2.0pre4.tar.bz2) = 12807937 bytes diff --git a/gimp-current/patches/patch-aa b/gimp-current/patches/patch-aa deleted file mode 100644 index 9affdf3b3e..0000000000 --- a/gimp-current/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2004/03/01 17:08:11 mpasternak Exp $ - -Please do NOT touch this patch. It allows gimp-current to be built -on gcc earlier than 3.x . If you don't know, what it does, why is it -really needed, go and read a bit about differences between standards -supported by gcc 3.x and gcc 2.x, but first - do NOT touch it until it's -not needed (this has been fixed in gimp-cvs). - - -- dotz@irc.pl - ---- app/core/gimpchannel.c.orig Mon Mar 1 17:34:27 2004 -+++ app/core/gimpchannel.c -@@ -640,7 +640,7 @@ gimp_channel_stroke (GimpItem *item, - else if (GIMP_IS_PAINT_INFO (stroke_desc)) - { - GimpImage *gimage = gimp_item_get_image (item); -- GimpPaintInfo *paint_info = GIMP_PAINT_INFO (stroke_desc);; -+ GimpPaintInfo *paint_info = GIMP_PAINT_INFO (stroke_desc); - GimpPaintOptions *paint_options; - GimpPaintCore *core; - diff --git a/gimp-current/patches/patch-ab b/gimp-current/patches/patch-ab deleted file mode 100644 index c15c404aa9..0000000000 --- a/gimp-current/patches/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/03/01 17:08:11 mpasternak Exp $ - -Please see comments in patches/patch-aa before removing this file. -Thank you! - - -- dotz@irc.pl - ---- app/vectors/gimpvectors.c.orig Mon Mar 1 17:48:54 2004 -+++ app/vectors/gimpvectors.c -@@ -545,7 +545,7 @@ gimp_vectors_stroke (GimpItem *item, - GimpObject *stroke_desc, - gboolean use_default_values) - { -- GimpVectors *vectors = GIMP_VECTORS (item);; -+ GimpVectors *vectors = GIMP_VECTORS (item); - gboolean retval = FALSE; - - if (! vectors->strokes) -@@ -564,7 +564,7 @@ gimp_vectors_stroke (GimpItem *item, - else if (GIMP_IS_PAINT_INFO (stroke_desc)) - { - GimpImage *gimage = gimp_item_get_image (item); -- GimpPaintInfo *paint_info = GIMP_PAINT_INFO (stroke_desc);; -+ GimpPaintInfo *paint_info = GIMP_PAINT_INFO (stroke_desc); - GimpPaintOptions *paint_options; - GimpPaintCore *core; - diff --git a/gimp-current/patches/patch-ac b/gimp-current/patches/patch-ac deleted file mode 100644 index d908d4cfdb..0000000000 --- a/gimp-current/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/03/01 17:08:11 mpasternak Exp $ - -See comments in patches/patch-aa before removing this file. Thank you! - - -- dotz@irc.pl - ---- app/tools/gimptexttool.c.orig Mon Mar 1 17:50:58 2004 -+++ app/tools/gimptexttool.c -@@ -187,7 +187,7 @@ gimp_text_tool_control (GimpTool * - GimpToolAction action, - GimpDisplay *gdisp) - { -- GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);; -+ GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool); - - switch (action) - { -@@ -218,7 +218,7 @@ gimp_text_tool_button_press (GimpTool - GdkModifierType state, - GimpDisplay *gdisp) - { -- GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);; -+ GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool); - GimpDrawable *drawable; - GimpText *text = NULL; - gint off_x = 0; diff --git a/gimp-current/patches/patch-ad b/gimp-current/patches/patch-ad deleted file mode 100644 index 7079467977..0000000000 --- a/gimp-current/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/03/07 17:56:11 jmmv Exp $ - ---- data/misc/gimp.applications.in.orig 2004-01-27 04:45:01.000000000 +0100 -+++ data/misc/gimp.applications.in -@@ -1,6 +1,6 @@ - gimp-@GIMP_APP_VERSION@ - command=gimp-remote-@GIMP_APP_VERSION@ -- name=@GIMP_VISIBLE_NAME@ -+ name=The GIMP - can_open_multiple_files=true - expects_uris=non-file - requires_terminal=false