krfb: update to 24.05.1.

This commit is contained in:
Luciogi 2024-06-19 03:03:25 +05:00 committed by Đoàn Trần Công Danh
parent 35a6dd2bb9
commit dae9f666c3
2 changed files with 3 additions and 67 deletions

View File

@ -1,64 +0,0 @@
From 36349df89bfd8b213074e61faac4c5651d439cdd Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 20 May 2024 19:56:20 +0200
Subject: [PATCH] Fix build with >=QtWaylandScanner-6.7.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
framebuffers/pipewire/CMakeLists.txt | 16 +++++++++++-----
framebuffers/pipewire/screencasting.cpp | 4 ++++
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt
index b4ce9bad..68ca76e0 100644
--- a/framebuffers/pipewire/CMakeLists.txt
+++ b/framebuffers/pipewire/CMakeLists.txt
@@ -9,11 +9,6 @@ set (krfb_framebuffer_pw_SRCS
screencasting.cpp
)
-ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS
- PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
- BASENAME zkde-screencast-unstable-v1
-)
-
ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
HEADER krfb_fb_pipewire_debug.h
IDENTIFIER KRFB_FB_PIPEWIRE
@@ -39,6 +34,17 @@ add_library(krfb_framebuffer_pw
${krfb_framebuffer_pw_SRCS}
)
set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
+if (Qt6_VERSION VERSION_LESS "6.7.1")
+ ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw
+ PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+ BASENAME zkde-screencast-unstable-v1
+ )
+else()
+ qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw
+ FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+ )
+endif()
+
target_link_libraries(krfb_framebuffer_pw
Qt::Core
diff --git a/framebuffers/pipewire/screencasting.cpp b/framebuffers/pipewire/screencasting.cpp
index 3c4d1abe..c338699f 100644
--- a/framebuffers/pipewire/screencasting.cpp
+++ b/framebuffers/pipewire/screencasting.cpp
@@ -5,7 +5,11 @@
*/
#include "screencasting.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1)
#include "qwayland-zkde-screencast-unstable-v1.h"
+#else
+#include "qwayland-screencast.h"
+#endif
#include <KWayland/Client/registry.h>
#include <QDebug>
#include <QRect>
--
GitLab

View File

@ -1,7 +1,7 @@
# Template file for 'krfb'
pkgname=krfb
version=24.02.2
revision=3
version=24.05.1
revision=1
build_style=cmake
build_helper=qemu
configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake
@ -20,4 +20,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
homepage="https://kde.org/applications/en/system/org.kde.krfb"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
checksum=cf92dfc7867e33604757a59ff8d288693bbf5fbb0cf0bc379c3f975d0e4e98e4
checksum=e73d3c04b5261d7ca83f36240d05536a3aa5a045b47b524a561920dbf5d91682