[mingw-gtk2] Fix linking against modern glib2
epienbro
epienbro at fedoraproject.org
Fri Mar 9 20:38:36 UTC 2012
commit 3eed10d743dc6517553a45aa0d3a3557c049083f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Fri Mar 9 21:38:28 2012 +0100
Fix linking against modern glib2
mingw-gtk2.spec | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/mingw-gtk2.spec b/mingw-gtk2.spec
index 24aa46c..553718a 100644
--- a/mingw-gtk2.spec
+++ b/mingw-gtk2.spec
@@ -4,7 +4,7 @@
Name: mingw-gtk2
Version: 2.24.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MinGW Windows Gtk2 library
License: LGPLv2+
@@ -21,6 +21,9 @@ Patch1000: mingw32-gtk2-2.15.0-xbuttons.patch
# Enable building a static library of GTK
Patch1001: mingw32-gtk2-enable_static_build.patch
+# Fix linking against modern glib2
+Patch1002: gtk2-fix-gmodule-linking.patch
+
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
@@ -55,7 +58,8 @@ BuildRequires: gtk2-devel
# Packages needed for regenerating configure
BuildRequires: gtk-doc
-Requires: pkgconfig
+# Needed for the patch
+BuildRequires: autoconf automake libtool
%description
@@ -64,6 +68,7 @@ MinGW Windows Gtk2 library.
%package -n mingw32-gtk2
Summary: MinGW Windows Gtk2 library
+Requires: pkgconfig
%description -n mingw32-gtk2
MinGW Windows Gtk2 library.
@@ -85,6 +90,9 @@ Static version of the MinGW Windows Gtk2 library.
%patch1000 -p1
%patch1001 -p0
+%patch1002 -p0
+
+autoreconf -i --force
%build
@@ -194,6 +202,9 @@ rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-2.0/modules/*.dll.a
%changelog
+* Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.10-4
+- Fix linking against modern glib2
+
* Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.10-3
- Renamed the source package to mingw-gtk2 (RHBZ #800392)
- Use mingw macros without leading underscore
More information about the scm-commits
mailing list