From b702cc9a5d474183ffa145705eb0667702aeaf89 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 19 Oct 2021 10:18:05 -0700
Subject: Updated to 5.23.0

---
 PKGBUILD | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 6e3265f..cd911bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 
 pkgname=kwin
-pkgver=5.22.5
-pkgrel=2
+pkgver=5.23.0
+pkgrel=1
 pkgdesc='An easy to use, but flexible, composited Window Manager'
 arch=(x86_64)
 url='https://kde.org/plasma-desktop/'
@@ -19,25 +19,29 @@ depends=(kscreenlocker xcb-util-cursor plasma-framework kcmutils kwayland-server
 makedepends=(extra-cmake-modules qt5-tools kdoctools krunner)
 optdepends=('maliit-keyboard: virtual keyboard for kwin-wayland')
 groups=(plasma)
-source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
-        kwin-libglvnd-1.3.4.patch::https://invent.kde.org/plasma/kwin/-/commit/83971020.patch)
+source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig})
+        #kwin-5.23.0-hotfix.patch::https://invent.kde.org/plasma/kwin/-/commit/85f8a533.patch)
 install=$pkgname.install
-sha256sums=('128daed41c1b9e65ddad3fe2ce3aea821ef54af520d3d39cde059b2c2bfcf5a3'
-            'SKIP'
-            '069489b49dd31ba33edbc3c0f915dccc299fa900d2f847c396418f8a51a08dda')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr@jriddell.org>
+sha256sums=('ba74f70648faa3c92c88e1b77916c6abd7fcad1af9e717a39dc9df278f1a551f'
+            'SKIP')
+            #'2c42a47dd1d62cde93d3d392d42056689d8fdbc24cd8497bd29adf113e16a7be')
+validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson@kde.org>
               '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
 
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < kwin-libglvnd-1.3.4.patch # Fix build with libglvnd 1.3.4
-}
+#prepare() {
+#  patch -d $pkgname-$pkgver -p1 < kwin-5.23.0-hotfix.patch # Properly unredirect windows if compositing is not possible
+#}
 
 build() {
 
   export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=auto -fPIC"
   export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=auto -fPIC"
+
+  # -fPIE, -pie breaks kwin
+  #export CFLAGS="$CFLAGS -fno-PIC -fPIE"
+  #export CXXFLAGS="$CFLAGS -fno-PIC -fPIE"
   #export LDFLAGS="$LDFLAGS,-pie"
 
   cmake -B build -S $pkgname-$pkgver \
-- 
cgit v1.2.1