Remove broken multi-threading support that doesn't build with GCC 7
This commit is contained in:
parent
57cb10382f
commit
19fb36ce07
45
dbus-c++-threading.patch
Normal file
45
dbus-c++-threading.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.threading 2017-02-15 13:40:53.796004263 +0000
|
||||||
|
+++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h 2017-02-15 13:40:46.907000493 +0000
|
||||||
|
@@ -188,6 +188,7 @@
|
||||||
|
/* classes for multithreading support
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
class DXXAPI Mutex
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
@@ -243,9 +244,11 @@
|
||||||
|
typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout);
|
||||||
|
typedef void (*CondVarWakeOneFn)(CondVar *cv);
|
||||||
|
typedef void (*CondVarWakeAllFn)(CondVar *cv);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
void DXXAPI _init_threading();
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
void DXXAPI _init_threading(
|
||||||
|
MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn,
|
||||||
|
CondVarNewFn, CondVarFreeFn, CondVarWaitFn, CondVarWaitTimeoutFn, CondVarWakeOneFn, CondVarWakeAllFn
|
||||||
|
@@ -312,6 +315,7 @@
|
||||||
|
cv->wake_all();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
} /* namespace DBus */
|
||||||
|
|
||||||
|
--- libdbus-c++-0.9.0/src/dispatcher.cpp.threading 2017-02-15 13:48:22.627249868 +0000
|
||||||
|
+++ libdbus-c++-0.9.0/src/dispatcher.cpp 2017-02-15 13:48:29.164253445 +0000
|
||||||
|
@@ -253,6 +253,7 @@
|
||||||
|
#endif//DBUS_HAS_THREADS_INIT_DEFAULT
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
void DBus::_init_threading(
|
||||||
|
MutexNewFn m1,
|
||||||
|
MutexFreeFn m2,
|
||||||
|
@@ -318,3 +319,4 @@
|
||||||
|
#endif//DBUS_HAS_RECURSIVE_MUTEX
|
||||||
|
dbus_threads_init(&functions);
|
||||||
|
}
|
||||||
|
+#endif
|
@ -1,6 +1,6 @@
|
|||||||
Name: dbus-c++
|
Name: dbus-c++
|
||||||
Version: 0.9.0
|
Version: 0.9.0
|
||||||
Release: 12%{?dist}
|
Release: 13%{?dist}
|
||||||
Summary: Native C++ bindings for D-Bus
|
Summary: Native C++ bindings for D-Bus
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -13,6 +13,9 @@ Patch2: dbus-c++-linkfix.patch
|
|||||||
# Fix collision between macro bind_property in dbus-c++/interface.h and method
|
# Fix collision between macro bind_property in dbus-c++/interface.h and method
|
||||||
# bind_property in glibmm/binding.h
|
# bind_property in glibmm/binding.h
|
||||||
Patch3: dbus-c++-macro_collision.patch
|
Patch3: dbus-c++-macro_collision.patch
|
||||||
|
# Remove broken classes for multithreading support
|
||||||
|
# https://sourceforge.net/p/dbus-cplusplus/patches/18/
|
||||||
|
Patch4: dbus-c++-threading.patch
|
||||||
|
|
||||||
BuildRequires: dbus-devel
|
BuildRequires: dbus-devel
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
@ -56,6 +59,7 @@ sed -i 's/libtoolize --force --copy/libtoolize -if --copy/' bootstrap
|
|||||||
%patch1 -p1 -b .gcc47
|
%patch1 -p1 -b .gcc47
|
||||||
%patch2 -p1 -b .linkfix
|
%patch2 -p1 -b .linkfix
|
||||||
%patch3 -p1 -b .collision
|
%patch3 -p1 -b .collision
|
||||||
|
%patch4 -p1 -b .threading
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
@ -93,6 +97,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
|||||||
%{_libdir}/pkgconfig/*
|
%{_libdir}/pkgconfig/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 16 2017 Jonathan Wakely <jwakely@redhat.com> - 0.9.0-13
|
||||||
|
- Remove broken multi-threading support that doesn't build with GCC 7
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-12
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-12
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user