Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 utils/dbus-c++/05_fix_glibmm_ftbfs.patch |   19 +++++++++++++++++++
 utils/dbus-c++/HISTORY                   |    4 ++++
 utils/dbus-c++/PRE_BUILD                 |    5 +++--
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 8f32d8b199be7009320630c0635b7247f9d8f1e3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    dbus-c++: fix build with current glibmm

diff --git a/utils/dbus-c++/05_fix_glibmm_ftbfs.patch 
b/utils/dbus-c++/05_fix_glibmm_ftbfs.patch
new file mode 100644
index 0000000..37c8eef
--- /dev/null
+++ b/utils/dbus-c++/05_fix_glibmm_ftbfs.patch
@@ -0,0 +1,19 @@
+Description: Fix build with glibmm 2.4
+Origin: patch imported from OpenSUSE, 
http://download.opensuse.org/factory/repo/src-oss/suse/src/libdbus-c++-0.9.0-12.2.src.rpm
+Author: dimstar AT opensuse.org
+Bug-Debian: https://bugs.debian.org/793323
+Last-Update: 2015-07-22
+
+--- a/examples/glib/dbus-browser.h
++++ b/examples/glib/dbus-browser.h
+@@ -1,9 +1,9 @@
+ #ifndef __DEMO_DBUS_BROWSER_H
+ #define __DEMO_DBUS_BROWSER_H
+ 
++#include <gtkmm.h>
+ #include <dbus-c++/dbus.h>
+ #include <dbus-c++/glib-integration.h>
+-#include <gtkmm.h>
+ 
+ #include "dbus-glue.h"
+ 
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index 779537c..8b49926 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,7 @@
+2015-08-20 Thomas Orgis <sobukus AT sourcemage.org>
+       * PRE_BUILD, 05_fix_glibmm_ftbfs.patch: another patch from debian,
+         fixing build with glibmm
+
 2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: remove SOURCEFORGE_URL usage (automated)
 
diff --git a/utils/dbus-c++/PRE_BUILD b/utils/dbus-c++/PRE_BUILD
index d4274ed..c0c8173 100755
--- a/utils/dbus-c++/PRE_BUILD
+++ b/utils/dbus-c++/PRE_BUILD
@@ -1,7 +1,8 @@
 default_pre_build  &&
 cd "$SOURCE_DIRECTORY"  &&
-patch -p1 < "$SCRIPT_DIRECTORY/unistd.patch"
-patch -p1 < "$SCRIPT_DIRECTORY/configure.patch"
+patch -p1 < "$SCRIPT_DIRECTORY/unistd.patch" &&
+patch -p1 < "$SCRIPT_DIRECTORY/configure.patch" &&
+patch -p1 < "$SCRIPT_DIRECTORY/05_fix_glibmm_ftbfs.patch" &&
 # This is needed to fix up libtool stuff, too!
 # Otherwise we'd get linking errors with as-needed (missing -lexpat, p.ex.).
 ./bootstrap