rpms/gimp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

use backported patch to correctly check gegl/babl versions

Browse Source
This commit is contained in:
Nils Philippsen 2009-06-05 08:28:30 +00:00
parent 5cbbbe04c4
commit 68a81d3b1b
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gimp-2.6.6-gegl-babl-versions-check.patch Normal file
View File

@ -0,0 +1,59 @@
diff -up gimp-2.6.6/app/sanity.c.gegl-babl-versions-check gimp-2.6.6/app/sanity.c
--- gimp-2.6.6/app/sanity.c.gegl-babl-versions-check 2008-11-20 23:43:08.000000000 +0100
+++ gimp-2.6.6/app/sanity.c 2009-06-05 10:26:03.043506642 +0200
@@ -75,6 +75,29 @@ sanity_check (void)
/* private functions */
+static gboolean
+sanity_check_version (guint major_version, guint required_major,
+ guint minor_version, guint required_minor,
+ guint micro_version, guint required_micro)
+{
+ if (major_version > required_major)
+ return TRUE;
+
+ if (major_version < required_major)
+ return FALSE;
+
+ if (minor_version > required_minor)
+ return TRUE;
+
+ if (minor_version < required_minor)
+ return FALSE;
+
+ if (micro_version >= required_micro)
+ return TRUE;
+
+ return FALSE;
+}
+
static gchar *
sanity_check_gimp (void)
{
@@ -266,9 +289,9 @@ sanity_check_babl (void)
&babl_minor_version,
&babl_micro_version);
- if (babl_major_version < BABL_REQUIRED_MAJOR ||
- babl_minor_version < BABL_REQUIRED_MINOR ||
- babl_micro_version < BABL_REQUIRED_MICRO)
+ if (! sanity_check_version (babl_major_version, BABL_REQUIRED_MAJOR,
+ babl_minor_version, BABL_REQUIRED_MINOR,
+ babl_micro_version, BABL_REQUIRED_MICRO))
{
return g_strdup_printf
("BABL version too old!\n\n"
@@ -304,9 +327,9 @@ sanity_check_gegl (void)
&gegl_minor_version,
&gegl_micro_version);
- if (gegl_major_version < GEGL_REQUIRED_MAJOR ||
- gegl_minor_version < GEGL_REQUIRED_MINOR ||
- gegl_micro_version < GEGL_REQUIRED_MICRO)
+ if (! sanity_check_version (gegl_major_version, GEGL_REQUIRED_MAJOR,
+ gegl_minor_version, GEGL_REQUIRED_MINOR,
+ gegl_micro_version, GEGL_REQUIRED_MICRO))
{
return g_strdup_printf
("GEGL version too old!\n\n"

5
gimp.spec
View File

@ -119,6 +119,7 @@ Source1: gimp-plugin-mgr.in
Patch0: gimp-2.6.2-xdg-open.patch Patch0: gimp-2.6.2-xdg-open.patch
Patch1: gimp-2.6.2-jpeg-units.patch Patch1: gimp-2.6.2-jpeg-units.patch
Patch2: gimp-2.6.6-minimize-dialogs.patch Patch2: gimp-2.6.6-minimize-dialogs.patch
Patch3: gimp-2.6.6-gegl-babl-versions-check.patch
%description %description
GIMP (GNU Image Manipulation Program) is a powerful image composition and GIMP (GNU Image Manipulation Program) is a powerful image composition and
@ -200,6 +201,7 @@ EOF
%patch0 -p1 -b .xdg-open %patch0 -p1 -b .xdg-open
%patch1 -p1 -b .jpeg-units %patch1 -p1 -b .jpeg-units
%patch2 -p1 -b .minimize-dialogs %patch2 -p1 -b .minimize-dialogs
%patch3 -p1 -b .gegl-babl-versions-check
%build %build
# if [ ! -f configure ]; then # if [ ! -f configure ]; then
@ -490,8 +492,9 @@ fi
%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
%changelog %changelog
* Thu Jun 04 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-4 * Fri Jun 05 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-4
- don't build against aalib on RHEL - don't build against aalib on RHEL
- use backported patch to correctly check gegl/babl versions
* Tue Apr 14 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-3 * Tue Apr 14 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-3
- remove rpaths from binaries (#495670) - remove rpaths from binaries (#495670)