aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-08 08:33:42 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:44 -0700
commita5d4a339153807934be987dcbc2833760be7ae1c (patch)
treeadf48063974dd2b198433624d8652b49e34aa445 /meta-oe/recipes-core
parent224549c911c656ea0529a2f87316b5e46cfb761b (diff)
downloadmeta-openembedded-a5d4a339153807934be987dcbc2833760be7ae1c.tar.gz
meta-openembedded-a5d4a339153807934be987dcbc2833760be7ae1c.tar.bz2
meta-openembedded-a5d4a339153807934be987dcbc2833760be7ae1c.zip
libdbus-c++: Refresh patches v2
v2] refresh via quilt push/refresh rather than devtool Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r--meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch29
-rw-r--r--meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch14
2 files changed, 19 insertions, 24 deletions
diff --git a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch
index 0c2c48746..b108a4cd6 100644
--- a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch
+++ b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch
@@ -33,10 +33,10 @@ Signed-off-by: André Draszik <adraszik@tycoint.com>
src/pipe.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp
-index 5776971..271b503 100644
---- a/src/eventloop-integration.cpp
-+++ b/src/eventloop-integration.cpp
+Index: libdbus-c++-0.9.0/src/eventloop-integration.cpp
+===================================================================
+--- libdbus-c++-0.9.0.orig/src/eventloop-integration.cpp
++++ libdbus-c++-0.9.0/src/eventloop-integration.cpp
@@ -36,7 +36,7 @@
/* STD */
#include <string.h>
@@ -44,12 +44,12 @@ index 5776971..271b503 100644
-#include <sys/poll.h>
+#include <poll.h>
#include <fcntl.h>
- #include <unistd.h>
-diff --git a/src/eventloop.cpp b/src/eventloop.cpp
-index f622812..7790e1e 100644
---- a/src/eventloop.cpp
-+++ b/src/eventloop.cpp
+ using namespace DBus;
+Index: libdbus-c++-0.9.0/src/eventloop.cpp
+===================================================================
+--- libdbus-c++-0.9.0.orig/src/eventloop.cpp
++++ libdbus-c++-0.9.0/src/eventloop.cpp
@@ -28,7 +28,7 @@
#include <dbus-c++/eventloop.h>
#include <dbus-c++/debug.h>
@@ -59,10 +59,10 @@ index f622812..7790e1e 100644
#include <sys/time.h>
#include <dbus/dbus.h>
-diff --git a/src/pipe.cpp b/src/pipe.cpp
-index 01211b3..45c2ba6 100644
---- a/src/pipe.cpp
-+++ b/src/pipe.cpp
+Index: libdbus-c++-0.9.0/src/pipe.cpp
+===================================================================
+--- libdbus-c++-0.9.0.orig/src/pipe.cpp
++++ libdbus-c++-0.9.0/src/pipe.cpp
@@ -32,7 +32,7 @@
/* STD */
@@ -72,6 +72,3 @@ index 01211b3..45c2ba6 100644
#include <fcntl.h>
#include <errno.h>
#include <cassert>
---
-2.10.2
-
diff --git a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch
index 903a7209f..bf6870eb0 100644
--- a/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch
+++ b/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch
@@ -24,17 +24,15 @@ Signed-off-by: Thilo Cestonaro <thilo.cestonaro@ts.fujitsu.com>
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 @@
+Index: libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h
+===================================================================
+--- libdbus-c++-0.9.0.orig/include/dbus-c++/eventloop-integration.h
++++ libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h
+@@ -26,6 +26,7 @@
+ #define __DBUSXX_EVENTLOOP_INTEGRATION_H
- #include <cstring>
#include <errno.h>
+#include <unistd.h>
#include "api.h"
#include "dispatcher.h"
#include "util.h"
---
-1.7.9.7