From c38223ea0e3ac7e24782dd00846c5167cea8824010e5895d3558f13cb6422f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 23 Mar 2015 12:01:57 +0000 Subject: [PATCH] Accepting request 292415 from GNOME:Next Please forward to openSUSE:Factory to fix build with GNOME 3.16 OBS-URL: https://build.opensuse.org/request/show/292415 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdbus-c++?expand=0&rev=11 --- libdbus-c++-glibmm-2.43.patch | 14 ++++++++++++++ libdbus-c++.changes | 6 ++++++ libdbus-c++.spec | 5 ++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 libdbus-c++-glibmm-2.43.patch diff --git a/libdbus-c++-glibmm-2.43.patch b/libdbus-c++-glibmm-2.43.patch new file mode 100644 index 0000000..393d208 --- /dev/null +++ b/libdbus-c++-glibmm-2.43.patch @@ -0,0 +1,14 @@ +diff -rupN libdbus-c++-0.9.0/examples/glib/dbus-browser.h libdbus-c++-0.9.0-new/examples/glib/dbus-browser.h +--- libdbus-c++-0.9.0/examples/glib/dbus-browser.h 2015-03-05 23:43:26.903517530 +0100 ++++ libdbus-c++-0.9.0-new/examples/glib/dbus-browser.h 2011-11-28 16:03:19.000000000 +0100 +@@ -1,9 +1,9 @@ + #ifndef __DEMO_DBUS_BROWSER_H + #define __DEMO_DBUS_BROWSER_H + ++#include + #include + #include +-#include + + #include "dbus-glue.h" + diff --git a/libdbus-c++.changes b/libdbus-c++.changes index 1c01156..5b58601 100644 --- a/libdbus-c++.changes +++ b/libdbus-c++.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 23 10:03:24 UTC 2015 - dimstar@opensuse.org + +- Add libdbus-c++-glibmm-2.43.patch: Fix build with glibmm 2.4, + which has the bind_property macro defined already. + ------------------------------------------------------------------- Mon Dec 23 14:03:27 UTC 2013 - coolo@suse.com diff --git a/libdbus-c++.spec b/libdbus-c++.spec index 7d3b080..4df609c 100644 --- a/libdbus-c++.spec +++ b/libdbus-c++.spec @@ -1,7 +1,7 @@ # # spec file for package libdbus-c++ # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ Patch1: libdbus-c++-pthread.patch Patch2: libdbus-c++-nodocdatetime.patch # Fix gcc47 build errors Patch3: libdbus-c++-gcc47.patch +# PATCH-FIX-UPSTREAM libdbus-c++-glibmm-2.43.patch dimstar@opensuse.org -- Fix build with glibmm2 2.43.x+ +Patch4: libdbus-c++-glibmm-2.43.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: dos2unix @@ -95,6 +97,7 @@ optional own main loop. Files for building against libdbus-c++ %patch1 %patch2 %patch3 +%patch4 -p1 %build #./autogen.sh