1 |
commit: 9ed232ebdf0132c5b0ac4d0adfc5959df72bead2 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 27 09:15:30 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 27 09:15:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed232eb |
7 |
|
8 |
dev-libs/dbus-c++: add gcc7 fix, bug #622790 by Hector Martin |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
...++-0.9.0-r2.ebuild => dbus-c++-0.9.0-r3.ebuild} | 3 ++- |
13 |
dev-libs/dbus-c++/files/dbus-c++-gcc7.patch | 25 ++++++++++++++++++++++ |
14 |
2 files changed, 27 insertions(+), 1 deletion(-) |
15 |
|
16 |
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 |
17 |
similarity index 95% |
18 |
rename from dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild |
19 |
rename to dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild |
20 |
index 76a0a00186a..f0d11b35b35 100644 |
21 |
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild |
22 |
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2016 Gentoo Foundation |
25 |
+# Copyright 1999-2017 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI="5" |
29 |
@@ -28,6 +28,7 @@ S=${WORKDIR}/lib${P} |
30 |
|
31 |
PATCHES=( |
32 |
"${FILESDIR}"/${P}-gcc-4.7.patch #424707 |
33 |
+ "${FILESDIR}"/${PN}-gcc7.patch #622790 |
34 |
) |
35 |
|
36 |
multilib_src_configure() { |
37 |
|
38 |
diff --git a/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch b/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch |
39 |
new file mode 100644 |
40 |
index 00000000000..90809ea5838 |
41 |
--- /dev/null |
42 |
+++ b/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch |
43 |
@@ -0,0 +1,25 @@ |
44 |
+--- ./include/dbus-c++/dispatcher.h.old 2017-06-27 07:03:52.159413535 +0900 |
45 |
++++ ./include/dbus-c++/dispatcher.h 2017-06-27 07:04:04.974399195 +0900 |
46 |
+@@ -229,13 +229,8 @@ |
47 |
+ typedef Mutex *(*MutexNewFn)(); |
48 |
+ typedef void (*MutexUnlockFn)(Mutex *mx); |
49 |
+ |
50 |
+-#ifndef DBUS_HAS_RECURSIVE_MUTEX |
51 |
+-typedef bool (*MutexFreeFn)(Mutex *mx); |
52 |
+-typedef bool (*MutexLockFn)(Mutex *mx); |
53 |
+-#else |
54 |
+ typedef void (*MutexFreeFn)(Mutex *mx); |
55 |
+ typedef void (*MutexLockFn)(Mutex *mx); |
56 |
+-#endif//DBUS_HAS_RECURSIVE_MUTEX |
57 |
+ |
58 |
+ typedef CondVar *(*CondVarNewFn)(); |
59 |
+ typedef void (*CondVarFreeFn)(CondVar *cv); |
60 |
+--- ./src/pipe.cpp.old 2017-06-27 07:00:17.275653653 +0900 |
61 |
++++ ./src/pipe.cpp 2017-06-27 07:00:23.537646665 +0900 |
62 |
+@@ -83,5 +83,5 @@ |
63 |
+ void Pipe::signal() |
64 |
+ { |
65 |
+ // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... |
66 |
+- ::write(_fd_write, '\0', 1); |
67 |
++ ::write(_fd_write, "\0", 1); |
68 |
+ } |