Date: Sunday, May 15, 2022 @ 16:53:09
Author: archange
Revision: 1207473
archrelease: copy trunk to community-testing-x86_64
Added:
dbus-c++/repos/community-testing-x86_64/
dbus-c++/repos/community-testing-x86_64/PKGBUILD
(from rev 1207472, dbus-c++/trunk/PKGBUILD)
dbus-c++/repos/community-testing-x86_64/disable-threading.patch
(from rev 1207472, dbus-c++/trunk/disable-threading.patch)
dbus-c++/repos/community-testing-x86_64/fix-writechar.patch
(from rev 1207472, dbus-c++/trunk/fix-writechar.patch)
dbus-c++/repos/community-testing-x86_64/gcc47.patch
(from rev 1207472, dbus-c++/trunk/gcc47.patch)
dbus-c++/repos/community-testing-x86_64/template-operators.patch
(from rev 1207472, dbus-c++/trunk/template-operators.patch)
--------------------------+
PKGBUILD | 54 +++++++++++++++++++++++++++
disable-threading.patch | 45 +++++++++++++++++++++++
fix-writechar.patch | 9 ++++
gcc47.patch | 10 +++++
template-operators.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 206 insertions(+)
Copied: dbus-c++/repos/community-testing-x86_64/PKGBUILD (from rev 1207472,
dbus-c++/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2022-05-15 16:53:09 UTC (rev 1207473)
@@ -0,0 +1,54 @@
+# Maintainer: David Runge <dv...@archlinux.org>
+# Contributor: Ray Rashif <sc...@archlinux.org>
+# Contributor: Xavier D. <magicrhe...@ouranos.be>
+# Contributor: Zarra <zarr...@gmail.com>
+
+pkgname=dbus-c++
+_pkgname="lib${pkgname}"
+_upstream="dbus-cplusplus"
+pkgver=0.9.0
+pkgrel=10
+pkgdesc="A C++ API for D-BUS"
+arch=('x86_64')
+url="http://dbus-cplusplus.sourceforge.net/";
+license=('LGPL2.1')
+depends=('dbus' 'gcc-libs' 'glib2' 'glibc')
+provides=('libdbus-c++-1.so' 'libdbus-c++-glib-1.so')
+source=("https://sourceforge.net/projects/${_upstream}/files/${pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz";
+ 'gcc47.patch'
+ 'disable-threading.patch'
+ 'fix-writechar.patch'
+ 'template-operators.patch')
+sha512sums=('7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319'
+
'd8618e1eafd25be074ffecf958fbc04f1b2a844c865ec2d795565809a5d11e7f60c1a8c3a6d952b1485af6b199753b36c06f1759a5559274eed55cf5e6585e20'
+
'94d95089ea84af1438191285955bf0866a7d7cbe535ac7fb8282ef6fb96c4ee052f439fb8c9d0b18b9ebec65d39cc45754bb48192ffb46c3d0c4ed6b1b6693a6'
+
'df0a3a80d139877eaea5f352da5dfa2bc0407360ddfb59301707c77bd4329ecd986f366f27bbdd7e4ce385125c6ec46fcf115854aa01d97cf11dff905cd9a385'
+
'af8e6281e6eb9c94cae7e8feaf8a8d7b653e4b394f9cc72fa381f647bc9c891906007dd06f55c89449396c5efd84656fe71ff453c7023cabfaad15a23f0b8a86')
+
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/gcc47.patch"
+ patch -Np1 -i "${srcdir}/disable-threading.patch"
+ patch -Np1 -i "${srcdir}/fix-writechar.patch"
+ patch -Np1 -i "${srcdir}/template-operators.patch"
+ autoreconf -vfi
+}
+
+build() {
+ cd "${_pkgname}-${pkgver}"
+ # -lpthread needed
+ export LDFLAGS+=" -lpthread"
+ ./configure --prefix=/usr \
+ --disable-static \
+ --disable-ecore \
+ --enable-glib
+ make
+}
+
+package() {
+ cd "${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -vDm 644 {AUTHORS,ChangeLog,NEWS,README,TODO} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
+# vim:set ts=2 sw=2 et:
Copied: dbus-c++/repos/community-testing-x86_64/disable-threading.patch (from
rev 1207472, dbus-c++/trunk/disable-threading.patch)
===================================================================
--- community-testing-x86_64/disable-threading.patch
(rev 0)
+++ community-testing-x86_64/disable-threading.patch 2022-05-15 16:53:09 UTC
(rev 1207473)
@@ -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
Copied: dbus-c++/repos/community-testing-x86_64/fix-writechar.patch (from rev
1207472, dbus-c++/trunk/fix-writechar.patch)
===================================================================
--- community-testing-x86_64/fix-writechar.patch
(rev 0)
+++ community-testing-x86_64/fix-writechar.patch 2022-05-15 16:53:09 UTC
(rev 1207473)
@@ -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-testing-x86_64/gcc47.patch (from rev 1207472,
dbus-c++/trunk/gcc47.patch)
===================================================================
--- community-testing-x86_64/gcc47.patch (rev 0)
+++ community-testing-x86_64/gcc47.patch 2022-05-15 16:53:09 UTC (rev
1207473)
@@ -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;
Copied: dbus-c++/repos/community-testing-x86_64/template-operators.patch (from
rev 1207472, dbus-c++/trunk/template-operators.patch)
===================================================================
--- community-testing-x86_64/template-operators.patch
(rev 0)
+++ community-testing-x86_64/template-operators.patch 2022-05-15 16:53:09 UTC
(rev 1207473)
@@ -0,0 +1,88 @@
+commit a0b9ef3b469ca23c6a3229d8abb967cbbddcee38
+Author: Peter Williams <pe...@newton.cx>
+Date: Sat Dec 19 21:12:46 2015 -0500
+
+ Fix some weird template/operator issues on OS X.
+
+ I frankly don't understand at all what's going on here. These fixes
+ derive from:
+
+
https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/c3f69f6be02e31521474dce7eadf6ba4f4a7ce94
+
https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/7104857773f790a549d399715482fa23d9b736cd
+
+ Except I've dropped some changes that break the OS X build for me.
Frankly, if
+ it compiles, that's good enough for me.
+
+diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h
+index 044e72b..7b3108f 100644
+--- a/include/dbus-c++/types.h
++++ b/include/dbus-c++/types.h
+@@ -89,13 +89,7 @@ public:
+ }
+
+ template <typename T>
+- operator T() const
+- {
+- T cast;
+- MessageIter ri = _msg.reader();
+- ri >> cast;
+- return cast;
+- }
++ operator T() const;
+
+ private:
+
+@@ -316,7 +310,7 @@ struct type< Struct<T1, T2, T3, T4, T5, T6, T7, T8, T9,
T10, T11, T12, T13, T14,
+ }
+ };
+
+-} /* namespace DBus */
++extern DXXAPI DBus::MessageIter &operator << (DBus::MessageIter &iter, const
DBus::Variant &val);
+
+ inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const
DBus::Invalid &)
+ {
+@@ -551,6 +545,8 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter
&iter, DBus::Signature
+ return ++iter;
+ }
+
++extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter,
DBus::Variant &val);
++
+ template<typename E>
+ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter,
std::vector<E>& val)
+ {
+@@ -644,7 +640,16 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter
&iter, DBus::Struct<T1,
+ return ++iter;
+ }
+
+-extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter,
DBus::Variant &val);
++template <typename T>
++inline DBus::Variant::operator T() const
++{
++ T cast;
++ DBus::MessageIter ri = _msg.reader();
++ ri >> cast;
++ return cast;
++}
++
++} /* namespace DBus */
+
+ #endif//__DBUSXX_TYPES_H
+
+diff --git a/src/types.cpp b/src/types.cpp
+index d414a3e..70f9ac0 100644
+--- a/src/types.cpp
++++ b/src/types.cpp
+@@ -34,7 +34,7 @@
+ #include "message_p.h"
+ #include "internalerror.h"
+
+-using namespace DBus;
++namespace DBus {
+
+ Variant::Variant()
+ : _msg(CallMessage()) // dummy message used as temporary storage for
variant data
+@@ -104,3 +104,4 @@ MessageIter &operator >> (MessageIter &iter, Variant &val)
+ return ++iter;
+ }
+
++} /* namespace DBus */
