gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-04 13:47:35 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Package-Manager: Portage-2.3.6, Repoman-2.3.2
This commit is contained in:
Alexis Ballier 2017-06-27 11:15:30 +02:00
parent 9d390138d3
commit 9ed232ebdf
No known key found for this signature in database
GPG Key ID: 0E2548BBC607E5AE
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild → dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
View File

@ -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() {

25
dev-libs/dbus-c++/files/dbus-c++-gcc7.patch Normal file
View File

@ -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);
}