diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2013-05-07 14:46:51 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-10 11:02:38 +0200 |
| commit | 87a7d16716a369ac4f7cd52ce71e96d72ab6e8a5 (patch) | |
| tree | b8fd2790627362b383360ecd8fded61bb92a6020 /meta-gnome | |
| parent | 4ef9139be2f21dabd313d25e000e0285f5a2be82 (diff) | |
| download | meta-openembedded-87a7d16716a369ac4f7cd52ce71e96d72ab6e8a5.tar.gz | |
libbonobo: fix build with glib 2.36
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch | 47 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb | 3 |
2 files changed, 49 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch new file mode 100644 index 0000000000..44cf1f9fa0 --- /dev/null +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch @@ -0,0 +1,47 @@ +From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 2 May 2013 14:17:38 -0400 +Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This now trips up on GStaticRecMutex; I'm not going to bother to port, +realistically no one is actively maintaining this code anymore. + +Upstream-Status: Applied + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + 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.6.5 + diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb index 253b46affc..622f244f89 100644 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb @@ -1,5 +1,6 @@ require libbonobo.inc -PR = "r1" +PR = "r2" +SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch" SRC_URI[archive.md5sum] = "b217cef6a187505290c66c5bf8225d38" SRC_URI[archive.sha256sum] = "5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe" |