[arch-commits] Commit in deepin-kwin/trunk (PKGBUILD kwin-5.19.patch)

[Felix Yan]

    Date: Wednesday, August 19, 2020 @ 23:48:19
  Author: felixonmars
Revision: 685253

upgpkg: deepin-kwin 5.1.0.20-3: fix patch again

Modified:
  deepin-kwin/trunk/PKGBUILD
  deepin-kwin/trunk/kwin-5.19.patch

-----------------+
 PKGBUILD        |    5 +++--
 kwin-5.19.patch |   13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-19 23:40:50 UTC (rev 685252)
+++ PKGBUILD	2020-08-19 23:48:19 UTC (rev 685253)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-kwin
 pkgver=5.1.0.20
-pkgrel=2
+pkgrel=3
 pkgdesc='KWin configures on DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-kwin"
@@ -25,11 +25,12 @@
             '800bb8770b4a6d835e27f33226f81dce92ddf10c295e02015419788e667e7d46b014d69bde73d03af8f0480c938526b48498368d2f16619689352f0e8e183912'
             '1e246657161b2d3790c8c4e7f372f7426434d727eda6f3ad656962a86f56f16cbeee56f4ae77006d71bfc3e9dc7481c7266238175d52c1517775af44a262ab2d'
             '8fe73f833e2b24fe9bbaf12220a9d41d5e4808c833d7e7878635a85429e6c474ae79189d75d1d4e77c78bafbe2855db37ded24c85768f9a9415a00a0456c9dce'
-            'a0b3a8682916ee3638823e57f21f9048a294cfdc893cd7f25c44466a876e96d0039a18eab33799a19cb952844778c117fcdda7209494dec3c8f3bdcf88a947d1')
+            'a33c21cae1d271b9e93df0b2987fb8c3956018406c88cc6a847b7f0e228316020b45f0961b67bf52b70b36da7840920bf729cc552f5ea765110766806756f348')
 
 prepare() {
   cd dde-kwin-$pkgver
   sed -i 's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|' plugins/kwineffects/multitasking/background.cpp
+  sed -i '/光标管理/,+6d' plugins/platforms/lib/kwinutils.cpp
   patch -R -p1 -i ../$pkgname-added-functions-from-their-forked-kwin.patch
   patch -p1 -i ../$pkgname-tabbox-chameleon-rename.patch
   patch -p1 -i ../$pkgname-build-fix.patch

Modified: kwin-5.19.patch
===================================================================
--- kwin-5.19.patch	2020-08-19 23:40:50 UTC (rev 685252)
+++ kwin-5.19.patch	2020-08-19 23:48:19 UTC (rev 685253)
@@ -4,6 +4,19 @@
 
     fix: compatibility with kwin 5.19
 
+diff --git a/plugins/platforms/lib/kwinutils.cpp b/plugins/platforms/lib/kwinutils.cpp
+index ed68ec8..f01a91e 100644
+--- a/plugins/platforms/lib/kwinutils.cpp
++++ b/plugins/platforms/lib/kwinutils.cpp
+@@ -589,7 +589,7 @@ QObject *KWinUtils::tabBox()
+
+ QObject *KWinUtils::cursor()
+ {
+-    return KWin::Cursor::s_self;
++    return nullptr; //KWin::Cursor;
+ }
+
+ QObject *KWinUtils::virtualDesktop()
 diff --git a/plugins/kwineffects/blur/blur.cpp b/plugins/kwineffects/blur/blur.cpp
 index b5cae9e..0354bc0 100644
 --- a/plugins/kwineffects/blur/blur.cpp