- moved from DEVEL

Changed files:
    gimp-desktop.patch -> 1.5
    gimp-gcc4.patch -> 1.4
    gimp-nognome.patch -> 1.2

diff --git a/gimp-desktop.patch b/gimp-desktop.patch
new file mode 100644 (file)
index 0000000..e9eae29
--- /dev/null
+++ b/gimp-desktop.patch
@@ -0,0 +1,12 @@
+diff -aurN gimp-2.3.7.orig/desktop/gimp.desktop.in.in gimp-2.3.7/desktop/gimp.desktop.in.in
+--- gimp-2.3.7.orig/desktop/gimp.desktop.in.in 2006-01-23 15:46:14.000000000 +0100
++++ gimp-2.3.7/desktop/gimp.desktop.in.in      2006-02-09 15:09:20.415363016 +0100
+@@ -9,7 +9,7 @@
+ TryExec=gimp-@GIMP_APP_VERSION@
+ Icon=gimp
+ Terminal=false
+-Categories=Graphics;2DGraphics;RasterGraphics;GTK;
++Categories=GTK;GNOME;Graphics;RasterGraphics;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=GIMP
+ X-GNOME-Bugzilla-Component=General

diff --git a/gimp-gcc4.patch b/gimp-gcc4.patch
new file mode 100644 (file)
index 0000000..be098c4
--- /dev/null
+++ b/gimp-gcc4.patch
@@ -0,0 +1,11 @@
+--- gimp-2.2.4/app/actions/dialogs-actions.h.orig      2004-04-27 15:55:26.000000000 +0200
++++ gimp-2.2.4/app/actions/dialogs-actions.h   2005-03-12 21:47:08.443575392 +0100
+@@ -19,6 +19,8 @@
+ #ifndef __DIALOGS_ACTIONS_H__
+ #define __DIALOGS_ACTIONS_H__
+ 
++#include <widgets/gimpactiongroup.h>
++#include <widgets/widgets-types.h>
+ 
+ extern GimpStringActionEntry dialogs_dockable_actions[];
+ extern gint                  n_dialogs_dockable_actions;

diff --git a/gimp-nognome.patch b/gimp-nognome.patch
index 93424ea20d8bc361a063e6c2cdcc462531f0442c..90fdb02273ef3b1ee91531175578715cc5333391 100644 (file)
--- a/gimp-nognome.patch
+++ b/gimp-nognome.patch
@@ -1,12 +1,13 @@
---- gimp-2.3.10.orig/configure.in      2006-08-29 09:49:01.000000000 +0200
-+++ gimp-2.3.10/configure.in   2006-08-29 09:50:06.000000000 +0200
-@@ -1235,21 +1235,21 @@
- uri_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
+diff -ruN gimp-2.3.12./configure.in gimp-2.3.12/configure.in
+--- gimp-2.3.12./configure.in  2006-10-13 12:40:40.000000000 +0200
++++ gimp-2.3.12/configure.in   2006-10-13 12:45:49.550094250 +0200
+@@ -1232,21 +1232,21 @@
+ gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
  
  if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
 -  have_gnomeui=yes
 +  have_gnomeui="no (we dont use)"
-   uri_modules="$uri_modules libgnomeui-2.0"
+   gnome_vfs_modules="$gnome_vfs_modules libgnomeui-2.0"
  else
    have_gnomeui="no (libgnomeui-2.0 not found)"
  fi
@@ -14,12 +15,12 @@
  if $PKG_CONFIG --atleast-version=gnome_keyring_required_version gnome-keyring-1; then
 -  have_gnome_keyring=yes
 +  have_gnome_keyring="no (we dont use)"
-   uri_modules="$uri_modules gnome-keyring-1"
+   gnome_vfs_modules="$gnome_vfs_modules gnome-keyring-1"
  else
    have_gnome_keyring="no (gnome-keyring-1 not found)"
  fi
  
- PKG_CHECK_MODULES(URI, $uri_modules,
+ PKG_CHECK_MODULES(URI_GNOME_VFS, $gnome_vfs_modules,
 -  have_gnomevfs=yes,
 +  have_gnomevfs="no (we dont use)",
    have_gnomevfs="no (gnome-vfs-2.0 not found)")