diff --git a/dde-kwin-5.3.19.tar.gz b/dde-kwin-5.3.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4db08563304af7d44a521a59a65042128dcbf81b Binary files /dev/null and b/dde-kwin-5.3.19.tar.gz differ diff --git a/dde-kwin.spec b/dde-kwin.spec index b0a1b7a11bfaccdd402021781d78e2c5c4f7e0fe..547724cdb3eff4025e30e8dc9b15a75d4452b9b5 100644 --- a/dde-kwin.spec +++ b/dde-kwin.spec @@ -1,14 +1,15 @@ -%global sname deepin-kwin +%global repo dde-kwin Name: dde-kwin -Version: 5.0.13+c1 -Release: 6 +Version: 5.3.19 +Release: 1%{?dist}.02 Summary: KWin configuration for Deepin Desktop Environment License: GPLv3+ URL: https://github.com/linuxdeepin/%{name} -Source0: %{name}_%{version}.orig.tar.xz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: gdb BuildRequires: kwin-devel BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: gsettings-qt-devel @@ -16,8 +17,15 @@ BuildRequires: libepoxy-devel BuildRequires: dtkcore-devel BuildRequires: kf5-kwayland-devel BuildRequires: kf5-kglobalaccel-devel +BuildRequires: kf5-kdeclarative-devel +BuildRequires: kf5-kservice-devel +BuildRequires: kf5-plasma-devel +BuildRequires: kdecoration-devel +BuildRequires: kf5-ktextwidgets-devel + BuildRequires: cmake(KDecoration2) BuildRequires: qt5-linguist +# for libQt5EdidSupport.a BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-devel @@ -25,7 +33,9 @@ BuildRequires: dtkgui-devel BuildRequires: kf5-ki18n-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: dde-qt5integration%{?_isa} +#Requires: kwin%{?_isa} >= 5.17 Requires: kwin%{?_isa} >= 5.15 +# since F31 Obsoletes: deepin-wm <= 1.9.38 Obsoletes: deepin-wm-switcher <= 1.1.9 Obsoletes: deepin-metacity <= 3.22.24 @@ -52,6 +62,7 @@ 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 @@ -59,11 +70,12 @@ Header files and libraries for %{sname}. %prep %setup -q -n %{name}-%{version} -sed -i 's:/lib:/%{_lib}:' plugins/kwin-xcb/lib/CMakeLists.txt -sed -i 's:/usr/lib:%{_libdir}:' plugins/kwin-xcb/plugin/main.cpp +sed -i 's:/lib:/%{_lib}:' plugins/platforms/lib/CMakeLists.txt +sed -i 's:/usr/lib:%{_libdir}:' plugins/platforms/plugin/main.cpp sed -i 's:/usr/lib:%{_libexecdir}:' deepin-wm-dbus/deepinwmfaker.cpp %build +# help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -DKWIN_VERSION=$(rpm -q --qf '%%{version}' kwin-devel) . %make_build @@ -71,6 +83,11 @@ export PATH=%{_qt5_bindir}:$PATH %install %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 + +%post +bash -x %{_datadir}/kwin/scripts/dde-kwin.postinst ||: %ldconfig_scriptlets @@ -83,7 +100,10 @@ chmod 755 %{buildroot}%{_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/* @@ -99,5 +119,5 @@ chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %{_includedir}/%{name} %changelog -* Thu Jul 30 2020 openEuler Buildteam - 5.0.13+c1-6 -- Package init +* Mon Jun 13 2022 uoser - 5.3.19-1.02 +- update: update to 5.3.19-1.02 diff --git a/dde-kwin_5.0.13+c1.orig.tar.xz b/dde-kwin_5.0.13+c1.orig.tar.xz deleted file mode 100644 index 285f173cf620c1f950610f1dd2ad94fdf20ffbda..0000000000000000000000000000000000000000 Binary files a/dde-kwin_5.0.13+c1.orig.tar.xz and /dev/null differ