dev-libs/dbus-c++: add gcc7 fix, bug #622790 by Hector Martin

Package-Manager: Portage-2.3.6, Repoman-2.3.2

2 files changed, 27 insertions, 1 deletions

diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
index 76a0a00186ac..f0d11b35b358 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -28,6 +28,7 @@ S=${WORKDIR}/lib${P}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
+	"${FILESDIR}"/${PN}-gcc7.patch #622790
 )
 
 multilib_src_configure() {
diff --git a/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch b/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch
new file mode 100644
index 000000000000..90809ea5838b
--- /dev/null
+++ b/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch
@@ -0,0 +1,25 @@
+--- ./include/dbus-c++/dispatcher.h.old	2017-06-27 07:03:52.159413535 +0900
++++ ./include/dbus-c++/dispatcher.h	2017-06-27 07:04:04.974399195 +0900
+@@ -229,13 +229,8 @@
+ typedef Mutex *(*MutexNewFn)();
+ typedef void (*MutexUnlockFn)(Mutex *mx);
+ 
+-#ifndef DBUS_HAS_RECURSIVE_MUTEX
+-typedef bool (*MutexFreeFn)(Mutex *mx);
+-typedef bool (*MutexLockFn)(Mutex *mx);
+-#else
+ typedef void (*MutexFreeFn)(Mutex *mx);
+ typedef void (*MutexLockFn)(Mutex *mx);
+-#endif//DBUS_HAS_RECURSIVE_MUTEX
+ 
+ typedef CondVar *(*CondVarNewFn)();
+ typedef void (*CondVarFreeFn)(CondVar *cv);
+--- ./src/pipe.cpp.old	2017-06-27 07:00:17.275653653 +0900
++++ ./src/pipe.cpp	2017-06-27 07:00:23.537646665 +0900
+@@ -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, "\0", 1);
+ }