[mingw-glibmm24: 34/40] update to 2.31.2

[epienbro]

commit 57b32aa1a93bfd830e749af4d026bd20c8493b56
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Sat Jan 14 15:44:44 2012 +0100

    update to 2.31.2

 .gitignore                                |    1 +
 glibmm-2.31.2-wrap-deprecated-calls.patch |   74 +++++++++++++++++++++++++++++
 mingw32-glibmm24.spec                     |   13 ++++-
 sources                                   |    2 +-
 4 files changed, 86 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ee9e5e..c7e32e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ glibmm-2.24.1.tar.bz2
 /glibmm-2.28.0.tar.bz2
 /glibmm-2.28.1.tar.bz2
 /glibmm-2.30.0.tar.xz
+/glibmm-2.31.2.tar.xz
diff --git a/glibmm-2.31.2-wrap-deprecated-calls.patch b/glibmm-2.31.2-wrap-deprecated-calls.patch
new file mode 100644
index 0000000..1a82f7b
--- /dev/null
+++ b/glibmm-2.31.2-wrap-deprecated-calls.patch
@@ -0,0 +1,74 @@
+From 437253bb2675cda0a41a27644830da3e8e74e0de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= <hguemar at fedoraproject.org>
+Date: Sun, 4 Dec 2011 20:49:58 +0100
+Subject: [PATCH] ftbfs
+
+---
+ glib/glibmm/thread.cc |   11 +++++++++++
+ glib/glibmm/thread.h  |   13 ++++++++++---
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/glib/glibmm/thread.cc b/glib/glibmm/thread.cc
+index a2b6736..8038051 100644
+--- a/glib/glibmm/thread.cc
++++ b/glib/glibmm/thread.cc
+@@ -417,3 +417,14 @@ void Glib::ThreadError::throw_func(GError* gobject)
+ }
+ 
+ 
++void* StaticPrivate_get_helper(GStaticPrivate *private_key) {
++  return g_static_private_get(private_key);
++}
++
++void StaticPrivate_set_helper(GStaticPrivate *private_key, gpointer data, GDestroyNotify notify) {
++  return g_static_private_set(private_key, data, notify);
++}
++
++GPrivate* GPrivate_new_helper(GDestroyNotify notify) {
++  return g_private_new(notify);
++}
+diff --git a/glib/glibmm/thread.h b/glib/glibmm/thread.h
+index 6864d0c..197e6bb 100644
+--- a/glib/glibmm/thread.h
++++ b/glib/glibmm/thread.h
+@@ -1061,16 +1061,21 @@ void StaticPrivate<T>::delete_ptr(void* data)
+   delete static_cast<T*>(data);
+ }
+ 
++void* StaticPrivate_get_helper(GStaticPrivate *private_key);
++
+ template <class T> inline
+ T* StaticPrivate<T>::get()
+ {
+-  return static_cast<T*>(g_static_private_get(&gobject_));
++
++  return static_cast<T*>(StaticPrivate_get_helper(&gobject_));
+ }
+ 
++void StaticPrivate_set_helper(GStaticPrivate *private_key, gpointer data, GDestroyNotify notify);
++
+ template <class T> inline
+ void StaticPrivate<T>::set(T* data, typename StaticPrivate<T>::DestroyNotifyFunc notify_func)
+ {
+-  g_static_private_set(&gobject_, data, notify_func);
++  StaticPrivate_set_helper(&gobject_, data, notify_func);
+ }
+ 
+ 
+@@ -1083,10 +1088,12 @@ void Private<T>::delete_ptr(void* data)
+   delete static_cast<T*>(data);
+ }
+ 
++GPrivate* GPrivate_new_helper(GDestroyNotify notify);
++
+ template <class T> inline
+ Private<T>::Private(typename Private<T>::DestructorFunc destructor_func)
+ :
+-  gobject_ (g_private_new(destructor_func))
++  gobject_ (GPrivate_new_helper(destructor_func))
+ {}
+ 
+ template <class T> inline
+-- 
+1.7.7.4
+
diff --git a/mingw32-glibmm24.spec b/mingw32-glibmm24.spec
index 98a1ee7..82c95dd 100644
--- a/mingw32-glibmm24.spec
+++ b/mingw32-glibmm24.spec
@@ -6,14 +6,17 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw32-glibmm24
-Version:        2.30.0
-Release:        2%{?dist}
+Version:        2.31.2
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
-URL:            http://gtkmm.sourceforge.net/
+URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz
+# upstreamed patch
+# http://git.gnome.org/browse/glibmm/commit/?id=ce45ebe8f61ce55230ef15947612c61c7f283bd2
+Patch0:         glibmm-2.31.2-wrap-deprecated-calls.patch
 
 BuildArch:      noarch
 
@@ -36,6 +39,7 @@ freely combined to quickly create complex user interfaces.
 
 %prep
 %setup -q -n glibmm-%{version}
+%patch0 -p1 -b .ftbfs
 
 %build
 %{_mingw32_configure} --disable-static
@@ -70,6 +74,9 @@ rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp
 
 
 %changelog
+* Sat Jan 14 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.31.2-1
+- Update to 2.31.2
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.30.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 1d56e92..dad5b96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54c803cf95a8d395a55397c723cdb315  glibmm-2.30.0.tar.xz
+91e9ea2eadb883d8f5483c8dd65d1fe8  glibmm-2.31.2.tar.xz