rpms/gtk2/devel pixbuf-loader.patch,NONE,1.1 gtk2.spec,1.295,1.296

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29683

Modified Files:
	gtk2.spec 
Added Files:
	pixbuf-loader.patch 
Log Message:
fix a problem with some pixbuf loaders


pixbuf-loader.patch:

--- NEW FILE pixbuf-loader.patch ---
Index: gdk-pixbuf/io-icns.c
===================================================================
--- gdk-pixbuf/io-icns.c	(revision 20245)
+++ gdk-pixbuf/io-icns.c	(working copy)
@@ -364,7 +364,7 @@
   return pixbuf;
 }
 
-#ifndef INCLUDE_png
+#ifndef INCLUDE_icns
 #define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
 #define MODULE_ENTRY(function) void _gdk_pixbuf__icns_ ## function
Index: gdk-pixbuf/io-ico.c
===================================================================
--- gdk-pixbuf/io-ico.c	(revision 20245)
+++ gdk-pixbuf/io-ico.c	(working copy)
@@ -1184,7 +1184,7 @@
 	return TRUE;
 }
 
-#ifndef INCLUDE_png
+#ifndef INCLUDE_ico
 #define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
 #define MODULE_ENTRY(function) void _gdk_pixbuf__ico_ ## function
Index: gdk-pixbuf/io-jasper.c
===================================================================
--- gdk-pixbuf/io-jasper.c	(revision 20245)
+++ gdk-pixbuf/io-jasper.c	(working copy)
@@ -262,7 +262,7 @@
 	return TRUE;
 }
 
-#ifndef INCLUDE_png
+#ifndef INCLUDE_jasper
 #define MODULE_ENTRY(function) G_MODULE_EXPORT void function
 #else
 #define MODULE_ENTRY(function) void _gdk_pixbuf__jasper_ ## function


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gtk2.spec	30 May 2008 05:59:44 -0000	1.295
+++ gtk2.spec	30 May 2008 13:40:43 -0000	1.296
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2
@@ -37,6 +37,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=521032
 Patch4: filechooser-auth.patch
 
+# fixed upstream
+Patch5: pixbuf-loader.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -123,6 +126,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .system-log-crash
 %patch4 -p1 -b .filechooser-auth
+%patch5 -p1 -b .pixbuf-loader
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -306,6 +310,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Fri May 30 2008 Matthias Clasen  <mclasen at redhat.com> - 2.13.1-2
+- Fix a problem with some pixbuf loaders
+
 * Fri May 30 2008 Matthias Clasen  <mclasen at redhat.com> - 2.13.1-1
 - Update to 2.13.1