From 0b3462693a0d2252ac916259205e5e1ba6ef810d Mon Sep 17 00:00:00 2001 From: leeffo Date: Tue, 13 Jun 2023 03:02:30 +0000 Subject: [PATCH] add deepin-wm-dbus add deepin-wm-dbus Signed-off-by: leeffo (cherry picked from commit a32773401b0fddb90fd5794cb88f5a0abe5af376) --- dde-kwin.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dde-kwin.spec b/dde-kwin.spec index fc5fc39..cdefb06 100644 --- a/dde-kwin.spec +++ b/dde-kwin.spec @@ -1,5 +1,5 @@ %global repo dde-kwin -%define pkgrelease 3 +%define pkgrelease 4 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -52,15 +52,18 @@ BuildRequires: kf5-kservice-devel BuildRequires: kf5-plasma-devel BuildRequires: kdecoration-devel BuildRequires: kf5-ktextwidgets-devel +BuildRequires: qt5-qtdeclarative-devel - +%if %{kwin_ext} # for libQt5EdidSupport.a BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qtdeclarative-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: dde-qt5integration%{?_isa} Requires: kwin%{?_isa} >= 5.21 +%else +Requires: %{_bindir}/kwin_x11 +%endif # since F31 Obsoletes: deepin-wm <= 1.9.38 @@ -92,12 +95,12 @@ Requires: dtkcore-devel%{?_isa} Requires: kf5-kglobalaccel-devel%{?_isa} Requires: deepin-desktop-server - %description devel Header files and libraries for %{sname}. %endif + %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} sed -i 's:/lib/:%{_libdir}/:' plugins/platforms/lib/CMakeLists.txt sed -i 's:/lib/:/%{_lib}/:' plugins/platforms/plugin/main.cpp \ plugins/platforms/plugin/main_wayland.cpp @@ -115,7 +118,9 @@ export PATH=%{_qt5_bindir}:$PATH -DENABLE_BUILTIN_MULTITASKING=OFF \ -DENABLE_BUILTIN_BLACK_SCREEN=OFF \ -DUSE_DEEPIN_WAYLAND=OFF \ +%if !%{kwin_ext} -DUSE_PLUGINS=OFF +%endif %make_build @@ -128,12 +133,12 @@ chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %license LICENSE %{_sysconfdir}/xdg/* %{_bindir}/kwin_no_scale -%if %{kwin_ext} %{_bindir}/deepin-wm-dbus %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/kwin/scripts/* %{_datadir}/kwin/tabbox/* +%if %{kwin_ext} %{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so %{_qt5_plugindir}/platforms/lib%{repo}-xcb.so %{_qt5_plugindir}/platforms/lib%{repo}-wayland.so @@ -149,6 +154,9 @@ chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %endif %changelog +* Tue Jun 13 2023 liweigang - 5.4.26-4 +- add deepin-wm-dbus + * Wed Aug 03 2022 liweiganga - 5.4.26-3 - modify kwin_no_scale permission to 755 -- Gitee