[glibmm24] close RHBZ#759644

[Haïkel Guémar]

commit 93c2aff9ac4c3c6217094298e025b426529eaaa5
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sat Dec 10 19:13:26 2011 +0100

    close RHBZ#759644

 glibmm-2.31.2-wrap-deprecated-calls.patch |   74 +++++++++++++++++++++++++++++
 glibmm24.spec                             |   10 +++-
 2 files changed, 82 insertions(+), 2 deletions(-)
---
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/glibmm24.spec b/glibmm24.spec
index 8ef644a..228a6af 100644
--- a/glibmm24.spec
+++ b/glibmm24.spec
@@ -4,13 +4,16 @@
 
 Name:           glibmm24
 Version:        2.31.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ interface for the GLib library
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 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
 
 BuildRequires:  libsigc++20-devel >= 2.0.0
 BuildRequires:  glib2-devel >= 2.28.0
@@ -46,7 +49,7 @@ This package contains the full API documentation for %{name}.
 
 %prep
 %setup -q -n glibmm-%{version}
-
+%patch0 -p1 -b .ftbfs
 
 %build
 %configure %{!?_with_static: --disable-static}
@@ -88,6 +91,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 
 %changelog
+* Sun Dec  4 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.31.2-2
+- close RHBZ #759644 (patch accepted upstream)
+
 * Sat Dec  3 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.31.2-1
 - upstream 2.31.2 (unstable)
 - do not use glib deprecated API (RHBZ #759644)