packages: gimp/gimp.spec, gimp/gimp-sanity.patch (NEW) - work around broken...

[patrys]

Author: patrys                       Date: Thu Jul 16 12:38:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- work around broken sanity checks so it works with current babl and gegl
- rel 5

---- Files affected:
packages/gimp:
   gimp.spec (1.313 -> 1.314) , gimp-sanity.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gimp/gimp.spec
diff -u packages/gimp/gimp.spec:1.313 packages/gimp/gimp.spec:1.314
--- packages/gimp/gimp.spec:1.313	Sat Jul 11 21:55:25 2009
+++ packages/gimp/gimp.spec	Thu Jul 16 14:38:43 2009
@@ -25,7 +25,7 @@
 Summary(zh_TW.UTF-8):	[圖像]GNU圖象處理工具
 Name:		gimp
 Version:	2.6.6
-Release:	4
+Release:	5
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
@@ -34,6 +34,7 @@
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-gcc4.patch
+Patch3:		%{name}-sanity.patch
 URL:		http://www.gimp.org/
 %{?with_aalib:BuildRequires:	aalib-devel}
 BuildRequires:	alsa-lib-devel >= 1.0.11
@@ -524,6 +525,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.314  2009/07/16 12:38:43  patrys
+- work around broken sanity checks so it works with current babl and gegl
+- rel 5
+
 Revision 1.313  2009/07/11 19:55:25  arekm
 - release 4
 

================================================================
Index: packages/gimp/gimp-sanity.patch
diff -u /dev/null packages/gimp/gimp-sanity.patch:1.1
--- /dev/null	Thu Jul 16 14:38:48 2009
+++ packages/gimp/gimp-sanity.patch	Thu Jul 16 14:38:42 2009
@@ -0,0 +1,24 @@
+--- gimp/app/sanity.c~	2008-11-20 23:43:08.000000000 +0100
++++ gimp/app/sanity.c	2009-07-16 14:31:04.372896443 +0200
+@@ -268,7 +268,8 @@
+ 
+   if (babl_major_version < BABL_REQUIRED_MAJOR ||
+       babl_minor_version < BABL_REQUIRED_MINOR ||
+-      babl_micro_version < BABL_REQUIRED_MICRO)
++      (babl_minor_version == BABL_REQUIRED_MINOR &&
++       babl_micro_version < BABL_REQUIRED_MICRO))
+     {
+       return g_strdup_printf
+         ("BABL version too old!\n\n"
+--- gimp/app/sanity.c~	2009-07-16 14:32:02.917908312 +0200
++++ gimp/app/sanity.c	2009-07-16 14:34:55.401254723 +0200
+@@ -307,7 +307,8 @@
+ 
+   if (gegl_major_version < GEGL_REQUIRED_MAJOR ||
+       gegl_minor_version < GEGL_REQUIRED_MINOR ||
+-      gegl_micro_version < GEGL_REQUIRED_MICRO)
++      (gegl_minor_version == GEGL_REQUIRED_MINOR &&
++       gegl_micro_version < GEGL_REQUIRED_MICRO))
+     {
+       return g_strdup_printf
+         ("GEGL version too old!\n\n"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gimp/gimp.spec?r1=1.313&r2=1.314&f=u