diff --git a/srcpkgs/kwin/patches/cross.patch b/srcpkgs/kwin/patches/cross.patch index da051cc59ec..d0693b78d89 100644 --- a/srcpkgs/kwin/patches/cross.patch +++ b/srcpkgs/kwin/patches/cross.patch @@ -1,11 +1,11 @@ ---- kwin-5.25.1/src/wayland/tools/CMakeLists.txt 2022-06-26 00:46:39.113938615 +0200 -+++ - 2022-06-26 00:47:07.556852317 +0200 -@@ -12,7 +12,7 @@ +--- kwin-6.0.0/src/wayland/tools/CMakeLists.txt 2024-02-22 10:52:24.000000000 +0100 ++++ - 2024-03-05 14:58:18.547351388 +0100 +@@ -13,7 +13,7 @@ if(CMAKE_CROSSCOMPILING AND QTWAYLANDSCANNER_KDE_EXECUTABLE) add_executable(qtwaylandscanner_kde IMPORTED GLOBAL) set_target_properties(qtwaylandscanner_kde PROPERTIES IMPORTED_LOCATION ${QTWAYLANDSCANNER_KDE_EXECUTABLE}) -elseif(CMAKE_CROSSCOMPILING) +elseif(CMAKE_CROSSCOMPILING AND NOT FORCE_CROSSCOMPILED_TOOLS) - if (NOT KF5_HOST_TOOLING) - message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF5_HOST_TOOLING=path") + if (NOT KF6_HOST_TOOLING) + message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF6_HOST_TOOLING=path") endif() diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index a8286601831..314bfd89467 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,29 +1,36 @@ # Template file for 'kwin' pkgname=kwin -version=5.27.11 +version=6.0.4 revision=1 build_style=cmake build_helper=qemu configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON - -DKF5_HOST_TOOLING=/usr/lib/cmake" -hostmakedepends="extra-cmake-modules gettext breeze pkg-config - qt5-qmake qt5-host-tools kcoreaddons kconfig-devel qt5-wayland - kwayland-devel kpackage-devel kservice-devel kcmutils-devel" -makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel - kscreenlocker-devel kinit-devel xcb-util-cursor-devel qt5-multimedia-devel - kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel - libICE-devel xcb-util-wm-devel qt5-sensors-devel lcms2-devel - pipewire-devel krunner-devel xorg-server-xwayland libxcvt-devel hwids" -depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0 - hwids libcap-progs" + -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QMLDIR=lib/qt6/qml + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="extra-cmake-modules gettext pkg-config kf6-kauth-tools + qt6-base qt6-tools libcap-progs kf6-kconfig kf6-kpackage kf6-kcmutils + qt6-wayland-tools" +makedepends="libplasma-devel kf6-kcmutils-devel kf6-knewstuff-devel + kscreenlocker-devel kglobalacceld-devel xcb-util-cursor-devel qt6-wayland-devel + qt6-multimedia-devel kf6-kdecoration-devel libxkbcommon-devel libinput-devel + libSM-devel libICE-devel xcb-util-wm-devel qt6-sensors-devel lcms2-devel + pipewire-devel kf6-krunner-devel xorg-server-xwayland libxcvt-devel hwids + libdisplay-info-devel breeze-qt6 kf6-kwayland-devel libcap-devel + libqaccessibilityclient-devel qt6-declarative-devel kf6-kirigami-devel + kf6-kpackage-devel kf6-kauth-devel kf6-kconfig-devel" +depends="breeze hicolor-icon-theme kglobalacceld hwids libcap-progs" short_desc="KDE Window manager" maintainer="John " license="GPL-2.0-or-later" homepage="https://invent.kde.org/plasma/kwin" -distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=8902b23b29bd54cd26590fe04abfe58fe334a5bf9c0dfd1f7dc5aacc4191b56f +distfiles="${KDE_SITE}/plasma/${version:0:5}/${pkgname}-${version}.tar.xz" +checksum=f5552f8c5b179e272fee33a19249686573eabffddd5541bc31f8fd7069baa82b replaces="kwayland-server>=0" +if [ $CROSS_BUILD ]; then + hostmakedepends+=" kf6-kirigami-devel libcap-devel" +fi + kwin-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}-${version}_${revision}"