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

[Felix Yan]

    Date: Saturday, May 2, 2020 @ 13:17:20
  Author: felixonmars
Revision: 624385

upgpkg: deepin-kwin 5.0.14.1-1

Modified:
  deepin-kwin/trunk/PKGBUILD
Deleted:
  deepin-kwin/trunk/kwin-5.17.patch

-----------------+
 PKGBUILD        |   16 ++++++-------
 kwin-5.17.patch |   64 ------------------------------------------------------
 2 files changed, 8 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-02 13:14:36 UTC (rev 624384)
+++ PKGBUILD	2020-05-02 13:17:20 UTC (rev 624385)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-kwin
-pkgver=0.1.0
-pkgrel=8
+pkgver=5.0.14.1
+pkgrel=1
 pkgdesc='KWin configures on DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-kwin"
@@ -12,16 +12,16 @@
 depends=('deepin-qt5integration' 'kwin')
 makedepends=('cmake' 'expac' 'qt5-tools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-kwin/archive/$pkgver.tar.gz"
-        kwin-5.17.patch
-        $pkgname-tabbox-chameleon-rename.patch::https://github.com/linuxdeepin/dde-kwin/pull/106.patch)
-sha512sums=('ae670e9f7763df5d614b39e6e0752e04a8ff56cfedaac06272a3a626fe61b3be11cc68d17fb6e2758d50b55a8895e9932d4a70720fcecd8c0e26737aa35a6061'
-            '6ac5358d4b8aeefd086e4396603cff453051e5bba7237c1e1524659de6741142be840da90556606fda47c8ecde8da30df4caf2508611d7b5de1066c2a33f8521'
-            '7ac1a577868b73314274d336287334acc5bf4ac06dde046c93e4c2d3f68a112389c8b0644d1cbc3fde5ba1c01f368676f4f34b4a1b7b6c97a5b73d66507d134d')
+        $pkgname-tabbox-chameleon-rename.patch::https://github.com/linuxdeepin/dde-kwin/pull/106.patch
+        $pkgname-build-fix.patch::https://github.com/linuxdeepin/dde-kwin/pull/109.patch)
+sha512sums=('9b3b55401646b189650076d9aae4266634f531de8100fbb0cdc7d487d9d51e8bb2c9567f21839a49f8bcbdd442d5010a20718ca9010582389e112c71bf209115'
+            '7ac1a577868b73314274d336287334acc5bf4ac06dde046c93e4c2d3f68a112389c8b0644d1cbc3fde5ba1c01f368676f4f34b4a1b7b6c97a5b73d66507d134d'
+            '3e10241050959b51bdd6bf752253af61a2b5899c3df5d84716bd1688d9292ff65d2b7d3aea8f61e896081a9bee013cb3f4c2f42f7915038f7f476120a44cf029')
 
 prepare() {
   cd dde-kwin-$pkgver
-  patch -p2 -i ../kwin-5.17.patch
   patch -p1 -i ../$pkgname-tabbox-chameleon-rename.patch
+  patch -p1 -i ../$pkgname-build-fix.patch
 }
 
 build() {

Deleted: kwin-5.17.patch
===================================================================
--- kwin-5.17.patch	2020-05-02 13:14:36 UTC (rev 624384)
+++ kwin-5.17.patch	2020-05-02 13:17:20 UTC (rev 624385)
@@ -1,64 +0,0 @@
-diff --git a/dde-kwin-0.1.0/plugins/kwin-xcb/lib/kwinutils.cpp.orig b/dde-kwin-0.1.0/plugins/kwin-xcb/lib/kwinutils.cpp
-index 999f23b..b618c54 100644
---- a/dde-kwin-0.1.0/plugins/kwin-xcb/lib/kwinutils.cpp.orig
-+++ b/dde-kwin-0.1.0/plugins/kwin-xcb/lib/kwinutils.cpp
-@@ -129,10 +129,6 @@ class Compositor : public QObject
- public:
-     enum SuspendReason { NoReasonSuspend = 0, UserSuspend = 1<<0, BlockRuleSuspend = 1<<1, ScriptSuspend = 1<<2, AllReasonSuspend = 0xff };
-     static Compositor *s_compositor;
--
--public Q_SLOTS:
--    void suspend(Compositor::SuspendReason reason);
--    void resume(Compositor::SuspendReason reason);
- };
- 
- // 光标管理
-@@ -222,6 +218,7 @@ class KWinInterface
-     typedef xcb_cursor_t (*X11CursorGetCursor)(Qt::CursorShape);
-     typedef KWin::Options::WindowOperation (*OptionsWindowOperation)(const QString &, bool);
-     typedef QObject *(*WorkspaceFindClient)(KWinUtils::Predicate, xcb_window_t);
-+    typedef void (*CompositorToggle)(void *, KWin::Compositor::SuspendReason);
- public:
-     KWinInterface()
-     {
-@@ -232,6 +229,8 @@ public:
-         x11CursorGetCursor = (X11CursorGetCursor)KWinUtils::resolve("_ZN4KWin6Cursor12getX11CursorEN2Qt11CursorShapeE");
-         optionsWindowOperation = (OptionsWindowOperation)KWinUtils::resolve("_ZN4KWin7Options15windowOperationERK7QStringb");
-         findClient = (WorkspaceFindClient)KWinUtils::resolve("_ZNK4KWin9Workspace10findClientENS_9PredicateEj");
-+        compositorSuspend = (CompositorToggle)KWinUtils::resolve("_ZN4KWin13X11Compositor7suspendENS0_13SuspendReasonE");
-+        compositorResume = (CompositorToggle)KWinUtils::resolve("_ZN4KWin13X11Compositor6resumeENS0_13SuspendReasonE");
-     }
- 
-     ClientMaximizeMode clientMaximizeMode;
-@@ -241,6 +240,8 @@ public:
-     X11CursorGetCursor x11CursorGetCursor;
-     OptionsWindowOperation optionsWindowOperation;
-     WorkspaceFindClient findClient;
-+    CompositorToggle compositorSuspend;
-+    CompositorToggle compositorResume;
- };
- 
- Q_GLOBAL_STATIC(KWinInterface, interface)
-@@ -609,18 +610,18 @@ void KWinUtils::ShowWorkspacesView()
- 
- void KWinUtils::ResumeCompositor(int type)
- {
--    if (!KWin::Compositor::s_compositor)
-+    if (!KWin::Compositor::s_compositor || !interface->compositorResume)
-         return;
- 
--    KWin::Compositor::s_compositor->resume(static_cast<KWin::Compositor::SuspendReason>(type));
-+    interface->compositorResume(KWin::Compositor::s_compositor, static_cast<KWin::Compositor::SuspendReason>(type));
- }
- 
- void KWinUtils::SuspendCompositor(int type)
- {
--    if (!KWin::Compositor::s_compositor)
-+    if (!KWin::Compositor::s_compositor || !interface->compositorSuspend)
-         return;
- 
--    KWin::Compositor::s_compositor->suspend(static_cast<KWin::Compositor::SuspendReason>(type));
-+    interface->compositorSuspend(KWin::Compositor::s_compositor, static_cast<KWin::Compositor::SuspendReason>(type));
- }
- 
- void KWinUtils::ShowAllWindowsView()