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

[Felix Yan]

    Date: Thursday, May 23, 2019 @ 14:07:07
  Author: felixonmars
Revision: 469368

upgpkg: deepin-kwin 0.0.7-1

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

----------------+
 PKGBUILD       |   16 ++++---------
 new-kwin.patch |   65 -------------------------------------------------------
 2 files changed, 5 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-23 14:06:25 UTC (rev 469367)
+++ PKGBUILD	2019-05-23 14:07:07 UTC (rev 469368)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-kwin
-pkgver=0.0.6
+pkgver=0.0.7
 pkgrel=1
 pkgdesc='KWin configures on DDE'
 arch=('x86_64')
@@ -10,19 +10,13 @@
 url="https://github.com/linuxdeepin/dde-kwin"
 license=('GPL3')
 depends=('deepin-qt5integration' 'kwin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-kwin/archive/$pkgver.tar.gz"
-        new-kwin.patch)
-sha512sums=('fe8103c7cbb6486b655116f37c175ac27785cf5f742a10d9062039c179fbc09d3ec9f951835518466a011d65c570843a69fd2cf9b12a1614f37b2c6e2bec1845'
-            '771ac8b0b80f15e46fa857ab5ee7c5f28ac79fc82e95999077ffbf8dfa63669a9e6c746f355438211145390ea3af108b31b7683e5193b82ccd9cc00d24abb3f2')
+makedepends=('expac' 'qt5-tools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-kwin/archive/$pkgver.tar.gz")
+sha512sums=('6e333558e4434e346aae3cf1678af9fb44510d94f92e50e81766c418de4cd7a344023a7057a4d1a0a591180c858fc7c526d7590a1c284b4e3f89d087412fb8e7')
 
-prepare() {
-  cd dde-kwin-$pkgver
-  patch -p1 -i ../new-kwin.patch
-}
-
 build() {
   cd dde-kwin-$pkgver
-  qmake-qt5 PREFIX=/usr
+  qmake-qt5 PREFIX=/usr KWIN_VERSION=$(expac %v kwin | cut -d - -f 1)
   make
 }
 

Deleted: new-kwin.patch
===================================================================
--- new-kwin.patch	2019-05-23 14:06:25 UTC (rev 469367)
+++ new-kwin.patch	2019-05-23 14:07:07 UTC (rev 469368)
@@ -1,65 +0,0 @@
-diff --git a/plugins/kwin-xcb/lib/kwinutils.cpp b/plugins/kwin-xcb/lib/kwinutils.cpp
-index 7a0bf5c..eca85e2 100644
---- a/plugins/kwin-xcb/lib/kwinutils.cpp
-+++ b/plugins/kwin-xcb/lib/kwinutils.cpp
-@@ -79,16 +79,6 @@ public:
- public Q_SLOTS:
-     void slotWindowMove();
-     void slotWindowMaximize();
--
--    // kwin 5.8.6
--    void slotWindowQuickTileLeft();
--    void slotWindowQuickTileRight();
--    void slotWindowQuickTileTop();
--    void slotWindowQuickTileBottom();
--    void slotWindowQuickTileTopLeft();
--    void slotWindowQuickTileTopRight();
--    void slotWindowQuickTileBottomLeft();
--    void slotWindowQuickTileBottomRight();
- };
- class Scripting : public QObject {
- public:
-@@ -388,43 +378,6 @@ void KWinUtils::QuickTileWindow(uint side)
-     if (ws) {
-         if (interface->quickTileWindow) {
-             interface->quickTileWindow(ws, (KWin::Workspace::QuickTileFlag)side);
--        } else { // fallback for kwin 5.8.6
--            switch ((KWin::Workspace::QuickTileFlag)side) {
--            case KWin::Workspace::QuickTileFlag::Left:
--                ws->slotWindowQuickTileLeft();
--                break;
--            case KWin::Workspace::QuickTileFlag::Right:
--                ws->slotWindowQuickTileRight();;
--                break;
--            case KWin::Workspace::QuickTileFlag::Top:
--                ws->slotWindowQuickTileTop();
--                break;
--            case KWin::Workspace::QuickTileFlag::Bottom:
--                ws->slotWindowQuickTileBottom();
--                break;
--            case KWin::Workspace::QuickTileFlag::Horizontal:
--                ws->slotWindowQuickTileLeft();
--                ws->slotWindowQuickTileRight();
--                break;
--            case KWin::Workspace::QuickTileFlag::Vertical:
--                ws->slotWindowQuickTileTop();
--                ws->slotWindowQuickTileBottom();
--                break;
--            case KWin::Workspace::QuickTileFlag::TopLeft:
--                ws->slotWindowQuickTileTopLeft();
--                break;
--            case KWin::Workspace::QuickTileFlag::TopRight:
--                ws->slotWindowQuickTileTopRight();
--                break;
--            case KWin::Workspace::QuickTileFlag::BottomLeft:
--                ws->slotWindowQuickTileBottomLeft();
--                break;
--            case KWin::Workspace::QuickTileFlag::BottomRight:
--                ws->slotWindowQuickTileBottomRight();
--                break;
--            default:
--                break;
--            }
-         }
-     }
- }