[arch-commits] Commit in deepin-kwin/trunk (4 files)

Felix Yan felixonmars at archlinux.org
Wed Nov 25 16:03:19 UTC 2020


    Date: Wednesday, November 25, 2020 @ 16:03:18
  Author: felixonmars
Revision: 761086

upgpkg: deepin-kwin 5.2.0.3-1

Modified:
  deepin-kwin/trunk/PKGBUILD
  deepin-kwin/trunk/deepin-kwin-added-functions-from-their-forked-kwin.patch
Deleted:
  deepin-kwin/trunk/deepin-kwin-qt5.15.patch
  deepin-kwin/trunk/kwin-5.19.patch

----------------------------------------------------------+
 PKGBUILD                                                 |   22 --
 deepin-kwin-added-functions-from-their-forked-kwin.patch |    6 
 deepin-kwin-qt5.15.patch                                 |   24 --
 kwin-5.19.patch                                          |  124 -------------
 4 files changed, 13 insertions(+), 163 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-25 15:48:41 UTC (rev 761085)
+++ PKGBUILD	2020-11-25 16:03:18 UTC (rev 761086)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-kwin
-pkgver=5.2.0.2
-pkgrel=4
+pkgver=5.2.0.3
+pkgrel=1
 pkgdesc='KWin configures on DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-kwin"
@@ -13,18 +13,12 @@
 makedepends=('extra-cmake-modules' 'expac' 'ninja' 'qt5-tools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-kwin/archive/$pkgver.tar.gz"
         $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
         $pkgname-unload-blur.patch
-        $pkgname-added-functions-from-their-forked-kwin.patch
-        deepin-kwin-qt5.15.patch
-        kwin-5.19.patch)
-sha512sums=('1d8243a4140f87f73b8bbf9a8b448a8d4bde9653d214382515493c306f47f2866a92b0fed049b26313a96898b18bd0e05a3e1c17eca53a68e82e7669a535ef7b'
+        $pkgname-added-functions-from-their-forked-kwin.patch)
+sha512sums=('b201032d2cdd72ad006920a73f950e9148ae918406111dec1ccacc8fd6ca37860a7d58f176a664429b9b14af43a2896facfa029984b8713e4e21e8ae792e4cce'
             '7ac1a577868b73314274d336287334acc5bf4ac06dde046c93e4c2d3f68a112389c8b0644d1cbc3fde5ba1c01f368676f4f34b4a1b7b6c97a5b73d66507d134d'
-            '3e10241050959b51bdd6bf752253af61a2b5899c3df5d84716bd1688d9292ff65d2b7d3aea8f61e896081a9bee013cb3f4c2f42f7915038f7f476120a44cf029'
             '9c5bf86510d0fbba36e71997f55eda1b197b26af7eeb0adb9e06e7e3cc86b32c00cd23dfca872f4043f76a1d9435f916aae73536f10c7b3fe7e79a6e74a309d2'
-            '8ac66a3a9a0d6f53c776c5b3c98830cfba6df562aa772f03a20737cbc04ec139513eee484ed42fa96188b26135918540b652ad653da9758162319568d03d185c'
-            '8fe73f833e2b24fe9bbaf12220a9d41d5e4808c833d7e7878635a85429e6c474ae79189d75d1d4e77c78bafbe2855db37ded24c85768f9a9415a00a0456c9dce'
-            'a33c21cae1d271b9e93df0b2987fb8c3956018406c88cc6a847b7f0e228316020b45f0961b67bf52b70b36da7840920bf729cc552f5ea765110766806756f348')
+            '48a3bead1c7cde1261f5f710fd055c52f061320999064ba4cc96a81f9b0770ea2a8fba7aff37d20bb7671b219c38bf8424f24fd7742d36b3c6bf171d3874c1f4')
 
 prepare() {
   cd dde-kwin-$pkgver
@@ -31,10 +25,10 @@
   sed -i 's|/usr/share/backgrounds/default_background.jpg|/usr/share/backgrounds/deepin/desktop.jpg|' plugins/kwineffects/multitasking/background.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
   patch -p1 -i ../$pkgname-unload-blur.patch
-  patch -p1 -i ../deepin-kwin-qt5.15.patch # Fix build with Qt 5.15
-  patch -p1 -i ../kwin-5.19.patch
+
+  # https://github.com/linuxdeepin/dde-kwin/issues/127
+  sed -i '/m_blurManager->create/d' plugins/kwineffects/blur/blur.cpp
 }
 
 build() {

Modified: deepin-kwin-added-functions-from-their-forked-kwin.patch
===================================================================
--- deepin-kwin-added-functions-from-their-forked-kwin.patch	2020-11-25 15:48:41 UTC (rev 761085)
+++ deepin-kwin-added-functions-from-their-forked-kwin.patch	2020-11-25 16:03:18 UTC (rev 761086)
@@ -33,18 +33,22 @@
 index 453280d..2f3f48a 100644
 --- a/deepin-wm-dbus/deepinwmfaker.cpp
 +++ b/deepin-wm-dbus/deepinwmfaker.cpp
-@@ -681,6 +681,16 @@ void DeepinWMFaker::BeginToMoveActiveWindow()
+@@ -681,6 +681,20 @@ void DeepinWMFaker::BeginToMoveActiveWindow()
      m_kwinUtilsInter->WindowMove();
  }
  
 +void DeepinWMFaker::TouchToMove(int x, int y)
 +{
++#ifndef DISABLE_DEEPIN_WM
 +    m_kwinUtilsInter->TouchPadToMoveWindow(x,y);
++#endif
 +}
 +
 +void DeepinWMFaker::ClearMoveStatus()
 +{
++#ifndef DISABLE_DEEPIN_WM
 +    m_kwinUtilsInter->EndTouchPadToMoveWindow();
++#endif
 +}
 +
  void DeepinWMFaker::SwitchApplication(bool backward)

Deleted: deepin-kwin-qt5.15.patch
===================================================================
--- deepin-kwin-qt5.15.patch	2020-11-25 15:48:41 UTC (rev 761085)
+++ deepin-kwin-qt5.15.patch	2020-11-25 16:03:18 UTC (rev 761086)
@@ -1,24 +0,0 @@
-diff --git a/plugins/kdecoration/chameleon.h b/plugins/kdecoration/chameleon.h
-index 3d164ca..a716a7a 100644
---- a/plugins/kdecoration/chameleon.h
-+++ b/plugins/kdecoration/chameleon.h
-@@ -32,6 +32,7 @@
- #include <QDir>
- #include <QSettings>
- #include <QScreen>
-+#include <QPainterPath>
- 
- class Settings;
- class ChameleonWindowTheme;
-diff --git a/plugins/kwineffects/scissor-window/scissorwindow.cpp b/plugins/kwineffects/scissor-window/scissorwindow.cpp
-index eb17483..faa898e 100644
---- a/plugins/kwineffects/scissor-window/scissorwindow.cpp
-+++ b/plugins/kwineffects/scissor-window/scissorwindow.cpp
-@@ -28,6 +28,7 @@
- #include <kwingltexture.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QExplicitlySharedDataPointer>
- #include <QSignalBlocker>
- 

Deleted: kwin-5.19.patch
===================================================================
--- kwin-5.19.patch	2020-11-25 15:48:41 UTC (rev 761085)
+++ kwin-5.19.patch	2020-11-25 16:03:18 UTC (rev 761086)
@@ -1,124 +0,0 @@
-commit fabc394472e1b8b8dea11497f56990bc9a1432bf
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Wed Jun 10 23:10:29 2020 +0800
-
-    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
-+++ b/plugins/kwineffects/blur/blur.cpp
-@@ -32,10 +32,10 @@
- #include <cmath> // for ceil()
- #include <QTimer>
- 
--#include <KWayland/Server/surface_interface.h>
--#include <KWayland/Server/blur_interface.h>
--#include <KWayland/Server/shadow_interface.h>
--#include <KWayland/Server/display.h>
-+#include <KWaylandServer/surface_interface.h>
-+#include <KWaylandServer/blur_interface.h>
-+#include <KWaylandServer/shadow_interface.h>
-+#include <KWaylandServer/display.h>
- 
- static const QByteArray s_blurAtomName = QByteArrayLiteral("_KDE_NET_WM_BLUR_BEHIND_REGION");
- 
-@@ -61,10 +61,9 @@ BlurEffect::BlurEffect(QObject *, const QVariantList &)
-     //     Should be included in _NET_SUPPORTED instead.
-     if (m_shader && m_shader->isValid() && m_renderTargetsValid) {
-         net_wm_blur_region = effects->announceSupportProperty(s_blurAtomName, this);
--        KWayland::Server::Display *display = effects->waylandDisplay();
-+        KWaylandServer::Display *display = effects->waylandDisplay();
-         if (display) {
-             m_blurManager = display->createBlurManager(this);
--            m_blurManager->create();
-         }
-     } else {
-         net_wm_blur_region = 0;
-@@ -310,7 +309,7 @@ void BlurEffect::updateBlurRegion(EffectWindow *w) const
-         }
-     }
- 
--    KWayland::Server::SurfaceInterface *surf = w->surface();
-+    KWaylandServer::SurfaceInterface *surf = w->surface();
- 
-     if (surf && surf->blur()) {
-         region = surf->blur()->region();
-@@ -338,10 +337,10 @@ void BlurEffect::updateBlurRegion(EffectWindow *w) const
- 
- void BlurEffect::slotWindowAdded(EffectWindow *w)
- {
--    KWayland::Server::SurfaceInterface *surf = w->surface();
-+    KWaylandServer::SurfaceInterface *surf = w->surface();
- 
-     if (surf) {
--        windowBlurChangedConnections[w] = connect(surf, &KWayland::Server::SurfaceInterface::blurChanged, this, [this, w] () {
-+        windowBlurChangedConnections[w] = connect(surf, &KWaylandServer::SurfaceInterface::blurChanged, this, [this, w] () {
-             if (w) {
-                 updateBlurRegion(w);
-             }
-@@ -445,7 +444,7 @@ QRegion BlurEffect::blurRegion(const EffectWindow *w) const
-         const QRegion appRegion = qvariant_cast<QRegion>(value);
-         if (!appRegion.isEmpty()) {
-             if (w->decorationHasAlpha() && effects->decorationSupportsBlurBehind()) {
--                region = w->shape();
-+                region = w->shape() & w->rect();
-                 region -= w->decorationInnerRect();
-             }
-             region |= appRegion.translated(w->contentsRect().topLeft()) &
-@@ -453,12 +452,12 @@ QRegion BlurEffect::blurRegion(const EffectWindow *w) const
-         } else {
-             // An empty region means that the blur effect should be enabled
-             // for the whole window.
--            region = w->shape();
-+            region = w->shape() & w->rect();
-         }
-     } else if (w->decorationHasAlpha() && effects->decorationSupportsBlurBehind()) {
-         // If the client hasn't specified a blur region, we'll only enable
-         // the effect behind the decoration.
--        region = w->shape();
-+        region = w->shape() & w->rect();
-         region -= w->decorationInnerRect();
-     }
- 
-diff --git a/plugins/kwineffects/blur/blur.h b/plugins/kwineffects/blur/blur.h
-index 7c76a82..53740ef 100644
---- a/plugins/kwineffects/blur/blur.h
-+++ b/plugins/kwineffects/blur/blur.h
-@@ -31,13 +31,10 @@
- 
- using namespace KWin;
- 
--namespace KWayland
--{
--namespace Server
-+namespace KWaylandServer
- {
- class BlurManagerInterface;
- }
--}
- 
- static const int borderSize = 5;
- 
-@@ -131,7 +128,7 @@ private:
-     QVector <BlurValuesStruct> blurStrengthValues;
- 
-     QMap <EffectWindow*, QMetaObject::Connection> windowBlurChangedConnections;
--    KWayland::Server::BlurManagerInterface *m_blurManager = nullptr;
-+    KWaylandServer::BlurManagerInterface *m_blurManager = nullptr;
- };
- 
- inline


More information about the arch-commits mailing list