xdg-desktop-portal-hyprland: cleanup

Use cmake for all tasks and merge the recipes

dynamic-layers/meta-qt6/recipes-qt/hyprland/xdg-desktop-portal-hyprland/hyprland-share-picker.bb

@@ -1,18 +0,0 @@
-SUMMARY = "Share picker for hyprlands screenshot/screencast xdg-desktop-portal backend"
-HOMEPAGE = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
-
-# Note: meta-qt6 is needed
-DEPENDS = "qtbase hyprutils"
-RDEPENDS:${PN} = "qtwayland"
-
-require xdg-desktop-portal-hyprland.inc
-
-inherit qt6-cmake features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl wayland"
-
-S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}/hyprland-share-picker"
-
-

dynamic-layers/meta-qt6/recipes-qt/hyprland/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.inc

@@ -1,3 +0,0 @@
-SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
-SRCREV = "371b96bd11ad2006ed4f21229dbd1be69bed3e8a"
-PV = "1.3.10"

dynamic-layers/meta-qt6/recipes-qt/hyprland/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-Revert-core-add-version-and-improve-help.patch

@@ -1,61 +0,0 @@
-From 72cdf9a1eb442929d4e169168c54dc4af1bf15b7 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 29 Sep 2024 16:33:52 +0200
-Subject: [PATCH] Revert "core: add --version and improve --help"
-
-This reverts commit 15932f0f9e4185faad4e90fa53a09a59d2a72fdf.
-
-Upstream-Status: Pending
----
- CMakeLists.txt |  2 --
- src/main.cpp   | 14 +++++---------
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 66773db..8f194f7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,8 +21,6 @@ else()
-   message(STATUS "Configuring XDPH in Release with CMake")
- endif()
- 
--add_compile_definitions(XDPH_VERSION="${VER}")
--
- include_directories(. "protocols/")
- 
- # configure
-diff --git a/src/main.cpp b/src/main.cpp
-index cdeb83d..d7a4482 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -4,12 +4,11 @@
- #include "core/PortalManager.hpp"
- 
- void printHelp() {
--    std::cout << R"#(┃ xdg-desktop-portal-hyprland
--┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
--┃ -v (--verbose)    → enable trace logging
--┃ -q (--quiet)      → disable logging
--┃ -h (--help)       → print this menu
--┃ -V (--version)    → print xdph's version
-+    std::cout << R"#(| xdg-desktop-portal-hyprland
-+| --------------------------------------
-+| -v (--verbose) > enable trace logging
-+| -q (--quiet) > disable logging
-+| -h (--help) > print this menu
- )#";
- }
- 
-@@ -28,9 +27,6 @@ int main(int argc, char** argv, char** envp) {
-         else if (arg == "--help" || arg == "-h") {
-             printHelp();
-             return 0;
--        } else if (arg == "--version" || arg == "-V") {
--            std::cout << "xdg-desktop-portal-hyprland v" << XDPH_VERSION << "\n";
--            return 0;
-         } else {
-             printHelp();
-             return 1;
--- 
-2.46.0
-

dynamic-layers/meta-qt6/recipes-qt/hyprland/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch

@@ -1,24 +0,0 @@
-From 8d7b941147a48957d8464cce2058d52f37040d26 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Wed, 20 Sep 2023 16:56:17 +0200
-Subject: [PATCH] meson.build: Dont build hyprland-share-picker with meson
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Upstream-Status: Pending
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 77c1a80..3169e9c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -66,4 +66,3 @@ inc = include_directories('.', 'protocols')
- 
- subdir('protocols')
- subdir('src')
--subdir('hyprland-share-picker')
--- 
-2.42.0
-

dynamic-layers/meta-qt6/recipes-qt/hyprland/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland_1.3.10.bb

@@ -3,34 +3,31 @@ HOMEPAGE = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
 
-SRC_URI:append = " \
+SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
-	file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch \
+SRCREV = "371b96bd11ad2006ed4f21229dbd1be69bed3e8a"
-	file://0001-Revert-core-add-version-and-improve-help.patch \
-"
 
-require xdg-desktop-portal-hyprland.inc
-
-# Note: meta-qt6 is needed
 DEPENDS = " \
     hyprlang \
     hyprutils \
     hyprwayland-scanner-native \
+    hyprwayland-scanner \
     libdrm \
     pipewire \
+    qtbase \
     sdbus-c++ \
     virtual/libgbm \
     wayland \
     wayland-protocols \
 "
 
-RDEPENDS:${PN} = "hyprland-share-picker grim slurp hyprpicker hyprlang"
+RDEPENDS:${PN} = "grim slurp hyprlang"
 RCONFLICTS:${PN} = "xdg-desktop-portal-wlr xdg-desktop-portal-gnome"
 
-inherit meson pkgconfig features_check
+inherit qt6-cmake pkgconfig features_check
+
 REQUIRED_DISTRO_FEATURES = "opengl wayland"
 
-
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
+PACKAGECONFIG[systemd] = "-DSYSTEMD_SERVICES=ON,-DSYSTEMD_SERVICES=OFF"
 
 FILES:${PN} += "${systemd_user_unitdir} ${datadir}"