diff --git a/.gitignore b/.gitignore index c340360..ae1b5bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gtk+-2.24.7.tar.xz /gtk+-2.24.8.tar.xz /gtk+-2.24.9.tar.xz +/gtk+-2.24.10.tar.xz diff --git a/gtk2-fixdso.patch b/gtk2-fixdso.patch deleted file mode 100644 index 6bbc1bd..0000000 --- a/gtk2-fixdso.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- gtk/Makefile.in.orig 2012-02-02 00:04:08.937777889 +0100 -+++ gtk/Makefile.in 2012-02-02 00:04:32.399182680 +0100 -@@ -1592,7 +1592,7 @@ - libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) - libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) - libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) --libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid -+libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid -lgmodule-2.0 - libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) - libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) - libgtk_x11_2_0_la_LIBADD = $(libadd) ---- modules/engines/ms-windows/Makefile.in.orig 2012-02-02 00:23:20.954125712 +0100 -+++ modules/engines/ms-windows/Makefile.in 2012-02-02 00:24:12.550047028 +0100 -@@ -442,7 +442,7 @@ - xp_theme.h - - libwimp_la_LDFLAGS = \ -- -avoid-version -module -no-undefined -export-dynamic -+ -avoid-version -module -no-undefined -export-dynamic -lgmodule-2.0 - - libwimp_la_LIBADD = $(LDADDS) -lgdi32 - all: all-recursive ---- modules/other/gail/Makefile.in.orig 2012-02-02 00:36:41.391489815 +0100 -+++ modules/other/gail/Makefile.in 2012-02-02 00:36:58.311794628 +0100 -@@ -610,7 +610,7 @@ - libgail_la_LDFLAGS = \ - -rpath $(moduledir) -module -avoid-version \ - $(no_undefined) \ -- $(LDFLAGS) -+ $(LDFLAGS) -lgmodule-2.0 - - all: all-recursive - diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec index 12ee693..2a8ef5c 100644 --- a/mingw32-gtk2.spec +++ b/mingw32-gtk2.spec @@ -3,7 +3,7 @@ %define __debug_install_post %{_mingw32_debug_install_post} Name: mingw32-gtk2 -Version: 2.24.9 +Version: 2.24.10 Release: 1%{?dist} Summary: MinGW Windows Gtk2 library @@ -21,9 +21,6 @@ Patch1000: mingw32-gtk2-2.15.0-xbuttons.patch # Enable building a static library of GTK Patch1001: mingw32-gtk2-enable_static_build.patch -# Fix gmodule linking failure when using the latest pango -Patch1002: gtk2-fixdso.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 68 @@ -82,7 +79,6 @@ Static version of the MinGW Windows Gtk2 library. %patch1000 -p1 %patch1001 -p0 -%patch1002 -p0 -b .fixdso %build @@ -192,6 +188,10 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-2.0/modules/*.dll.a %changelog +* Thu Feb 09 2012 Kalev Lember - 2.24.10-1 +- Update to 2.24.10 +- Drop an upstreamed patch + * Wed Feb 1 2012 Erik van Pienbroek - 2.24.9-1 - Update to 2.24.9 - Dropped the .la files diff --git a/sources b/sources index fed5dd0..9602857 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d80261125b964aef2f2cbfbb1a9da2a gtk+-2.24.9.tar.xz +7fdcb407dd174010a695b555bf9b65e2 gtk+-2.24.10.tar.xz