10 files changed, 122 insertions, 36 deletions
diff --git a/libraries/libdbus-c++/gcc47.patch b/libraries/libdbus-c++/gcc47.patch
deleted file mode 100644
index 6a82773006..0000000000
--- a/libraries/libdbus-c++/gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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;
diff --git a/libraries/libdbus-c++/libdbus-c++.SlackBuild b/libraries/libdbus-c++/libdbus-c++.SlackBuild
index 3df02abcb3..77bbd394c2 100644
--- a/libraries/libdbus-c++/libdbus-c++.SlackBuild
+++ b/libraries/libdbus-c++/libdbus-c++.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libdbus-c++
-VERSION=${VERSION:-0.9.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20160924_e3455d2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,22 +60,20 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix compiling with newer gcc versions
-patch -p0 -i $CWD/gcc47.patch
+# Apply some patches (thanks opensuse!)
+for i in $CWD/patches/*.patch ; do patch -p0 < $i ; done
 
-# Fix https://sourceforge.net/p/dbus-cplusplus/bugs/5/
-patch -p1 -i $CWD/nested_variant_map.patch
+./bootstrap
 
-LDFLAGS="-lpthread" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libdbus-c++/libdbus-c++.info b/libraries/libdbus-c++/libdbus-c++.info
index df6ec8de77..264ec943dc 100644
--- a/libraries/libdbus-c++/libdbus-c++.info
+++ b/libraries/libdbus-c++/libdbus-c++.info
@@ -1,8 +1,8 @@
 PRGNAM="libdbus-c++"
-VERSION="0.9.0"
+VERSION="20160924_e3455d2"
 HOMEPAGE="http://dbus-cplusplus.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/dbus-cplusplus/libdbus-c++-0.9.0.tar.gz"
-MD5SUM="e752116f523fa88ef041e63d3dee4de2"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/libdbus-c++-20160924_e3455d2.tar.xz"
+MD5SUM="f6aa26e23d73fa0f02d03e68932f8be7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libdbus-c++/nested_variant_map.patch b/libraries/libdbus-c++/nested_variant_map.patch
deleted file mode 100644
index 8b41ed3a3a..0000000000
--- a/libraries/libdbus-c++/nested_variant_map.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdbus-c++-0.9.0/src/message.cpp     2016-02-20 12:15:52.069704535 +0100
-+++ libdbus-c++-0.9.0-patch/src/message.cpp    2016-02-20 12:31:34.159854472 +0100
-@@ -347,6 +347,7 @@
-       (
-         (DBusMessageIter *) & (to._iter),
-         from.type(),
--        from.type() == DBUS_TYPE_VARIANT ? NULL : sig,
-+       from.type() == DBUS_TYPE_DICT_ENTRY ||
-+       from.type() == DBUS_TYPE_STRUCT ? NULL : sig,
-         (DBusMessageIter *) & (to_container._iter)
-       );
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch b/libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch
new file mode 100644
index 0000000000..42efd3ab8a
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-gcc7.patch
@@ -0,0 +1,11 @@
+Index: src/pipe.cpp
+===================================================================
+--- src/pipe.cpp.orig	2011-11-30 00:16:31.000000000 +0200
++++ src/pipe.cpp	2017-03-27 10:34:55.261175583 +0200
+@@ -83,5 +83,5 @@ ssize_t Pipe::read(void *buffer, unsigne
+ void Pipe::signal()
+ {
+   // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
+-  ::write(_fd_write, '\0', 1);
++  ::write(_fd_write, 0, 1);
+ }
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch b/libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch
new file mode 100644
index 0000000000..56bce80d17
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-glibmm-2.43.patch
@@ -0,0 +1,13 @@
+--- examples/glib/dbus-browser.h.orig	2016-09-24 11:03:56.000000000 +0200
++++ examples/glib/dbus-browser.h	2017-06-21 14:58:48.350046047 +0200
+@@ -1,9 +1,9 @@
+ #ifndef __DEMO_DBUS_BROWSER_H
+ #define __DEMO_DBUS_BROWSER_H
+ 
++#include <gtkmm.h>
+ #include <dbus-c++/dbus.h>
+ #include <dbus-c++/glib-integration.h>
+-#include <gtkmm.h>
+ 
+ #include "dbus-glue.h"
+ 
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch b/libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch
new file mode 100644
index 0000000000..68684c8add
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-nodocdatetime.patch
@@ -0,0 +1,25 @@
+Index: doc/foot.html
+===================================================================
+--- doc/foot.html.orig	2016-09-24 11:03:56.000000000 +0200
++++ doc/foot.html	2017-04-10 15:51:55.951931300 +0200
+@@ -10,7 +10,6 @@
+     <table><tr>
+       <td></td>
+       <td class="copyright">Copyright &copy;$year DBus-C++ Project</td>
+-      <td class="generated">Docs generated $datetime</td>
+     </tr></table>
+   </div>
+ 
+Index: doc/Doxyfile.in
+===================================================================
+--- doc/Doxyfile.in.orig	2016-09-24 11:03:56.000000000 +0200
++++ doc/Doxyfile.in	2017-04-10 15:54:18.748279756 +0200
+@@ -836,7 +836,7 @@ HTML_STYLESHEET        = @srcdir@/dbus-c
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+ 
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO
+ 
+ # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+ # files or namespaces will be aligned in HTML using tables. If set to
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch b/libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch
new file mode 100644
index 0000000000..b87abf331f
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-noreturn.patch
@@ -0,0 +1,21 @@
+Index: include/dbus-c++/util.h
+===================================================================
+--- include/dbus-c++/util.h.orig	2011-11-28 17:03:19.000000000 +0200
++++ include/dbus-c++/util.h	2012-03-11 13:21:18.851849466 +0200
+@@ -243,6 +243,7 @@ public:
+     // TODO: think about return type in this case
+     // this assert should help me to find the use case where it's needed...
+     //assert (false);
++      return _cb->call(param);
+   }
+ 
+   R call(P param) const
+@@ -255,6 +256,8 @@ public:
+     // TODO: think about return type in this case
+     // this assert should help me to find the use case where it's needed...
+     //assert (false);
++      return _cb->call(param);
++    
+   }
+ 
+   bool empty() const
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-pthread.patch b/libraries/libdbus-c++/patches/libdbus-c++-pthread.patch
new file mode 100644
index 0000000000..38b3878ac2
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-pthread.patch
@@ -0,0 +1,11 @@
+Index: dbus-c++-1.pc.in
+===================================================================
+--- dbus-c++-1.pc.in.orig	2011-11-28 22:52:01.000000000 +0200
++++ dbus-c++-1.pc.in	2012-03-11 15:49:36.452603560 +0200
+@@ -7,5 +7,5 @@ Name: @PACKAGE@
+ Description: Native C++ bindings for D-Bus
+ Requires: dbus-1
+ Version: @VERSION@
+-Libs: -L${libdir} -ldbus-c++-1
++Libs: -L${libdir} -ldbus-c++-1 -lpthread
+ Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE
diff --git a/libraries/libdbus-c++/patches/libdbus-c++-sover.patch b/libraries/libdbus-c++/patches/libdbus-c++-sover.patch
new file mode 100644
index 0000000000..3517991846
--- /dev/null
+++ b/libraries/libdbus-c++/patches/libdbus-c++-sover.patch
@@ -0,0 +1,28 @@
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am.orig	2016-09-24 11:03:56.000000000 +0200
++++ src/Makefile.am	2017-03-28 14:53:22.941031645 +0200
+@@ -28,6 +28,9 @@ libdbus_c___1_la_CXXFLAGS = \
+ 	-I$(top_srcdir)/include \
+ 	-Wno-unused-parameter
+ 
++libdbus_c___1_la_LDFLAGS= \
++	-version-info "$(SOVER)"
++
+ libdbus_c___1_la_LIBADD = \
+ 	$(dbus_LIBS)
+ 
+Index: src/integration/glib/Makefile.am
+===================================================================
+--- src/integration/glib/Makefile.am.orig	2016-09-24 11:03:56.000000000 +0200
++++ src/integration/glib/Makefile.am	2017-03-28 15:04:24.695822590 +0200
+@@ -16,6 +16,9 @@ libdbus_c___glib_1_la_LIBADD = \
+ 	$(dbus_LIBS) \
+ 	$(glib_LIBS)
+ 
++libdbus_c___glib_1_la_LDFLAGS= \
++	-version-info "$(SOVER)"
++
+ AM_CPPFLAGS = \
+ 	$(dbus_CFLAGS) \
+ 	$(glib_CFLAGS)