diff --git a/programming/misc/dbus-c++/actions.py b/programming/misc/dbus-c++/actions.py index 06ba3ac641..10b5de82ea 100644 --- a/programming/misc/dbus-c++/actions.py +++ b/programming/misc/dbus-c++/actions.py @@ -12,10 +12,14 @@ from pisi.actionsapi import get def setup(): pisitools.dosed("configure.ac", "-O3", "") shelltools.export("CPPFLAGS", get.CXXFLAGS()) + + shelltools.export("LDFLAGS", "%s -lpthread" % get.LDFLAGS()) - shelltools.system("./autogen.sh") + #shelltools.system("./autogen.sh") autotools.configure("--disable-static \ - --enable-glib") + --enable-glib \ + --disable-ecore \ + --disable-examples") pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") diff --git a/programming/misc/dbus-c++/files/fix-writechar.patch b/programming/misc/dbus-c++/files/fix-writechar.patch new file mode 100644 index 0000000000..d936b7fc17 --- /dev/null +++ b/programming/misc/dbus-c++/files/fix-writechar.patch @@ -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); + } diff --git a/programming/misc/dbus-c++/files/gcc47.patch b/programming/misc/dbus-c++/files/gcc47.patch new file mode 100644 index 0000000000..6a82773006 --- /dev/null +++ b/programming/misc/dbus-c++/files/gcc47.patch @@ -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 + #include + #include ++#include + + using namespace DBus; + using namespace std; diff --git a/programming/misc/dbus-c++/pspec.xml b/programming/misc/dbus-c++/pspec.xml index f71203a407..dc60d71dd0 100644 --- a/programming/misc/dbus-c++/pspec.xml +++ b/programming/misc/dbus-c++/pspec.xml @@ -13,17 +13,16 @@ C++ bindings for DBus library dbus-c++ attempts to provide a C++ API for D-BUS. The library has a glib/gtk and an Ecore mainloop integration. It also offers an optional own main loop. - http://source.pisilinux.org/1.0/dbus-c++.tar.gz + https://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz dbus-devel expat-devel glib2-devel - dbus-c++-build-fix.patch - dbus-c++-linkfix.patch - gcc-44.patch disable-threading.patch + fix-writechar.patch + gcc47.patch @@ -57,6 +56,13 @@ + + 2020-01-12 + 0.9.0 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-08-03 0.0_20090907