mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

dbus-cxx: update to 2.1.0

Browse Source 
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Oleksandr Kravchuk
2021-12-13 02:30:45 +01:00
committed by Khem Raj
parent 1b65c0ef72
commit 9654d1c080
3 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb → meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb
+8 -6
View File
@@ -1,22 +1,24 @@
SUMMARY = "D-Bus wrapper in C++ for dbus" SUMMARY = "D-Bus wrapper in C++ for dbus"
HOMEPAGE = "https://dbus-cxx.github.io/" HOMEPAGE = "https://dbus-cxx.github.io/"
BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues"
SECTION = "base" SECTION = "base"
LICENSE = "GPLv3" LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83"
FILEEXTRAPATHS:prepend = "${THISDIR}/files" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \
SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" file://0001-Include-typeinfo-for-typeid.patch \
SRC_URI += "file://fix_build_musl.patch" "
SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" SRC_URI:append:libc-musl = "file://fix_build_musl.patch"
SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264"
DEPENDS = "\ DEPENDS = "\
dbus \ dbus \
libsigc++-2.0 \ libsigc++-3 \
" "
RDEPENDS:${PN} = "\ RDEPENDS:${PN} = "\
dbus \ dbus \
libsigc++-2.0 \ libsigc++-3 \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch
+29
View File
@@ -0,0 +1,29 @@
From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001
From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Date: Mon, 13 Dec 2021 02:00:48 +0100
Subject: [PATCH] Include typeinfo for typeid()
Otherwise fails with:
error: must '#include <typeinfo>' 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 <string>
+#include <typeinfo>
#include <dbus-cxx/dbus-cxx-config.h>
#if DBUS_CXX_HAS_CXXABI_H
--
2.25.1
meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch
+12 -26
View File
@@ -1,26 +1,12 @@
diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp
index 16e9f7e..aa0b99f 100644 index e8a6060..7a76af6 100644
--- a/dbus-cxx/timeout.cpp --- a/dbus-cxx/sasl.cpp
+++ b/dbus-cxx/timeout.cpp +++ b/dbus-cxx/sasl.cpp
@@ -132,7 +132,7 @@ namespace DBus @@ -70,7 +70,7 @@ std::tuple<bool, bool, std::vector<uint8_t>> SASL::authenticate() {
return m_cobj; bool success = false;
} bool negotiatedFD = false;
std::vector<uint8_t> serverGUID;
- void Timeout::timer_callback_proxy( sigval_t sv ) { - __uid_t uid = getuid();
+ void Timeout::timer_callback_proxy( union sigval sv ) { + uid_t uid = getuid();
SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" ); std::string line;
Timeout* t; std::smatch regex_match;
t = ( Timeout* ) sv.sival_ptr;
diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h
index 1e469b5..5b69fbb 100644
--- a/dbus-cxx/timeout.h
+++ b/dbus-cxx/timeout.h
@@ -83,7 +83,7 @@ namespace DBus
std::mutex m_arming_mutex;
- static void timer_callback_proxy( sigval_t sv );
+ static void timer_callback_proxy( union sigval sv );
};