- bump gegl dep to 0.3.0 (patch from debian)

diff --git a/bump_Babl-GEGL_versions.patch b/bump_Babl-GEGL_versions.patch
new file mode 100644 (file)
index 0000000..41c5134
--- /dev/null
+++ b/bump_Babl-GEGL_versions.patch
@@ -0,0 +1,46 @@
+diff --git a/app/sanity.c b/app/sanity.c
+index febddfb..85fea55 100644
+--- a/app/sanity.c
++++ b/app/sanity.c
+@@ -351,7 +351,7 @@ sanity_check_babl (void)
+ 
+ #define BABL_REQUIRED_MAJOR 0
+ #define BABL_REQUIRED_MINOR 1
+-#define BABL_REQUIRED_MICRO 10
++#define BABL_REQUIRED_MICRO 12
+ 
+   babl_get_version (&babl_major_version,
+                     &babl_minor_version,
+@@ -388,7 +388,7 @@ sanity_check_gegl (void)
+   gint gegl_micro_version;
+ 
+ #define GEGL_REQUIRED_MAJOR 0
+-#define GEGL_REQUIRED_MINOR 2
++#define GEGL_REQUIRED_MINOR 3
+ #define GEGL_REQUIRED_MICRO 0
+ 
+   gegl_get_version (&gegl_major_version,
+diff --git a/configure.ac b/configure.ac
+index 26812b6..4252fe9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,8 +40,8 @@ m4_define([gimp_stable],
+ m4_define([gimp_full_name], [GNU Image Manipulation Program])
+ 
+ # required versions of other packages
+-m4_define([babl_required_version], [0.1.10])
+-m4_define([gegl_required_version], [0.2.0])
++m4_define([babl_required_version], [0.1.12])
++m4_define([gegl_required_version], [0.3.0])
+ m4_define([glib_required_version], [2.30.2])
+ m4_define([atk_required_version], [2.2.0])
+ m4_define([gtk_required_version], [2.24.10])
+@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
+ ###############################
+ 
+ PKG_CHECK_MODULES(BABL, babl >= babl_required_version)
+-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version)
++PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
+ PKG_CHECK_MODULES(ATK, atk >= atk_required_version)
+ 
+ AM_PATH_GLIB_2_0(glib_required_version, :,

diff --git a/gimp.spec b/gimp.spec
index 7e81392c0c022f9fda240b9a9214e14303d4167a..fd100dc14b63335f5751f94df79d86cbb84d7960 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -28,6 +28,7 @@ Source0:      http://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-gcc4.patch
+Patch3:                bump_Babl-GEGL_versions.patch
 URL:           http://www.gimp.org/
 %{?with_aalib:BuildRequires:   aalib-devel}
 BuildRequires: alsa-lib-devel >= 1.0.11
@@ -41,7 +42,7 @@ BuildRequires:        dbus-glib-devel >= 0.70
 BuildRequires: docbook-dtd412-xml
 BuildRequires: fontconfig-devel >= 2.2.0
 BuildRequires: gdk-pixbuf2-devel >= 2.24.1
-BuildRequires: gegl-devel >= 0.2.0
+BuildRequires: gegl-devel >= 0.3.0
 BuildRequires: gettext-tools
 BuildRequires: ghostscript-devel
 BuildRequires: giflib-devel
@@ -81,7 +82,7 @@ Requires:     babl >= 0.1.10
 Requires:      curl >= 7.15.1
 Requires:      dbus-glib >= 0.70
 Requires:      fontconfig-libs >= 2.2.0
-Requires:      gegl >= 0.2.0
+Requires:      gegl >= 0.3.0
 Requires:      hicolor-icon-theme
 Requires:      lcms2 >= 2.2
 Requires:      libexif >= 0.6.15
@@ -325,6 +326,7 @@ Wtyczka SVG dla GIMPa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__rm} acinclude.m4