diff options
Diffstat (limited to 'meta-oe/recipes-core/dbus-cxx')
| -rw-r--r-- | meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb (renamed from meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb) | 13 | ||||
| -rw-r--r-- | meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch | 26 |
2 files changed, 6 insertions, 33 deletions
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb index bf393cd87c..e89d1327e8 100644 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb @@ -1,22 +1,21 @@ SUMMARY = "D-Bus wrapper in C++ for dbus" HOMEPAGE = "https://dbus-cxx.github.io/" +BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" SECTION = "base" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" +LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" -FILEEXTRAPATHS:prepend = "${THISDIR}/files" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" -SRC_URI += "file://fix_build_musl.patch" -SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" +SRCREV = "732a5becb4349e02ffce407a3fd4d75cc3d82421" DEPENDS = "\ dbus \ - libsigc++-2.0 \ + libsigc++-3 \ " RDEPENDS:${PN} = "\ dbus \ - libsigc++-2.0 \ + libsigc++-3 \ " S = "${WORKDIR}/git" 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 3d912e0b01..0000000000 --- a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp -index 16e9f7e..aa0b99f 100644 ---- a/dbus-cxx/timeout.cpp -+++ b/dbus-cxx/timeout.cpp -@@ -132,7 +132,7 @@ namespace DBus - return m_cobj; - } - -- void Timeout::timer_callback_proxy( sigval_t sv ) { -+ void Timeout::timer_callback_proxy( union sigval sv ) { - SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" ); - Timeout* t; - 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 ); - - }; - |