- gcc 3.4 fix

Changed files:
    gimp-gcc34.patch -> 1.1
    gimp.spec -> 1.210

diff --git a/gimp-gcc34.patch b/gimp-gcc34.patch
new file mode 100644 (file)
index 0000000..3cec538
--- /dev/null
+++ b/gimp-gcc34.patch
@@ -0,0 +1,26 @@
+diff -ruN gimp-2.0pre4./libgimpwidgets/gimphelpui.c gimp-2.0pre4/libgimpwidgets/gimphelpui.c
+--- gimp-2.0pre4./libgimpwidgets/gimphelpui.c  2003-11-20 02:44:13.000000000 +0100
++++ gimp-2.0pre4/libgimpwidgets/gimphelpui.c   2004-03-05 22:14:37.244505088 +0100
+@@ -44,7 +44,7 @@
+                                                     GtkWidget       **help_widget,
+                                                     gpointer         *ret_data);
+ static gboolean   gimp_help_callback               (GtkWidget        *widget,
+-                                                    GtkWidgetHelpType help_type,
++                                                    GimpWidgetHelpType help_type,
+                                                     GimpHelpFunc      help_func);
+ 
+ static gboolean   gimp_context_help_idle_start     (gpointer          widget);
+diff -ruN gimp-2.0pre4./app/paint-funcs/paint-funcs.h gimp-2.0pre4/app/paint-funcs/paint-funcs.h
+--- gimp-2.0pre4./app/paint-funcs/paint-funcs.h        2004-03-03 23:22:38.000000000 +0100
++++ gimp-2.0pre4/app/paint-funcs/paint-funcs.h 2004-03-05 22:22:09.315779808 +0100
+@@ -352,8 +352,8 @@
+ 
+ void  initial_region                      (PixelRegion *, PixelRegion *,
+                                          PixelRegion *, guchar *,
+-                                         int, GimpLayerModeEffects, int *,
+-                                         CombinationMode);
++                                         gint, GimpLayerModeEffects,
++                                         gboolean *, InitialMode);
+ 
+ void  combine_regions                     (PixelRegion *, PixelRegion *,
+                                          PixelRegion *, PixelRegion *,

diff --git a/gimp.spec b/gimp.spec
index 8bb088dfb8333721b6e0b4139196c917f304cda8..4bceaf8cbd18a241ebe7a5c68d204ff931f54a8e 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -28,6 +28,7 @@ Source0:      ftp://ftp.gimp.org/pub/gimp/v2.0/testing/%{name}-%{version}%{pre}.tar.b
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-GIMP_VISIBLE_NAME.patch
 Patch2:                %{name}-locale-names.patch
+Patch3:                %{name}-gcc34.patch
 URL:           http://www.gimp.org/
 Icon:          gimp.gif
 %{?with_aalib:BuildRequires:   aalib-devel}
@@ -257,6 +258,7 @@ Wtyczka do drukowania dla Gimpa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 for dir in po po-libgimp po-plug-ins po-script-fu; do
        mv $dir/{no,nb}.po