From 41978af7d65bd1a38ec64a4b1a4b6da87b66a5a6 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 29 Jul 2024 01:45:45 +0200 Subject: [PATCH] xdg-desktop-portal-hyprland: update --- .../xdg-desktop-portal-hyprland.bb | 1 - .../xdg-desktop-portal-hyprland.inc | 4 +-- ....hpp-drop-define-SPA_VERSION_POD_BUI.patch | 33 ------------------- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch 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 e764c71..cd39aee 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 @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352" SRC_URI:append = " \ file://0001-meson.build-Dont-build-hyprland-share-picker-with-me.patch \ - file://0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch \ " require xdg-desktop-portal-hyprland.inc 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 7bf380b..e11598a 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 = "24be4a26f0706e456fca1b61b8c79f7486a9e86d" -PV = "1.3.2" +SRCREV = "0e2f3b9c85f7bab3983098a01366876d34daf383" +PV = "1.3.3" diff --git a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch b/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch deleted file mode 100644 index 9d110d9..0000000 --- a/dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland/0001-ScreencopyShared.hpp-drop-define-SPA_VERSION_POD_BUI.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f181899034beb4311c8e63056ce73d00df6981c8 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Sun, 30 Jun 2024 15:10:05 +0200 -Subject: [PATCH] ScreencopyShared.hpp: drop #define - SPA_VERSION_POD_BUILDER_CALLBACKS - -This is defined in pipewire - -Fixes build with pipewire 1.2.0 -| ../git/src/portals/../core/../portals/../shared/ScreencopyShared.hpp:9:43: error: expected primary-expression before '.' token -| 9 | #define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0 - -Signed-off-by: Markus Volk ---- - src/shared/ScreencopyShared.hpp | 4 +--- - 1 file changed, 0 insertions(+), 2 deletions(-) - -diff --git a/src/shared/ScreencopyShared.hpp b/src/shared/ScreencopyShared.hpp -index d626da6..e3b0a94 100644 ---- a/src/shared/ScreencopyShared.hpp -+++ b/src/shared/ScreencopyShared.hpp -@@ -5,8 +5,6 @@ - extern "C" { - #include - --#undef SPA_VERSION_POD_BUILDER_CALLBACKS --#define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0 - #include - #include - #include --- -2.45.1 -