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

[Felix Yan]

    Date: Wednesday, April 7, 2021 @ 22:09:00
  Author: felixonmars
Revision: 912873

upgpkg: deepin-kwin 5.3.4-1

Modified:
  deepin-kwin/trunk/PKGBUILD
Deleted:
  deepin-kwin/trunk/deepin-kwin-unload-blur.patch

-------------------------------+
 PKGBUILD                      |   12 +----
 deepin-kwin-unload-blur.patch |   84 ----------------------------------------
 2 files changed, 3 insertions(+), 93 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-07 22:07:47 UTC (rev 912872)
+++ PKGBUILD	2021-04-07 22:09:00 UTC (rev 912873)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-kwin
-pkgver=5.2.0.13
-pkgrel=2
+pkgver=5.3.4
+pkgrel=1
 pkgdesc='KWin configures on DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-kwin"
@@ -13,16 +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-kwin-5.19.patch::https://github.com/linuxdeepin/dde-kwin/commit/a8decf52405fb5ff15d2bdba62992a623d537ddc.patch
         $pkgname-kwin-5.21.patch::https://github.com/linuxdeepin/dde-kwin/pull/138.patch
-        $pkgname-unload-blur.patch
         $pkgname-added-functions-from-their-forked-kwin.patch
         $pkgname-crash.patch)
-sha512sums=('0c46138cb212dfc916f14c498bfb34907a373ec48819b633153cc6edcf1c3a34755156cb418656abe4ef99c9c38e397adc7f5ff71eab95950b347ca43f56182d'
+sha512sums=('e2c6dbb82084b7ceee6d3db0b7573f1334f217abdeecf127196bda04f38b47329f47e4df6a63999a0cfb15e921d4046297f71318b3f8213bea7a93fefd1081a7'
             '7ac1a577868b73314274d336287334acc5bf4ac06dde046c93e4c2d3f68a112389c8b0644d1cbc3fde5ba1c01f368676f4f34b4a1b7b6c97a5b73d66507d134d'
-            '9b5bd043647d08ab164f8b8e0f709c003c9c13eb1f5bdc6fb6014c3fac3e22ff12d3cbd3854354793d373f186ac237510b90cbd1a6b5a95f5940ba8145804179'
             '313fe7e05e5ca76bc25431e172e8aab36fb43d0a567329f811e29fda4120e7ff4523ff5d93e5d016b0a5d84a256fb5921354ae775db21e7a5a6b9d7db20597ba'
-            '26d6cc86578c07288233793ebeaa894b6eab6f317344b41e8a76a7438c429a2ae5075b08fcf1c7cf236f81fb51252e29aea3fefbfcfa46ad83059abe2630c185'
             '48a3bead1c7cde1261f5f710fd055c52f061320999064ba4cc96a81f9b0770ea2a8fba7aff37d20bb7671b219c38bf8424f24fd7742d36b3c6bf171d3874c1f4'
             '73aef1435c83aec18f4535cc121d09121c1fb180f02b11fc57bb61339b79667ae310a4e3eb33263d6ba218b2eab7281dc9014578edf1317226239e8538e08830')
 
@@ -31,9 +27,7 @@
   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-unload-blur.patch
   patch -p1 -i ../$pkgname-crash.patch
-  patch -p1 -i ../$pkgname-kwin-5.19.patch
   patch -p1 -i ../$pkgname-kwin-5.21.patch
 }
 

Deleted: deepin-kwin-unload-blur.patch
===================================================================
--- deepin-kwin-unload-blur.patch	2021-04-07 22:07:47 UTC (rev 912872)
+++ deepin-kwin-unload-blur.patch	2021-04-07 22:09:00 UTC (rev 912873)
@@ -1,84 +0,0 @@
-From 72acb76a3ba65ed982f13ac12297e8d1411f7e43 Mon Sep 17 00:00:00 2001
-From: lxz <justforlxz at gmail.com>
-Date: Wed, 25 Nov 2020 20:23:17 +0800
-Subject: [PATCH] fix: unload kwin blur
-
-disable buildin blur effect
-
-Log:
-Change-Id: I98c8b2fc654a8fbc93e958a807928e492538120c
----
-
-diff --git a/plugins/kwineffects/blur/blur.cpp b/plugins/kwineffects/blur/blur.cpp
-index 9a92921..6f5040c 100644
---- a/plugins/kwineffects/blur/blur.cpp
-+++ b/plugins/kwineffects/blur/blur.cpp
-@@ -48,17 +48,6 @@
- 
- BlurEffect::BlurEffect(QObject *, const QVariantList &)
- {
--    // 禁用kwin自己的模糊特效，防止两个特效之间出现冲突
--    {
--        bool blur_loaded = false;
--        QMetaObject::invokeMethod(effects, "isEffectLoaded", Qt::DirectConnection, Q_RETURN_ARG(bool, blur_loaded), Q_ARG(QString, "blur"));
--
--        if (blur_loaded) {
--            // qWarning() << "will try unload builtIn blur effect of kwin";
--            QMetaObject::invokeMethod(effects, "unloadEffect", Qt::DirectConnection, Q_ARG(QString, "blur"));
--        }
--    }
--
-     m_shader = new BlurShader(this);
- 
-     initBlurStrengthValues();
-diff --git a/plugins/platforms/plugin/libkwinpreload.cpp b/plugins/platforms/plugin/libkwinpreload.cpp
-index 4f5f89b..8d23fa2 100644
---- a/plugins/platforms/plugin/libkwinpreload.cpp
-+++ b/plugins/platforms/plugin/libkwinpreload.cpp
-@@ -36,6 +36,7 @@
- #include <QStyleFactory>
- #include <QStyle>
- #include <QTimer>
-+#include <QLibrary>
- 
- // deepin dbus menu
- #define MenuDBusService "com.deepin.menu"
-@@ -275,6 +276,18 @@
-     }
- }
- 
-+namespace BuiltInEffects {
-+bool supported(BuiltInEffect effect) {
-+    if (effect == BuiltInEffect::Blur) {
-+        return false;
-+    }
-+
-+    typedef bool (*ClientBuiltInEffect)(KWin::BuiltInEffect);
-+    static ClientBuiltInEffect clientBuildInEffect = (ClientBuiltInEffect)QLibrary::resolve("kwin.so", qApp->applicationVersion(), "_ZN4KWin14BuiltInEffects9supportedENS_13BuiltInEffectE");
-+    return clientBuildInEffect ? clientBuildInEffect(effect) : false;
-+}
-+}
-+
- #endif // USE_DBUS_MENU
- } // namespace KWin
- 
-diff --git a/plugins/platforms/plugin/libkwinpreload.h b/plugins/platforms/plugin/libkwinpreload.h
-index 03cd475..9b60ba6 100644
---- a/plugins/platforms/plugin/libkwinpreload.h
-+++ b/plugins/platforms/plugin/libkwinpreload.h
-@@ -62,6 +62,15 @@
- };
- 
- #endif // USE_DBUS_MENU
-+
-+enum class BuiltInEffect {
-+    InValid,
-+    Blur,
-+};
-+
-+namespace BuiltInEffects {
-+    bool supported(BuiltInEffect effect);
-+}
- }
- 
- #if !defined(KWIN_VERSION) || KWIN_VERSION <= KWIN_VERSION_CHECK(5, 8, 6, 0)