OBS User unknown 2009-06-12 16:17:48 +00:00 committed by Git OBS Bridge
parent 0ff7cc8c3e
commit 4b3ee870b2
3 changed files with 78 additions and 7 deletions

@ -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"

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 11 04:09:03 CEST 2009 - vuntz@novell.com
- Add gimp-gegl-babl-versions-check.patch to fix the code used to
check the babl and gegl version. Taken from Fedora/upstream.
-------------------------------------------------------------------
Tue Mar 17 06:59:41 CET 2009 - mboman@suse.de

@ -45,7 +45,7 @@ BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXfixes-devel
Url: http://www.gimp.org/
Version: 2.6.6
Release: 1
Release: 2
License: GPL v2 or later
Group: Productivity/Graphics/Bitmap Editors
Suggests: AdobeICCProfiles
@ -55,6 +55,8 @@ Requires: %{name}-lang = %{version}
Requires: gtk2
Summary: The GNU Image Manipulation Program
Source: ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gimp-gegl-babl-versions-check.patch vuntz@novell.com -- Taken from Fedora/uptsream
Patch0: gimp-gegl-babl-versions-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding >= 2.4
Recommends: %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin
@ -872,6 +874,7 @@ Authors:
%lang_package
%prep
%setup -q
%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@ -961,6 +964,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/*
%changelog
* Thu Jun 11 2009 vuntz@novell.com
- Add gimp-gegl-babl-versions-check.patch to fix the code used to
check the babl and gegl version. Taken from Fedora/upstream.
* Tue Mar 17 2009 mboman@suse.de
- Update to version 2.6.6:
+ bgo#571117 lcms plug-in crashes on broken profile
@ -1195,10 +1201,10 @@ rm -rf $RPM_BUILD_ROOT
+ some code cleanup
+ lots of bug fixes
- Remove upstreamed gimp-psd-overflow.patch and gimp-sunras-overflow.patch.
* Wed Jul 18 2007 maw@suse.de
* Thu Jul 19 2007 maw@suse.de
- Respin gimp-psd-overflow.patch (http://bugzilla.gnome.org/show_bug.cgi?id=456042
and https://bugzilla.novell.com/show_bug.cgi?id=284288#c13).
* Tue Jul 03 2007 maw@suse.de
* Wed Jul 04 2007 maw@suse.de
- Add gimp-psd-overflow.patch (#284288 and CVE-2007-2949), fixing
a buffer overflow.
* Fri May 11 2007 pgajdos@suse.cz
@ -1267,7 +1273,7 @@ rm -rf $RPM_BUILD_ROOT
- Fixed random return value.
* Mon Nov 07 2005 sbrabec@suse.cz
- Updated to version 2.3.5.
* Wed Nov 02 2005 dmueller@suse.de
* Thu Nov 03 2005 dmueller@suse.de
- don't build as root
* Tue Sep 27 2005 sbrabec@suse.cz
- Updated to version 2.3.4.
@ -1294,7 +1300,7 @@ rm -rf $RPM_BUILD_ROOT
- Fixed devel requirements.
* Wed May 18 2005 sbrabec@suse.cz
- Updated to version 2.2.7.
* Mon May 09 2005 ro@suse.de
* Tue May 10 2005 ro@suse.de
- use -mmmx and -msse to compile asm-code for these extensions
* Tue Apr 12 2005 sbrabec@suse.cz
- Updated to version 2.2.6.
@ -1306,7 +1312,7 @@ rm -rf $RPM_BUILD_ROOT
- Updated to version 2.2.3.
* Mon Jan 17 2005 sbrabec@suse.cz
- Updated to version 2.2.2.
* Thu Jan 06 2005 ro@suse.de
* Fri Jan 07 2005 ro@suse.de
- postfix is in neededforbuild, so add "-sendmail" for PLUS
* Thu Jan 06 2005 sbrabec@suse.cz
- Updated to version 2.2.1.
@ -1342,7 +1348,7 @@ rm -rf $RPM_BUILD_ROOT
http://bugzilla.gnome.org/show_bug.cgi?id=139158
* Wed Apr 07 2004 sbrabec@suse.cz
- Fixed WMF plugin (#38582).
* Thu Mar 25 2004 mmj@suse.de
* Fri Mar 26 2004 mmj@suse.de
- Add postfix to # neededforbuild
* Wed Mar 24 2004 hhetter@suse.de
- updated to version 2.0.0 finally