[libbonobo] Backport patch from upstream to fix build with recent glib

[Colin Walters]

commit 9cc630c69498c76d58dea28f3cdede538d78e188
Author: Colin Walters <walters at verbum.org>
Date:   Thu May 2 14:22:16 2013 -0400

    Backport patch from upstream to fix build with recent glib

 0001-Remove-use-of-G_DISABLE_DEPRECATED.patch |   40 +++++++++++++++++++++++++
 libbonobo.spec                                |    7 ++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
new file mode 100644
index 0000000..3220783
--- /dev/null
+++ b/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
@@ -0,0 +1,40 @@
+From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 2 May 2013 14:17:38 -0400
+Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED
+
+This now trips up on GStaticRecMutex; I'm not going to bother to port,
+realistically no one is actively maintaining this code anymore.
+---
+ activation-server/Makefile.am |    1 -
+ configure.in                  |    2 +-
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am
+index efb18a8..ffa90f6 100644
+--- a/activation-server/Makefile.am
++++ b/activation-server/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES=					\
+ 	$(SERVER_CFLAGS)			\
+ 	$(WARN_CFLAGS)				\
+ 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\
+-	-DG_DISABLE_DEPRECATED			\
+ 	-DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
+ 	$(NULL)
+ 
+diff --git a/configure.in b/configure.in
+index 70a4e26..6be2bca 100644
+--- a/configure.in
++++ b/configure.in
+@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS)
+ AC_SUBST(SERVER_CFLAGS)
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+-	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
++	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES"
+ 	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ fi
+ 
+-- 
+1.7.1
+
diff --git a/libbonobo.spec b/libbonobo.spec
index ce4b927..2401acb 100644
--- a/libbonobo.spec
+++ b/libbonobo.spec
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.32.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.32/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -24,6 +24,7 @@ BuildRequires: gettext
 
 Patch0: libbonobo-multishlib.patch
 Patch1: libbonobo-2.32.1-srcdir-macro.patch
+Patch2: 0001-Remove-use-of-G_DISABLE_DEPRECATED.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -51,6 +52,7 @@ use Bonobo.
 %endif
 
 %patch1 -p0 -b .srcmacro
+%patch2 -p1
 
 autoreconf -i -f
 
@@ -115,6 +117,9 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/bonobo/servers
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Thu May 02 2013 Colin Walters <walters at verbum.org> - 2.32.1-5
+- Backport patch from upstream to fix build with recent GLib
+
 * Thu Feb 07 2013 Jon Ciesla <limburgher at gmail.com> - 2.32.1-4
 - Merge review fixes, BZ 225989.