diff --git a/0001-dde-kwin-support-QFont.patch b/0001-dde-kwin-support-QFont.patch deleted file mode 100644 index 8eec6697a4242b8c930211881825b125b73c188d..0000000000000000000000000000000000000000 --- a/0001-dde-kwin-support-QFont.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4a113e33e135b2f66bc93226abf6381837edf00a Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Fri, 6 Jan 2023 09:35:07 +0800 -Subject: [PATCH] support QFont - ---- - plugins/kdecoration/chameleon.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/plugins/kdecoration/chameleon.h b/plugins/kdecoration/chameleon.h -index 6bfde0b..9da09cd 100644 ---- a/plugins/kdecoration/chameleon.h -+++ b/plugins/kdecoration/chameleon.h -@@ -35,6 +35,18 @@ - #include - #include - -+//add -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+//end -+ - class Settings; - class ChameleonWindowTheme; - class Chameleon : public KDecoration2::Decoration --- -2.20.1 - diff --git a/0002-feat-close-judge-XDG_SESSION_TYPE.patch b/0001-feat-close-judge-XDG_SESSION_TYPE.patch similarity index 55% rename from 0002-feat-close-judge-XDG_SESSION_TYPE.patch rename to 0001-feat-close-judge-XDG_SESSION_TYPE.patch index 740ef619163b41efecfd018741b08522dc815c8e..42dad9643870c0d89749eee0b97fa5995b27bb91 100644 --- a/0002-feat-close-judge-XDG_SESSION_TYPE.patch +++ b/0001-feat-close-judge-XDG_SESSION_TYPE.patch @@ -1,17 +1,17 @@ -From 4b99c1e34be05b732eee277695292d564bbfae8a Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Wed, 8 Feb 2023 11:13:50 +0800 -Subject: [PATCH] feat: close judge XDG_SESSION_TYPE +From f11ce3d3a15f7266c8af9cfdc40cce5c6d3ea9d1 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Fri, 11 Aug 2023 11:14:53 +0800 +Subject: [PATCH] feat-close-judge-XDG_SESSION_TYPE --- deepin-wm-dbus/deepinwmfaker.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deepin-wm-dbus/deepinwmfaker.cpp b/deepin-wm-dbus/deepinwmfaker.cpp -index 4d76d1f..4869c38 100644 +index 458d2c3..bc6fead 100644 --- a/deepin-wm-dbus/deepinwmfaker.cpp +++ b/deepin-wm-dbus/deepinwmfaker.cpp -@@ -356,11 +356,11 @@ DeepinWMFaker::DeepinWMFaker(QObject *parent) +@@ -362,11 +362,11 @@ DeepinWMFaker::DeepinWMFaker(QObject *parent) auto e = QProcessEnvironment::systemEnvironment(); QString XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE")); @@ -20,14 +20,14 @@ index 4d76d1f..4869c38 100644 - AllDeepinWMKWinAccelsMap.insert(iter.key(), iter.value()); - } - } -+ //if (XDG_SESSION_TYPE != QLatin1String("x11")) { -+ // for (auto iter = WaylandDeepinWMKWinAccelsMap.begin(); iter != WaylandDeepinWMKWinAccelsMap.end(); iter++) { -+ // AllDeepinWMKWinAccelsMap.insert(iter.key(), iter.value()); -+ // } -+ //} - } ++ // if (XDG_SESSION_TYPE != QLatin1String("x11")) { ++ // for (auto iter = WaylandDeepinWMKWinAccelsMap.begin(); iter != WaylandDeepinWMKWinAccelsMap.end(); iter++) { ++ // AllDeepinWMKWinAccelsMap.insert(iter.key(), iter.value()); ++ // } ++ // } - DeepinWMFaker::~DeepinWMFaker() + m_whiteProcess.insert("kwin_x11"); + m_whiteProcess.insert("kwin_wayland"); -- -2.20.1 +2.39.3 diff --git a/dde-kwin-5.5.24.tar.gz b/dde-kwin-5.5.24.tar.gz deleted file mode 100644 index 8e36946cfaf7fd80ec01d1828e9bac3e06fa61c2..0000000000000000000000000000000000000000 Binary files a/dde-kwin-5.5.24.tar.gz and /dev/null differ diff --git a/dde-kwin.spec b/dde-kwin.spec index 30747bdbef1e0cd2e269b2b46650532e5221039d..9ec05583123b2f0748fae8600a040a75720f2982 100644 --- a/dde-kwin.spec +++ b/dde-kwin.spec @@ -1,16 +1,13 @@ -%define anolis_release 2 -%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global repo dde-kwin Name: dde-kwin -Version: 5.5.24 -Release: 2.%{anolis_release}%{?dist} +Version: 5.8.189 +Release: 1%{?dist} Summary: KWin configuration for Deepin Desktop Environment -License: GPLv3+ -URL: https://github.com/linuxdeepin/%{name} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-dde-kwin-support-QFont.patch -Patch1: 0002-feat-close-judge-XDG_SESSION_TYPE.patch +License: GPL-3.0-or-later +URL: https://github.com/linuxdeepin/dde-kwin +Source0: dde-kwin_5.8.189.tar.xz +Patch1: 0001-feat-close-judge-XDG_SESSION_TYPE.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -39,9 +36,9 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: dtkgui-devel BuildRequires: kf5-ki18n-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -Requires: dde-qt5integration%{?_isa} +Requires: deepin-qt5integration%{?_isa} #Requires: kwin%%{?_isa} >= 5.17 -Requires: kwin%{?_isa} >= 5.15 +Requires: kwin-x11%{?_isa} >= 5.15 # since F31 Obsoletes: deepin-wm <= 1.9.38 Obsoletes: deepin-wm-switcher <= 1.1.9 @@ -61,28 +58,9 @@ Requires: kdecoration This package provides a kwin configuration that used as the new WM for Deepin Desktop Environment. -%package devel -Summary: Development package for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kwin-devel%{?_isa} -Requires: qt5-qtx11extras-devel%{?_isa} -Requires: gsettings-qt-devel%{?_isa} -Requires: dtkcore-devel%{?_isa} -Requires: kf5-kglobalaccel-devel%{?_isa} -Requires: deepin-desktop-server - - -%description devel -Header files and libraries for %{sname}. - %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %patch1 -p1 -sed -i 's:/lib:/%{_lib}:' plugins/platforms/lib/CMakeLists.txt -sed -i 's:/usr/lib:%{_libdir}:' plugins/platforms/plugin/main.cpp \ - plugins/platforms/plugin/main_wayland.cpp -sed -i 's:/usr/lib:%{_libexecdir}:' deepin-wm-dbus/deepinwmfaker.cpp %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -91,10 +69,10 @@ export PATH=%{_qt5_bindir}:$PATH -DCMAKE_BUILD_TYPE=Release \ -DUSE_WINDOW_TOOL=OFF \ -DKWIN_VERSION=$(rpm -q --qf '%%{version}' kwin-devel) . -%make_build -C %{_vpath_builddir} +%make_build %install -%make_install INSTALL_ROOT=%{buildroot} -C %{_vpath_builddir} +%make_install INSTALL_ROOT=%{buildroot} chmod 755 %{buildroot}%{_bindir}/kwin_no_scale install rpm/dde-kwin.postinst %{buildroot}%{_datadir}/kwin/scripts/ chmod 755 %{buildroot}%{_datadir}/kwin/scripts/dde-kwin.postinst @@ -110,31 +88,36 @@ bash %{_datadir}/kwin/scripts/dde-kwin.postinst ||: %{_sysconfdir}/xdg/* %{_bindir}/deepin-wm-dbus %{_bindir}/kwin_no_scale -%{_libdir}/libkwin-xcb.so.* -%{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so -%{_qt5_plugindir}/platforms/lib%{name}-xcb.so -%{_qt5_plugindir}/platforms/libdde-kwin-wayland.so -%{_qt5_plugindir}/kwin/effects/plugins/ -%{_datadir}/dde-kwin-xcb/ -#%%{_datadir}/applications/kwin-wm-multitaskingview.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/kwin/scripts/* -%{_datadir}/kwin/tabbox/* %{_datadir}/dsg/ +%{_datadir}/deepin-log-viewer/deepin-log.conf.d/org.deepin.kwin.json +%changelog +* Wed Dec 24 2025 liweigang - 5.8.189-1 +- update: update to version 5.8.189 -%files devel -%{_libdir}/libkwin-xcb.so -%{_libdir}/pkgconfig/%{name}.pc -%{_includedir}/%{name} +* Tue Aug 19 2025 lichao - 5.8.133-1.04 +- update: update license -%changelog -* Tue Nov 07 2023 yangxianzhao - 5.5.24-2.2 -- rebuild for qt +* Mon Dec 02 2024 liweigang - 5.8.133-1.03 +- rebuild: rebuild for kwin + +* Sat Oct 26 2024 mahailiang - 5.8.133-1.02 +- spec: modify requires kwin-x11 + +* Fri Oct 25 2024 liweigang - 5.8.133-1.01 +- spec: modify requires deepin-qt5integration + +* Sat Oct 12 2024 liweigang - 5.8.133-1 +- update: update to version 5.8.133 + +* Sun Oct 08 2023 liweigang - 5.7.13-1 +- update: update to 5.7.13 -* Tue Oct 31 2023 yangxianzhao - 5.5.24-2.1 -- fix build error +* Fri Aug 11 2023 liuzhilin - 5.7.7-1 +- update: update to 5.7.7 * Wed Feb 08 2023 liweiganga - 5.5.24-2 - feat: close judge wayland diff --git a/dde-kwin_5.8.189.tar.xz b/dde-kwin_5.8.189.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..0d1065947d99f490fac53b3a0f6da53f41a2182b Binary files /dev/null and b/dde-kwin_5.8.189.tar.xz differ