- added threading patch (fix dispatch.h issues due to using configure define without...

- release 5

diff --git a/dbus-c++-threading.patch b/dbus-c++-threading.patch
new file mode 100644 (file)
index 0000000..713e55a
--- /dev/null
+++ b/dbus-c++-threading.patch
@@ -0,0 +1,56 @@
+--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.orig       2011-11-28 16:03:19.000000000 +0100
++++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h    2018-04-23 20:38:19.311394855 +0200
+@@ -29,6 +29,8 @@
+ #include "connection.h"
+ #include "eventloop.h"
+ 
++#define DBUSXX_DBUS_HAS_RECURSIVE_MUTEX /* assume dbus >= 0.95 */
++
+ namespace DBus
+ {
+ 
+@@ -227,14 +229,14 @@
+ };
+ 
+ typedef Mutex *(*MutexNewFn)();
+-typedef void (*MutexUnlockFn)(Mutex *mx);
++typedef void (*MutexFreeFn)(Mutex *mx);
+ 
+-#ifndef DBUS_HAS_RECURSIVE_MUTEX
+-typedef bool (*MutexFreeFn)(Mutex *mx);
++#ifndef DBUSXX_DBUS_HAS_RECURSIVE_MUTEX
+ typedef bool (*MutexLockFn)(Mutex *mx);
++typedef bool (*MutexUnlockFn)(Mutex *mx);
+ #else
+-typedef void (*MutexFreeFn)(Mutex *mx);
+ typedef void (*MutexLockFn)(Mutex *mx);
++typedef void (*MutexUnlockFn)(Mutex *mx);
+ #endif//DBUS_HAS_RECURSIVE_MUTEX
+ 
+ typedef CondVar *(*CondVarNewFn)();
+@@ -272,6 +274,17 @@
+     delete mx;
+   }
+ 
++#ifndef DBUSXX_DBUS_HAS_RECURSIVE_MUTEX
++  static bool mutex_lock(Mutex *mx)
++  {
++    return mx->lock();
++  }
++
++  static bool mutex_unlock(Mutex *mx)
++  {
++    return mx->unlock();
++  }
++#else
+   static void mutex_lock(Mutex *mx)
+   {
+     mx->lock();
+@@ -281,6 +294,7 @@
+   {
+     mx->unlock();
+   }
++#endif
+ 
+   static CondVar *condvar_new()
+   {

diff --git a/dbus-c++.spec b/dbus-c++.spec
index a75338c59c1ae6db18bc9acd701c02ac18cd00e7..33d8e70e81668134202c284095a003d80feb8bfb 100644 (file)
--- a/dbus-c++.spec
+++ b/dbus-c++.spec
@@ -6,7 +6,7 @@ Summary:        Native C++ bindings for D-Bus
 Summary(pl.UTF-8):     Natywne wiązania C++ do usługi D-Bus
 Name:          dbus-c++
 Version:       0.9.0
-Release:       4
+Release:       5
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/dbus-cplusplus/lib%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Source0:      http://downloads.sourceforge.net/dbus-cplusplus/lib%{name}-%{version}.t
 Patch0:                %{name}-macros.patch
 Patch1:                %{name}-gcc4.7.patch
 Patch2:                %{name}-linkfix.patch
+Patch3:                %{name}-threading.patch
 URL:           http://sourceforge.net/projects/dbus-cplusplus/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -144,6 +145,7 @@ Statyczna biblioteka dbus-c++-ecore.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}