From 3ddd45491d82f99e3d4d9955f1ae2de1c7d54bfe Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Wed, 23 Oct 2024 14:12:26 +0200
Subject: [PATCH] xdg-desktop-portal-hyprland: update

-use sdbus-c++-2
---
 .../xdg-desktop-portal-hyprland.bb            |  2 +-
 .../xdg-desktop-portal-hyprland.inc           |  4 +-
 recipes-core/sdbus-c++/sdbus-c++-1/run-ptest  |  6 ---
 recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb   | 51 -------------------
 4 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100755 recipes-core/sdbus-c++/sdbus-c++-1/run-ptest
 delete mode 100644 recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb

diff --git a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb
index bab1e49..532fbc0 100644
--- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb
+++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb
@@ -17,7 +17,7 @@ DEPENDS = " \
     hyprwayland-scanner-native \
     libdrm \
     pipewire \
-    sdbus-c++-1 \
+    sdbus-c++ \
     virtual/libgbm \
     wayland \
     wayland-protocols \
diff --git a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc
index 97eb5cf..b84138d 100644
--- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc
+++ b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc
@@ -1,3 +1,3 @@
 SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
-SRCREV = "7e500e679ede40e79cf2d89b5f5fa3e34923bd26"
-PV = "1.3.6"
+SRCREV = "05f4271dfc5d4cef9710db654eb1dd9894a16ac0"
+PV = "1.3.7"
diff --git a/recipes-core/sdbus-c++/sdbus-c++-1/run-ptest b/recipes-core/sdbus-c++/sdbus-c++-1/run-ptest
deleted file mode 100755
index 5e285b3..0000000
--- a/recipes-core/sdbus-c++/sdbus-c++-1/run-ptest
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-
-./sdbus-c++-unit-tests 2>&1 && echo "PASS: sdbus-c++-unit-tests" || echo "FAIL: sdbus-c++-unit-tests"
-
-./sdbus-c++-integration-tests 2>&1 && echo "PASS: sdbus-c++-integration-tests" || echo "FAIL: sdbus-c++-integration-tests"
diff --git a/recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb b/recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb
deleted file mode 100644
index 0a59e13..0000000
--- a/recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "sdbus-c++"
-DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++"
-
-SECTION = "libs"
-
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742"
-
-inherit cmake pkgconfig systemd ptest
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \
-                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
-PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu"
-PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd"
-PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock"
-
-DEPENDS += "expat"
-
-PV .= "+git"
-SRCREV = "7450515d0bc632b871d0d3f549ddb24783dd008f"
-SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
-           file://run-ptest"
-
-EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
-                 -DBUILD_DOC=ON \
-                 -DBUILD_DOXYGEN_DOC=OFF"
-
-S = "${WORKDIR}/git"
-
-# Link libatomic on architectures without 64bit atomics fixes
-# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8'
-LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-
-do_install:append() {
-    if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
-        rm -rf ${D}${sysconfdir}/dbus-1
-    fi
-}
-
-do_install_ptest() {
-    DESTDIR='${D}' cmake_runcmake_build --target tests/install
-}
-
-FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
-FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"
-
-RDEPENDS:${PN}-ptest += "dbus"
-# It adds -isystem which is spurious, no idea where it gets it from
-CCACHE_DISABLE = "1"