Update to 2.0pre3.

5 files changed, 61 insertions, 28 deletions

diff --git a/graphics/gimp/files/patch-app_core_gimpchannel.c b/graphics/gimp/files/patch-app_core_gimpchannel.c
new file mode 100644
index 000000000000..e3abf5386ab3
--- /dev/null
+++ b/graphics/gimp/files/patch-app_core_gimpchannel.c
@@ -0,0 +1,11 @@
+--- app/core/gimpchannel.c.orig	Thu Feb  5 01:46:50 2004
++++ app/core/gimpchannel.c	Thu Feb  5 01:46:59 2004
+@@ -640,7 +640,7 @@
+   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/graphics/gimp/files/patch-app_tools_gimptexttool.c b/graphics/gimp/files/patch-app_tools_gimptexttool.c
new file mode 100644
index 000000000000..7fbf416afd36
--- /dev/null
+++ b/graphics/gimp/files/patch-app_tools_gimptexttool.c
@@ -0,0 +1,11 @@
+--- app/tools/gimptexttool.c.orig	Thu Feb  5 01:52:53 2004
++++ app/tools/gimptexttool.c	Thu Feb  5 01:53:00 2004
+@@ -218,7 +218,7 @@
+ 			     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/graphics/gimp/files/patch-app_vectors_gimpvectors.c b/graphics/gimp/files/patch-app_vectors_gimpvectors.c
new file mode 100644
index 000000000000..49c869645a8a
--- /dev/null
+++ b/graphics/gimp/files/patch-app_vectors_gimpvectors.c
@@ -0,0 +1,20 @@
+--- app/vectors/gimpvectors.c.orig	Thu Feb  5 01:49:20 2004
++++ app/vectors/gimpvectors.c	Thu Feb  5 01:50:25 2004
+@@ -545,7 +545,7 @@
+                      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 @@
+   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/graphics/gimp/files/patch-configure b/graphics/gimp/files/patch-configure
index f05feba3bfe1..a94cd64b435f 100644
--- a/graphics/gimp/files/patch-configure
+++ b/graphics/gimp/files/patch-configure
@@ -1,22 +1,24 @@
---- configure.orig	Thu Oct 10 18:44:32 2002
-+++ configure	Fri Oct 11 12:52:28 2002
-@@ -1462,7 +1462,7 @@
- 
- 
- LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
--LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE`
-+LT_CURRENT=2
- LT_REVISION=$GIMP_INTERFACE_AGE
- LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
- LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-@@ -17657,8 +17658,8 @@
+--- configure.orig	Tue Feb  3 20:25:57 2004
++++ configure	Thu Feb  5 02:13:22 2004
+@@ -1995,8 +1995,8 @@
+ 
+ 
+ 
+-LT_VERSION_INFO="26:0:0"
+-LT_CURRENT_MINUS_AGE=26
++LT_VERSION_INFO="2:0:0"
++LT_CURRENT_MINUS_AGE=2
+ 
+ 
+ 
+@@ -32842,8 +32842,8 @@
  fi
  fi;
  
--gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-+gimpdatadir=$datadir/$PACKAGE
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
- gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+-gimpdatadir="$datadir/$PACKAGE/1.3"
+-gimpplugindir="$libdir/$PACKAGE/1.3"
++gimpdatadir="$datadir/$PACKAGE"
++gimpplugindir="$libexecdir/$PACKAGE/1.3"
+ gimpsysconfdir="$sysconfdir/$PACKAGE/1.3"
  
  localedir='${prefix}/${DATADIRNAME}/locale'
diff --git a/graphics/gimp/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimp/files/patch-data_misc_gimp.desktop.in.in
deleted file mode 100644
index 03a3e522d44f..000000000000
--- a/graphics/gimp/files/patch-data_misc_gimp.desktop.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/misc/gimp.desktop.in.in.orig	Wed Jan 21 12:24:16 2004
-+++ data/misc/gimp.desktop.in.in	Wed Jan 21 12:27:36 2004
-@@ -3,7 +3,7 @@
- _Name=The GIMP (unstable)
- _Comment=Create and edit images or photographs
- TryExec=gimp-1.3
--Exec=gimp-remote-1.3 --new %U
-+Exec=gimp-1.3
- Icon=@gimpdatadir@/images/wilber-icon.png
- Terminal=false
- Type=Application