summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core/dbus-cxx/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-25 22:24:26 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-26 10:24:25 -0800
commitf7c4193e691ed17ede338c075591ea775c36fece (patch)
tree5a6cf6835d3f1ac9529ebc42140fa51b47e44c0b /meta-oe/recipes-core/dbus-cxx/files
parent52837056555a45202742d338d365d06b4e2711bd (diff)
downloadmeta-openembedded-f7c4193e691ed17ede338c075591ea775c36fece.tar.gz
dbus-cxx: Upgrade to 2.3.1
License-Update: Swith to new license [1] Drop upstreamed patches [1] https://github.com/dbus-cxx/dbus-cxx/commit/efe8d3587104bcd748d990da8b86de9e3ef9a0ed Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core/dbus-cxx/files')
-rw-r--r--meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch29
-rw-r--r--meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch32
-rw-r--r--meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch12
3 files changed, 0 insertions, 73 deletions
diff --git a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch b/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch
deleted file mode 100644
index 9117877403..0000000000
--- a/meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001
2From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
3Date: Mon, 13 Dec 2021 02:00:48 +0100
4Subject: [PATCH] Include typeinfo for typeid()
5
6Otherwise fails with:
7 error: must '#include <typeinfo>' before using 'typeid'
8
9Upstream-Status: Submitted
10[https://github.com/dbus-cxx/dbus-cxx/pull/83]
11---
12 dbus-cxx/demangle.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h
16index b71bcb9..9a4e99b 100644
17--- a/dbus-cxx/demangle.h
18+++ b/dbus-cxx/demangle.h
19@@ -21,6 +21,7 @@
20 #define DBUSCXX_DEMANGLE_H
21
22 #include <string>
23+#include <typeinfo>
24 #include <dbus-cxx/dbus-cxx-config.h>
25
26 #if DBUS_CXX_HAS_CXXABI_H
27--
282.25.1
29
diff --git a/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch b/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch
deleted file mode 100644
index 0c8262af75..0000000000
--- a/meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 63170cfcfbf483716ce2599e165db80713fc2706 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Apr 2022 06:47:19 -0700
4Subject: [PATCH] include utility header
5
6Needed for exchange from std namespace
7
8Fixes
9dbus-cxx/variant.cpp:135:25: error: 'exchange' is not a member of 'std'
10
11Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/98]
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 dbus-cxx/variant.cpp | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/dbus-cxx/variant.cpp b/dbus-cxx/variant.cpp
19index bcf2684..97b622c 100644
20--- a/dbus-cxx/variant.cpp
21+++ b/dbus-cxx/variant.cpp
22@@ -11,6 +11,7 @@
23 #include <dbus-cxx/dbus-cxx-private.h>
24 #include <dbus-cxx/signatureiterator.h>
25 #include <stdint.h>
26+#include <utility>
27 #include "enums.h"
28 #include "path.h"
29 #include "signature.h"
30--
312.35.1
32
diff --git a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch
deleted file mode 100644
index e55d987e43..0000000000
--- a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp
2index e8a6060..7a76af6 100644
3--- a/dbus-cxx/sasl.cpp
4+++ b/dbus-cxx/sasl.cpp
5@@ -70,7 +70,7 @@ std::tuple<bool, bool, std::vector<uint8_t>> SASL::authenticate() {
6 bool success = false;
7 bool negotiatedFD = false;
8 std::vector<uint8_t> serverGUID;
9- __uid_t uid = getuid();
10+ uid_t uid = getuid();
11 std::string line;
12 std::smatch regex_match;