diff --git a/gtk2-fixdso.patch b/gtk2-fixdso.patch new file mode 100644 index 0000000..3ea7846 --- /dev/null +++ b/gtk2-fixdso.patch @@ -0,0 +1,15 @@ +--- gtk+-2.24.8/gtk/Makefile.am.orig 2012-02-01 11:14:25.468115547 +0000 ++++ gtk+-2.24.8/gtk/Makefile.am 2012-02-01 11:14:57.920116650 +0000 +@@ -904,10 +904,10 @@ + 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_x11_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0 + libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid + libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) +-libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) ++libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0 + + libgtk_x11_2_0_la_LIBADD = $(libadd) + libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 diff --git a/gtk2.spec b/gtk2.spec index ed7b427..95667d8 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -18,7 +18,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: 2.24.8 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -42,6 +42,9 @@ Patch15: window-dragging.patch # upstream fix Patch16: 0001-Revert-iconview-layout-items-immediately-when-settin.patch +# fix dso. +Patch17: gtk2-fixdso.patch + BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: cairo-devel @@ -158,6 +161,7 @@ This package contains developer documentation for the GTK+ widget toolkit. #%patch14 -p1 -b .landscape-pdf-print %patch15 -p1 -b .window-dragging %patch16 -p1 +%patch17 -p1 -b .fixdso %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -344,6 +348,9 @@ fi %doc tmpdocs/examples %changelog +* Tue Feb 1 2012 Peter Robinson - 2.24.8-3 +- Add patch to fix DSO linking. Would have thought these would have long stopped being a problem + * Fri Jan 13 2012 Fedora Release Engineering - 2.24.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild