From f7c4193e691ed17ede338c075591ea775c36fece Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 25 Jan 2023 22:24:26 -0800 Subject: 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 --- meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb | 30 -------------------- meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb | 26 ++++++++++++++++++ .../files/0001-Include-typeinfo-for-typeid.patch | 29 -------------------- .../files/0001-include-utility-header.patch | 32 ---------------------- .../dbus-cxx/files/fix_build_musl.patch | 12 -------- 5 files changed, 26 insertions(+), 103 deletions(-) delete mode 100644 meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb create mode 100644 meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb deleted file mode 100644 index bf1220788e..0000000000 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "D-Bus wrapper in C++ for dbus" -HOMEPAGE = "https://dbus-cxx.github.io/" -BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" -SECTION = "base" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" - -SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ - file://0001-Include-typeinfo-for-typeid.patch \ - file://0001-include-utility-header.patch \ - file://0001-Include-missing-cstdint.patch \ -" -SRC_URI:append:libc-musl = " file://fix_build_musl.patch" -SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" - -DEPENDS = "\ - dbus \ - libsigc++-3 \ -" - -RDEPENDS:${PN} = "\ - dbus \ - libsigc++-3 \ -" - -S = "${WORKDIR}/git" - -inherit pkgconfig cmake - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb new file mode 100644 index 0000000000..7af62b7418 --- /dev/null +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "D-Bus wrapper in C++ for dbus" +HOMEPAGE = "https://dbus-cxx.github.io/" +BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" +SECTION = "base" +LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" + +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ + file://0001-Include-missing-cstdint.patch" +SRCREV = "898f6ea8f7ffe454e81a9337002df555728d4199" + +DEPENDS = "\ + dbus \ + libsigc++-3 \ +" + +RDEPENDS:${PN} = "\ + dbus \ + libsigc++-3 \ +" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" 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 @@ -From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 02:00:48 +0100 -Subject: [PATCH] Include typeinfo for typeid() - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Upstream-Status: Submitted -[https://github.com/dbus-cxx/dbus-cxx/pull/83] ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H --- -2.25.1 - 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 @@ -From 63170cfcfbf483716ce2599e165db80713fc2706 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Apr 2022 06:47:19 -0700 -Subject: [PATCH] include utility header - -Needed for exchange from std namespace - -Fixes -dbus-cxx/variant.cpp:135:25: error: 'exchange' is not a member of 'std' - -Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/98] - -Signed-off-by: Khem Raj ---- - dbus-cxx/variant.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/variant.cpp b/dbus-cxx/variant.cpp -index bcf2684..97b622c 100644 ---- a/dbus-cxx/variant.cpp -+++ b/dbus-cxx/variant.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include "enums.h" - #include "path.h" - #include "signature.h" --- -2.35.1 - 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 @@ -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; -- cgit 1.2.3-korg