Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
treeland
Commits:
33eef4b6 by Antonio Rojas at 2025-10-07T15:03:35+02:00
Fix build with Qt 6.10
- - - - -
2 changed files:
- PKGBUILD
- + qt-6.10.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -15,12 +15,15 @@ makedepends=('git' 'cmake' 'ninja' 'qt6-tools'
'wayland-protocols' 'wlr-protocol
'treeland-protocols' 'vulkan-headers')
replaces=('waylib' 'qwlroots')
conflicts=('waylib' 'qwlroots')
-source=("git+https://github.com/linuxdeepin/treeland.git#tag=$pkgver";)
-sha256sums=('add1dcd2588275fbf85d292fe2dd416ef31789ee21aa61b2cf548962770a509e')
+source=("git+https://github.com/linuxdeepin/treeland.git#tag=$pkgver";
+ qt-6.10.patch)
+sha256sums=('add1dcd2588275fbf85d292fe2dd416ef31789ee21aa61b2cf548962770a509e'
+ '9563ff0e432de3160965627cfae4537d448112aa355e310c40a01149ce76dedd')
prepare() {
cd treeland
sed -i
'/Q_MOC_INCLUDE(<QDBusObjectPath>)/aQ_MOC_INCLUDE("treelandconfig.hpp")'
src/seat/helper.h
+ patch -p1 -i ../qt-6.10.patch
}
build() {
=====================================
qt-6.10.patch
=====================================
@@ -0,0 +1,69 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7113ffa..263095c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -17,6 +17,9 @@ endif()
+ find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
+ find_package(Qt6 CONFIG REQUIRED ShaderTools Concurrent)
+ find_package(Qt6 COMPONENTS Quick QuickControls2 REQUIRED)
++if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ find_package(Qt6 COMPONENTS QuickPrivate REQUIRED)
++endif()
+ pkg_search_module(PIXMAN REQUIRED IMPORTED_TARGET pixman-1)
+ pkg_search_module(WAYLAND REQUIRED IMPORTED_TARGET wayland-server)
+ pkg_search_module(LIBINPUT REQUIRED IMPORTED_TARGET libinput)
+diff --git a/src/treeland-shortcut/CMakeLists.txt
b/src/treeland-shortcut/CMakeLists.txt
+index 2ad7338..b569596 100644
+--- a/src/treeland-shortcut/CMakeLists.txt
++++ b/src/treeland-shortcut/CMakeLists.txt
+@@ -1,4 +1,7 @@
+ find_package(Qt6 REQUIRED COMPONENTS WaylandClient Widgets DBus)
++if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ find_package(Qt6 COMPONENTS WaylandClientPrivate REQUIRED)
++endif()
+ find_package(TreelandProtocols REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_search_module(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
+diff --git a/waylib/examples/tinywl/CMakeLists.txt
b/waylib/examples/tinywl/CMakeLists.txt
+index 307fb45..767e62a 100644
+--- a/waylib/examples/tinywl/CMakeLists.txt
++++ b/waylib/examples/tinywl/CMakeLists.txt
+@@ -1,4 +1,7 @@
+ find_package(Qt6 COMPONENTS Quick QuickControls2 REQUIRED)
++if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ find_package(Qt6 COMPONENTS QuickPrivate REQUIRED)
++endif()
+ qt_standard_project_setup(REQUIRES 6.4)
+
+ if(QT_KNOWN_POLICY_QTP0001) # this policy was introduced in Qt 6.5
+diff --git a/waylib/src/server/CMakeLists.txt
b/waylib/src/server/CMakeLists.txt
+index 8ac09a6..67cc9ca 100644
+--- a/waylib/src/server/CMakeLists.txt
++++ b/waylib/src/server/CMakeLists.txt
+@@ -11,6 +11,10 @@ set(WAYLIB_INCLUDE_INSTALL_DIR
+
+ set(QT_COMPONENTS Core Gui Quick)
+ find_package(Qt6 COMPONENTS ${QT_COMPONENTS} REQUIRED)
++if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ set(QT_COMPONENTS ${QT_COMPONENTS} QuickPrivate)
++ find_package(Qt6 COMPONENTS QuickPrivate REQUIRED)
++endif()
+
+ qt_standard_project_setup(REQUIRES 6.6)
+
+diff --git a/waylib/src/server/platformplugin/qwlrootsintegration.cpp
b/waylib/src/server/platformplugin/qwlrootsintegration.cpp
+index 70d499c..f14a16c 100644
+--- a/waylib/src/server/platformplugin/qwlrootsintegration.cpp
++++ b/waylib/src/server/platformplugin/qwlrootsintegration.cpp
+@@ -39,7 +39,11 @@
+ #include <qpa/qplatformsurface.h>
+ #include <qpa/qwindowsysteminterface.h>
+ #include <qpa/qplatformoffscreensurface.h>
++#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
++#include <private/qgenericunixtheme_p.h>
++#else
+ #include <private/qgenericunixthemes_p.h>
++#endif
+
+ #ifndef QT_NO_OPENGL
+ #include <qpa/qplatformopenglcontext.h>
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/treeland/-/commit/33eef4b6da29c7643652824eab37df5060683ce1
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/treeland/-/commit/33eef4b6da29c7643652824eab37df5060683ce1
You're receiving this email because of your account on gitlab.archlinux.org.
