From 925d466c6858d7ed59c988ec60a3d61718852eb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 24 Jun 2022 09:21:06 +0200
Subject: [PATCH] kwin: update to 5.25.3.

---
 srcpkgs/kwin/patches/cross.patch | 20 ++++++++++----------
 srcpkgs/kwin/template            | 23 ++++++++++-------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/kwin/patches/cross.patch b/srcpkgs/kwin/patches/cross.patch
index 9653590b34f..da051cc59ec 100644
--- a/srcpkgs/kwin/patches/cross.patch
+++ b/srcpkgs/kwin/patches/cross.patch
@@ -1,11 +1,11 @@
---- a/src/effects/CMakeLists.txt	2022-02-07 13:48:20.000000000 +0100
-+++ -	2022-02-10 15:23:10.228131146 +0100
-@@ -8,7 +8,7 @@
-     kcoreaddons_add_plugin(${name} INSTALL_NAMESPACE "kwin/effects/configs" SOURCES ${ARGV})
- endfunction()
- 
--if (CMAKE_CROSSCOMPILING)
-+if (CMAKE_CROSSCOMPILING AND NOT FORCE_CROSSCOMPILED_TOOLS)
-     if (NOT KWIN_HOST_TOOLING)
-         message(FATAL_ERROR "Please provide the path to a native build and pass -DKWIN_HOST_TOOLING=path")
+--- 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 @@
+ 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")
      endif()
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 3aac33c97cd..bd5ef3a9776 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.5
+version=5.25.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -8,31 +8,28 @@ configure_args="-DBUILD_TESTING=OFF
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DFORCE_CROSSCOMPILED_TOOLS=ON"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config
- qt5-qmake qt5-host-tools kcoreaddons kconfig"
+ qt5-qmake qt5-host-tools kcoreaddons kconfig-devel qt5-wayland
+ kwayland-devel kpackage-devel kservice-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 libcap-devel lcms2-devel
- kwayland-server-devel $(vopt_if pipewire pipewire-devel) krunner-devel
- xorg-server-xwayland"
-depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0"
+ pipewire-devel krunner-devel xorg-server-xwayland libxcvt-devel hwids
+ libatomic-devel"
+depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0
+ hwids"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f35e15254cebeb8afc5eae1c694a603e04097fe3e7e0033a5f5fc255835eaf82
-
-build_options="pipewire"
-build_options_default="pipewire"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
+checksum=52927c7b6a2f28c6b8a515b1eb6f7faeacdc0d53321290887ebaffb9ab2fd0ef
+replaces="kwayland-server>=0"
 
 kwin-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	replaces="kwayland-server-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake