From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- .../dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch | 38 ---------------------- dev-libs/dbus-c++/files/dbus-c++-gcc7.patch | 25 -------------- 2 files changed, 63 deletions(-) delete mode 100644 dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch delete mode 100644 dev-libs/dbus-c++/files/dbus-c++-gcc7.patch (limited to 'dev-libs/dbus-c++/files') diff --git a/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch b/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch deleted file mode 100644 index 2d5771717248..000000000000 --- a/dev-libs/dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ -sniped from ChromiumOS - -https://bugs.gentoo.org/424707 - -From 154f7861d19a2bd5c79c488f9989610971db451b Mon Sep 17 00:00:00 2001 -From: Han Shen -Date: Thu, 31 May 2012 16:49:35 -0700 -Subject: [PATCH] Fixed dbus-c++ gcc 4.7 building problem. - -Just add "unistd.h" inclusion to eventloop-integration.h. - -BUG=None -TEST=Manually built using gcc 4.7. - -Change-Id: I87bd1f90db6a4c974a5ed8134044e8be2034aff2 -Reviewed-on: https://gerrit.chromium.org/gerrit/24260 -Tested-by: Han Shen -Reviewed-by: Yunlian Jiang -Commit-Ready: Han Shen ---- - include/dbus-c++/eventloop-integration.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h -index 5108340..1b56ab5 100644 ---- a/include/dbus-c++/eventloop-integration.h -+++ b/include/dbus-c++/eventloop-integration.h -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include "api.h" - #include "dispatcher.h" - #include "util.h" --- -1.7.9.7 - diff --git a/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch b/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch deleted file mode 100644 index 90809ea5838b..000000000000 --- a/dev-libs/dbus-c++/files/dbus-c++-gcc7.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ./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); - } -- cgit v1.2.3