diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-08 08:33:42 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:44 -0700 |
commit | a5d4a339153807934be987dcbc2833760be7ae1c (patch) | |
tree | adf48063974dd2b198433624d8652b49e34aa445 /meta-oe/recipes-core | |
parent | 224549c911c656ea0529a2f87316b5e46cfb761b (diff) | |
download | meta-openembedded-a5d4a339153807934be987dcbc2833760be7ae1c.tar.gz |
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.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch | 14 |
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> | |||
33 | src/pipe.cpp | 2 +- | 33 | src/pipe.cpp | 2 +- |
34 | 3 files changed, 3 insertions(+), 3 deletions(-) | 34 | 3 files changed, 3 insertions(+), 3 deletions(-) |
35 | 35 | ||
36 | diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp | 36 | Index: libdbus-c++-0.9.0/src/eventloop-integration.cpp |
37 | index 5776971..271b503 100644 | 37 | =================================================================== |
38 | --- a/src/eventloop-integration.cpp | 38 | --- libdbus-c++-0.9.0.orig/src/eventloop-integration.cpp |
39 | +++ b/src/eventloop-integration.cpp | 39 | +++ libdbus-c++-0.9.0/src/eventloop-integration.cpp |
40 | @@ -36,7 +36,7 @@ | 40 | @@ -36,7 +36,7 @@ |
41 | /* STD */ | 41 | /* STD */ |
42 | #include <string.h> | 42 | #include <string.h> |
@@ -44,12 +44,12 @@ index 5776971..271b503 100644 | |||
44 | -#include <sys/poll.h> | 44 | -#include <sys/poll.h> |
45 | +#include <poll.h> | 45 | +#include <poll.h> |
46 | #include <fcntl.h> | 46 | #include <fcntl.h> |
47 | #include <unistd.h> | ||
48 | 47 | ||
49 | diff --git a/src/eventloop.cpp b/src/eventloop.cpp | 48 | using namespace DBus; |
50 | index f622812..7790e1e 100644 | 49 | Index: libdbus-c++-0.9.0/src/eventloop.cpp |
51 | --- a/src/eventloop.cpp | 50 | =================================================================== |
52 | +++ b/src/eventloop.cpp | 51 | --- libdbus-c++-0.9.0.orig/src/eventloop.cpp |
52 | +++ libdbus-c++-0.9.0/src/eventloop.cpp | ||
53 | @@ -28,7 +28,7 @@ | 53 | @@ -28,7 +28,7 @@ |
54 | #include <dbus-c++/eventloop.h> | 54 | #include <dbus-c++/eventloop.h> |
55 | #include <dbus-c++/debug.h> | 55 | #include <dbus-c++/debug.h> |
@@ -59,10 +59,10 @@ index f622812..7790e1e 100644 | |||
59 | #include <sys/time.h> | 59 | #include <sys/time.h> |
60 | 60 | ||
61 | #include <dbus/dbus.h> | 61 | #include <dbus/dbus.h> |
62 | diff --git a/src/pipe.cpp b/src/pipe.cpp | 62 | Index: libdbus-c++-0.9.0/src/pipe.cpp |
63 | index 01211b3..45c2ba6 100644 | 63 | =================================================================== |
64 | --- a/src/pipe.cpp | 64 | --- libdbus-c++-0.9.0.orig/src/pipe.cpp |
65 | +++ b/src/pipe.cpp | 65 | +++ libdbus-c++-0.9.0/src/pipe.cpp |
66 | @@ -32,7 +32,7 @@ | 66 | @@ -32,7 +32,7 @@ |
67 | 67 | ||
68 | /* STD */ | 68 | /* STD */ |
@@ -72,6 +72,3 @@ index 01211b3..45c2ba6 100644 | |||
72 | #include <fcntl.h> | 72 | #include <fcntl.h> |
73 | #include <errno.h> | 73 | #include <errno.h> |
74 | #include <cassert> | 74 | #include <cassert> |
75 | -- | ||
76 | 2.10.2 | ||
77 | |||
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> | |||
24 | include/dbus-c++/eventloop-integration.h | 1 + | 24 | include/dbus-c++/eventloop-integration.h | 1 + |
25 | 1 file changed, 1 insertion(+) | 25 | 1 file changed, 1 insertion(+) |
26 | 26 | ||
27 | diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h | 27 | Index: libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h |
28 | index 5108340..1b56ab5 100644 | 28 | =================================================================== |
29 | --- a/include/dbus-c++/eventloop-integration.h | 29 | --- libdbus-c++-0.9.0.orig/include/dbus-c++/eventloop-integration.h |
30 | +++ b/include/dbus-c++/eventloop-integration.h | 30 | +++ libdbus-c++-0.9.0/include/dbus-c++/eventloop-integration.h |
31 | @@ -27,6 +27,7 @@ | 31 | @@ -26,6 +26,7 @@ |
32 | #define __DBUSXX_EVENTLOOP_INTEGRATION_H | ||
32 | 33 | ||
33 | #include <cstring> | ||
34 | #include <errno.h> | 34 | #include <errno.h> |
35 | +#include <unistd.h> | 35 | +#include <unistd.h> |
36 | #include "api.h" | 36 | #include "api.h" |
37 | #include "dispatcher.h" | 37 | #include "dispatcher.h" |
38 | #include "util.h" | 38 | #include "util.h" |
39 | -- | ||
40 | 1.7.9.7 | ||