[mingw-glibmm24: 35/40] build fix
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:16:50 UTC 2012
commit 773df968c1836bad8cad083f3df8d4bdcc882819
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Sat Jan 14 17:13:33 2012 +0100
build fix
glibmm-2.31.2-mingw.patch | 29 +++++++++++++++++++++++++++++
mingw32-glibmm24.spec | 3 +++
2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/glibmm-2.31.2-mingw.patch b/glibmm-2.31.2-mingw.patch
new file mode 100644
index 0000000..6802e96
--- /dev/null
+++ b/glibmm-2.31.2-mingw.patch
@@ -0,0 +1,29 @@
+--- glib/glibmm/dispatcher.cc.orig 2012-01-14 15:58:59.451546832 +0100
++++ glib/glibmm/dispatcher.cc 2012-01-14 16:00:04.336548495 +0100
+@@ -142,7 +142,7 @@
+ long ref_count_;
+ Glib::RefPtr<MainContext> context_;
+ #ifdef G_OS_WIN32
+- Glib::Mutex mutex_;
++ Glib::Threads::Mutex mutex_;
+ std::list<DispatchNotifyData> notify_queue_;
+ HANDLE fd_receiver_;
+ #else
+@@ -289,7 +289,7 @@
+ {
+ #ifdef G_OS_WIN32
+ {
+- const Mutex::Lock lock (mutex_);
++ const Threads::Mutex::Lock lock (mutex_);
+
+ const bool was_empty = notify_queue_.empty();
+ notify_queue_.push_back(DispatchNotifyData(dispatcher, this));
+@@ -337,7 +337,7 @@
+
+ #ifdef G_OS_WIN32
+ {
+- const Mutex::Lock lock (mutex_);
++ const Threads::Mutex::Lock lock (mutex_);
+
+ // Should never be empty at this point, but let's allow for bogus
+ // notifications with no data available anyway; just to be safe.
diff --git a/mingw32-glibmm24.spec b/mingw32-glibmm24.spec
index 82c95dd..db749d9 100644
--- a/mingw32-glibmm24.spec
+++ b/mingw32-glibmm24.spec
@@ -17,6 +17,8 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}
# upstreamed patch
# http://git.gnome.org/browse/glibmm/commit/?id=ce45ebe8f61ce55230ef15947612c61c7f283bd2
Patch0: glibmm-2.31.2-wrap-deprecated-calls.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=667918
+Patch1: glibmm-2.31.2-mingw.patch
BuildArch: noarch
@@ -40,6 +42,7 @@ freely combined to quickly create complex user interfaces.
%prep
%setup -q -n glibmm-%{version}
%patch0 -p1 -b .ftbfs
+%patch1 -p0 -b .mingw
%build
%{_mingw32_configure} --disable-static
More information about the scm-commits
mailing list