r37711 - in /attic/libbonobo/debian: changelog patches/01_disable_deprecated.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat May 11 17:08:14 2013
New Revision: 37711

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37711
Log:
* debian/patches/01_disable_deprecated.patch:
  + Patch from upstream git, don't define G_DISABLE_DEPRECATED.
    Fixes FTBFS. Closes: #707382.

Added:
    attic/libbonobo/debian/patches/01_disable_deprecated.patch
Modified:
    attic/libbonobo/debian/changelog
    attic/libbonobo/debian/patches/series

Modified: attic/libbonobo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/changelog?rev=37711&op=diff
==============================================================================
--- attic/libbonobo/debian/changelog [utf-8] (original)
+++ attic/libbonobo/debian/changelog [utf-8] Sat May 11 17:08:14 2013
@@ -7,6 +7,9 @@
     debian/patches/series,
     debian/rules:
     + Switch to source format 3.0 (quilt).
+  * debian/patches/01_disable_deprecated.patch:
+    + Patch from upstream git, don't define G_DISABLE_DEPRECATED.
+      Fixes FTBFS. Closes: #707382.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 11 May 2013 19:00:36 +0200
 

Added: attic/libbonobo/debian/patches/01_disable_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/01_disable_deprecated.patch?rev=37711&op=file
==============================================================================
--- attic/libbonobo/debian/patches/01_disable_deprecated.patch (added)
+++ attic/libbonobo/debian/patches/01_disable_deprecated.patch [utf-8] Sat May 11 17:08:14 2013
@@ -1,0 +1,35 @@
+From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 02 May 2013 18:17:38 +0000
+Subject: 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.
+---
+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
+ 
+--
+cgit v0.9.1

Modified: attic/libbonobo/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/series?rev=37711&op=diff
==============================================================================
--- attic/libbonobo/debian/patches/series [utf-8] (original)
+++ attic/libbonobo/debian/patches/series [utf-8] Sat May 11 17:08:14 2013
@@ -1,1 +1,2 @@
+01_disable_deprecated.patch
 20_server-files-gettext.patch