kwin: update to 6.0.4

This commit is contained in:
John 2024-03-05 13:37:02 +01:00 committed by Đoàn Trần Công Danh
parent dbfef4f542
commit 883397a1c6
2 changed files with 26 additions and 19 deletions

View File

@ -1,11 +1,11 @@
--- kwin-5.25.1/src/wayland/tools/CMakeLists.txt 2022-06-26 00:46:39.113938615 +0200 --- kwin-6.0.0/src/wayland/tools/CMakeLists.txt 2024-02-22 10:52:24.000000000 +0100
+++ - 2022-06-26 00:47:07.556852317 +0200 +++ - 2024-03-05 14:58:18.547351388 +0100
@@ -12,7 +12,7 @@ @@ -13,7 +13,7 @@
if(CMAKE_CROSSCOMPILING AND QTWAYLANDSCANNER_KDE_EXECUTABLE) if(CMAKE_CROSSCOMPILING AND QTWAYLANDSCANNER_KDE_EXECUTABLE)
add_executable(qtwaylandscanner_kde IMPORTED GLOBAL) add_executable(qtwaylandscanner_kde IMPORTED GLOBAL)
set_target_properties(qtwaylandscanner_kde PROPERTIES IMPORTED_LOCATION ${QTWAYLANDSCANNER_KDE_EXECUTABLE}) set_target_properties(qtwaylandscanner_kde PROPERTIES IMPORTED_LOCATION ${QTWAYLANDSCANNER_KDE_EXECUTABLE})
-elseif(CMAKE_CROSSCOMPILING) -elseif(CMAKE_CROSSCOMPILING)
+elseif(CMAKE_CROSSCOMPILING AND NOT FORCE_CROSSCOMPILED_TOOLS) +elseif(CMAKE_CROSSCOMPILING AND NOT FORCE_CROSSCOMPILED_TOOLS)
if (NOT KF5_HOST_TOOLING) if (NOT KF6_HOST_TOOLING)
message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF5_HOST_TOOLING=path") message(FATAL_ERROR "Please provide a prefix with a native Qt build and pass -DKF6_HOST_TOOLING=path")
endif() endif()

View File

@ -1,29 +1,36 @@
# Template file for 'kwin' # Template file for 'kwin'
pkgname=kwin pkgname=kwin
version=5.27.11 version=6.0.4
revision=1 revision=1
build_style=cmake build_style=cmake
build_helper=qemu build_helper=qemu
configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON
-DKF5_HOST_TOOLING=/usr/lib/cmake" -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QMLDIR=lib/qt6/qml
hostmakedepends="extra-cmake-modules gettext breeze pkg-config -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
qt5-qmake qt5-host-tools kcoreaddons kconfig-devel qt5-wayland hostmakedepends="extra-cmake-modules gettext pkg-config kf6-kauth-tools
kwayland-devel kpackage-devel kservice-devel kcmutils-devel" qt6-base qt6-tools libcap-progs kf6-kconfig kf6-kpackage kf6-kcmutils
makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel qt6-wayland-tools"
kscreenlocker-devel kinit-devel xcb-util-cursor-devel qt5-multimedia-devel makedepends="libplasma-devel kf6-kcmutils-devel kf6-knewstuff-devel
kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel kscreenlocker-devel kglobalacceld-devel xcb-util-cursor-devel qt6-wayland-devel
libICE-devel xcb-util-wm-devel qt5-sensors-devel lcms2-devel qt6-multimedia-devel kf6-kdecoration-devel libxkbcommon-devel libinput-devel
pipewire-devel krunner-devel xorg-server-xwayland libxcvt-devel hwids" libSM-devel libICE-devel xcb-util-wm-devel qt6-sensors-devel lcms2-devel
depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0 pipewire-devel kf6-krunner-devel xorg-server-xwayland libxcvt-devel hwids
hwids libcap-progs" 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" short_desc="KDE Window manager"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kwin" homepage="https://invent.kde.org/plasma/kwin"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" distfiles="${KDE_SITE}/plasma/${version:0:5}/${pkgname}-${version}.tar.xz"
checksum=8902b23b29bd54cd26590fe04abfe58fe334a5bf9c0dfd1f7dc5aacc4191b56f checksum=f5552f8c5b179e272fee33a19249686573eabffddd5541bc31f8fd7069baa82b
replaces="kwayland-server>=0" replaces="kwayland-server>=0"
if [ $CROSS_BUILD ]; then
hostmakedepends+=" kf6-kirigami-devel libcap-devel"
fi
kwin-devel_package() { kwin-devel_package() {
short_desc+=" - development" short_desc+=" - development"
depends="${makedepends} ${sourcepkg}-${version}_${revision}" depends="${makedepends} ${sourcepkg}-${version}_${revision}"