Date: Monday, June 12, 2017 @ 21:55:41 Author: zorun Revision: 236572
archrelease: copy trunk to community-i686 Added: dbus-c++/repos/community-i686/PKGBUILD (from rev 236571, dbus-c++/trunk/PKGBUILD) dbus-c++/repos/community-i686/disable-threading.patch (from rev 236571, dbus-c++/trunk/disable-threading.patch) dbus-c++/repos/community-i686/fix-writechar.patch (from rev 236571, dbus-c++/trunk/fix-writechar.patch) dbus-c++/repos/community-i686/gcc47.patch (from rev 236571, dbus-c++/trunk/gcc47.patch) Deleted: dbus-c++/repos/community-i686/disable-threading.patch dbus-c++/repos/community-i686/fix-writechar.patch -------------------------+ PKGBUILD | 49 +++++++++++++++++++++++++ disable-threading.patch | 90 +++++++++++++++++++++++----------------------- fix-writechar.patch | 18 ++++----- gcc47.patch | 10 +++++ 4 files changed, 113 insertions(+), 54 deletions(-) Copied: dbus-c++/repos/community-i686/PKGBUILD (from rev 236571, dbus-c++/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-06-12 21:55:41 UTC (rev 236572) @@ -0,0 +1,49 @@ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Xavier D. <magicrhe...@ouranos.be> +# Contributor: Zarra <zarr...@gmail.com> + +pkgname=dbus-c++ +_pkgname=lib$pkgname +pkgver=0.9.0 +pkgrel=7 +pkgdesc="A C++ API for D-BUS" +url="http://sourceforge.net/projects/dbus-cplusplus/" +arch=('i686' 'x86_64') +license=('GPL') +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' + '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" + + export LDFLAGS+=" -lexpat -lpthread" # -lpthread needed for i686 + + ./autogen.sh --prefix=/usr \ + --disable-static \ + --enable-glib \ + --disable-ecore + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: disable-threading.patch =================================================================== --- disable-threading.patch 2017-06-12 21:53:50 UTC (rev 236571) +++ disable-threading.patch 2017-06-12 21:55:41 UTC (rev 236572) @@ -1,45 +0,0 @@ ---- 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 Copied: dbus-c++/repos/community-i686/disable-threading.patch (from rev 236571, dbus-c++/trunk/disable-threading.patch) =================================================================== --- disable-threading.patch (rev 0) +++ disable-threading.patch 2017-06-12 21:55:41 UTC (rev 236572) @@ -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 Deleted: fix-writechar.patch =================================================================== --- fix-writechar.patch 2017-06-12 21:53:50 UTC (rev 236571) +++ fix-writechar.patch 2017-06-12 21:55:41 UTC (rev 236572) @@ -1,9 +0,0 @@ ---- 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); - } Copied: dbus-c++/repos/community-i686/fix-writechar.patch (from rev 236571, dbus-c++/trunk/fix-writechar.patch) =================================================================== --- fix-writechar.patch (rev 0) +++ fix-writechar.patch 2017-06-12 21:55:41 UTC (rev 236572) @@ -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); + } Copied: dbus-c++/repos/community-i686/gcc47.patch (from rev 236571, dbus-c++/trunk/gcc47.patch) =================================================================== --- gcc47.patch (rev 0) +++ gcc47.patch 2017-06-12 21:55:41 UTC (rev 236572) @@ -0,0 +1,10 @@ +--- src/eventloop-integration.cpp.orig 2012-05-09 11:22:09.683290763 +0200 ++++ src/eventloop-integration.cpp 2012-05-09 11:22:44.313288912 +0200 +@@ -38,6 +38,7 @@ + #include <cassert> + #include <sys/poll.h> + #include <fcntl.h> ++#include <unistd.h> + + using namespace DBus; + using namespace std;