diff --git a/gtk2.spec b/gtk2.spec index a3bb00b..2ebdef6 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -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 @@ Patch3: system-log-crash.patch # 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 @@ docs for the GTK+ widget toolkit. %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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-2.0 %changelog +* Fri May 30 2008 Matthias Clasen - 2.13.1-2 +- Fix a problem with some pixbuf loaders + * Fri May 30 2008 Matthias Clasen - 2.13.1-1 - Update to 2.13.1 diff --git a/pixbuf-loader.patch b/pixbuf-loader.patch new file mode 100644 index 0000000..70087c7 --- /dev/null +++ b/pixbuf-loader.patch @@ -0,0 +1,39 @@ +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