Date: Monday, June 12, 2017 @ 21:53:01 Author: zorun Revision: 236570
upgpkg: dbus-c++ 0.9.0-7 Fix build with GCC 7 Added: dbus-c++/trunk/disable-threading.patch dbus-c++/trunk/fix-writechar.patch Modified: dbus-c++/trunk/PKGBUILD -------------------------+ PKGBUILD | 20 +++++++++++++++----- disable-threading.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ fix-writechar.patch | 9 +++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-12 21:18:28 UTC (rev 236569) +++ PKGBUILD 2017-06-12 21:53:01 UTC (rev 236570) @@ -5,7 +5,7 @@ pkgname=dbus-c++ _pkgname=lib$pkgname pkgver=0.9.0 -pkgrel=6 +pkgrel=7 pkgdesc="A C++ API for D-BUS" url="http://sourceforge.net/projects/dbus-cplusplus/" arch=('i686' 'x86_64') @@ -13,14 +13,24 @@ depends=('dbus>=1.2.0' 'glib2') makedepends=('autoconf' 'automake' 'libtool') source=("http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%2B%2B/$pkgver/libdbus-c%2B%2B-$pkgver.tar.gz" - 'gcc47.patch') -md5sums=('e752116f523fa88ef041e63d3dee4de2' - '9319b402b15f37d881b51bc758368900') + 'gcc47.patch' + 'disable-threading.patch' + 'fix-writechar.patch') +sha256sums=('bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61' + '9d504faf769026dcaabca94c7645373fcadf43ef93c8263c6a85e905798f07c9' + '38730ee73fe4de320fceab6619579b55861b6b8e0f6d8069a9ddf3d1ad1266c0' + '34ada5bf31918c63558d0fb3fff63e0f1596f25082ff22e84117927ad7236fce') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + patch -Np0 -i "$srcdir/gcc47.patch" + patch -Np1 -i "$srcdir/disable-threading.patch" + patch -Np1 -i "$srcdir/fix-writechar.patch" +} build() { cd "$srcdir/$_pkgname-$pkgver" - patch -Np0 -i "$srcdir/gcc47.patch" export LDFLAGS+=" -lexpat -lpthread" # -lpthread needed for i686 ./autogen.sh --prefix=/usr \ Added: disable-threading.patch =================================================================== --- disable-threading.patch (rev 0) +++ disable-threading.patch 2017-06-12 21:53:01 UTC (rev 236570) @@ -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 Added: fix-writechar.patch =================================================================== --- fix-writechar.patch (rev 0) +++ fix-writechar.patch 2017-06-12 21:53:01 UTC (rev 236570) @@ -0,0 +1,9 @@ +--- libdbus-c++-0.9.0/src/pipe.cpp.writechar 2017-02-16 11:07:13.591950169 +0000 ++++ libdbus-c++-0.9.0/src/pipe.cpp 2017-02-16 11:04:17.158796092 +0000 +@@ -83,5 +83,5 @@ + void Pipe::signal() + { + // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... +- ::write(_fd_write, '\0', 1); ++ ::write(_fd_write, "", 1); + }