diff --git a/0001-revert-added-functions-from-their-forked-kwin.patch b/0001-revert-added-functions-from-their-forked-kwin.patch index 2b01d54..e8e375c 100644 --- a/0001-revert-added-functions-from-their-forked-kwin.patch +++ b/0001-revert-added-functions-from-their-forked-kwin.patch @@ -1,7 +1,7 @@ From 8ea2fe6dbcb9fae24df267606e0354576aeb3619 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Sun, 7 Mar 2021 15:17:45 +0800 -Subject: [PATCH 1/5] revert added functions from their forked kwin +Subject: [PATCH 1/6] revert added functions from their forked kwin --- deepin-wm-dbus/com.deepin.wm.xml.in | 6 ------ diff --git a/0002-tabbox-chameleon-rename.patch b/0002-tabbox-chameleon-rename.patch index 3e65bf4..0f2b2e7 100644 --- a/0002-tabbox-chameleon-rename.patch +++ b/0002-tabbox-chameleon-rename.patch @@ -1,7 +1,7 @@ From 34d357d6b9a25ac5770a89a56d5dac13945a6dd9 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Thu, 12 Nov 2020 19:11:28 +0800 -Subject: [PATCH 2/5] tabbox chameleon rename +Subject: [PATCH 2/6] tabbox chameleon rename --- configures/kwinrc | 2 +- diff --git a/0003-unload-blur.patch b/0003-unload-blur.patch index 4390938..428eeaa 100644 --- a/0003-unload-blur.patch +++ b/0003-unload-blur.patch @@ -1,7 +1,7 @@ From 4901e8804c9177e8a25c75819e364230d8132c1c Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Thu, 12 Nov 2020 19:13:48 +0800 -Subject: [PATCH 3/5] unload blur +Subject: [PATCH 3/6] unload blur --- plugins/kwineffects/blur/blur.cpp | 24 ++++++++++++++---------- diff --git a/0004-fix-blurmanager-interface-changed.patch b/0004-fix-blurmanager-interface-changed.patch index 8dca0b3..b4bf7a0 100644 --- a/0004-fix-blurmanager-interface-changed.patch +++ b/0004-fix-blurmanager-interface-changed.patch @@ -1,7 +1,7 @@ From 6500a052252c01f04a06e7141230612dcdf76799 Mon Sep 17 00:00:00 2001 From: justforlxz Date: Mon, 21 Dec 2020 13:20:57 +0800 -Subject: [PATCH 4/5] fix: blurmanager interface changed +Subject: [PATCH 4/6] fix: blurmanager interface changed kf5 does not inherit Global and has no create method. diff --git a/0005-fix-doesn-t-compile-with-Kwin-5.21.patch b/0005-fix-doesn-t-compile-with-Kwin-5.21.patch index b856c9d..50fcfa9 100644 --- a/0005-fix-doesn-t-compile-with-Kwin-5.21.patch +++ b/0005-fix-doesn-t-compile-with-Kwin-5.21.patch @@ -1,7 +1,7 @@ From 9951a255ab29cc8d8f5e5296ac64ec3942551fd0 Mon Sep 17 00:00:00 2001 From: justforlxz Date: Mon, 29 Mar 2021 11:40:46 +0800 -Subject: [PATCH 5/5] =?UTF-8?q?fix:=20doesn't=20compile=20with=20Kwin=205.?= +Subject: [PATCH 5/6] =?UTF-8?q?fix:=20doesn't=20compile=20with=20Kwin=205.?= =?UTF-8?q?21=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0006-kwin-5.19.patch b/0006-kwin-5.19.patch new file mode 100644 index 0000000..621b5e2 --- /dev/null +++ b/0006-kwin-5.19.patch @@ -0,0 +1,25 @@ +From ec3bac63b24e56ff71eae3c11b0152b09df3c2da Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Thu, 12 Nov 2020 19:15:20 +0800 +Subject: [PATCH 6/6] kwin 5.19 + +--- + plugins/platforms/lib/kwinutils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/platforms/lib/kwinutils.cpp b/plugins/platforms/lib/kwinutils.cpp +index 4d3fdc586..ebab090b9 100644 +--- a/plugins/platforms/lib/kwinutils.cpp ++++ b/plugins/platforms/lib/kwinutils.cpp +@@ -604,7 +604,7 @@ QObject *KWinUtils::tabBox() + + QObject *KWinUtils::cursor() + { +- return KWin::Cursor::s_self; ++ return nullptr; //KWin::Cursor; + } + + QObject *KWinUtils::virtualDesktop() +-- +2.30.2 + diff --git a/deepin-kwin.spec b/deepin-kwin.spec index 12a518c..336867b 100644 --- a/deepin-kwin.spec +++ b/deepin-kwin.spec @@ -3,7 +3,7 @@ Name: deepin-kwin Version: 5.2.0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KWin configuration for Deepin Desktop Environment License: GPLv3+ URL: https://github.com/linuxdeepin/%{repo} @@ -29,6 +29,11 @@ Patch0004: 0004-fix-blurmanager-interface-changed.patch # Author: justforlxz Patch0005: 0005-fix-doesn-t-compile-with-Kwin-5.21.patch +# kwin 5.19 +# Author: Robin Lee +Patch0006: 0006-kwin-5.19.patch + + @@ -124,6 +129,9 @@ chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %{_includedir}/%{repo} %changelog +* Mon Mar 29 2021 Robin Lee - 5.2.0.13-2 +- Re-add missed patch + * Mon Mar 29 2021 Robin Lee - 5.2.0.13-1 - new upstream release: 5.2.0.13