Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-kwin for openSUSE:Factory checked in at 2022-09-10 20:17:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-kwin (Old) and /work/SRC/openSUSE:Factory/.deepin-kwin.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-kwin" Sat Sep 10 20:17:33 2022 rev:8 rq:1002410 version:5.5.11 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-kwin/deepin-kwin.changes 2022-06-16 18:22:03.820237945 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-kwin.new.2083/deepin-kwin.changes 2022-09-10 20:17:58.148933538 +0200 @@ -1,0 +2,13 @@ +Thu Sep 1 03:21:02 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.5.11 + * Add the 'test-prj-running.sh' script + * Add API to capture window data + * Add API to record and shot screen + * Add func about maxi button long press + * Remove qt deps for windowtool +- Drop fix-build-on-5_18_6.patch, no longer support old kwin +- Add fix-build-on-5_25_3.patch instead of dde-kwin.5.4.26.patch + +------------------------------------------------------------------- + @@ -7,0 +21,15 @@ +Fri Jun 10 13:42:34 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Update version 5.4.26 + * update window raduis for effects + * Add splitmenu translate + * Add a dependency on 'kwin-wayland' + * Add func about maxi button long press + * Modify code based on code review results + * Fix bugs +- Add dde-kwin.5.4.26.patch, fix build on kwin 5.24+ +- Add drop-nonexistent-translations.patch +- No longer need kwayland-server (boo#1200318) +- Drop deepin-kwin-crash.patch + +------------------------------------------------------------------- @@ -11,0 +40,16 @@ + +------------------------------------------------------------------- +Fri Feb 25 03:28:40 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Add fix-build-on-5_18_6.patch for leap + +------------------------------------------------------------------- +Sun Feb 20 12:33:34 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Update version 5.4.19 + * Frees heap memory when the program exits + * Disable multitasking + * disable effects by default + * Support DDE Wayland + * Support client activation from dde shell + * Fix bugs Old: ---- dde-kwin-5.4.12.tar.gz deepin-kwin-crash.patch New: ---- dde-kwin-5.5.11.tar.gz drop-nonexistent-translations.patch fix-build-on-5_25_3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-kwin.spec ++++++ --- /var/tmp/diff_new_pack.GrqzNu/_old 2022-09-10 20:17:58.636934794 +0200 +++ /var/tmp/diff_new_pack.GrqzNu/_new 2022-09-10 20:17:58.644934814 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-kwin # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2021 Hillwood Yang <hillw...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -13,67 +13,62 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define _name dde-kwin %define sover 0 %define kwin_version %(rpm -q --queryformat '%%{VERSION}' kwin5) -%define kwin_max 5.21.5 +%define kwin_max 5.25.1 Name: deepin-kwin -Version: 5.4.12 +Version: 5.5.11 Release: 0 Summary: KWin configures/plugins on the DDE License: GPL-3.0-or-later Group: System/GUI/Other -URL: https://github.com/linuxdeepin/dde-kwin +Url: https://github.com/linuxdeepin/dde-kwin Source0: https://github.com/linuxdeepin/dde-kwin/archive/%{version}/%{_name}-%{version}.tar.gz -Patch0: deepin-kwin-tabbox-chameleon-rename.patch -%if 0%{suse_version} > 1500 || 0%{?sle_version} > 150300 -Patch1: deepin-kwin-crash.patch -%endif +Patch0: %{name}-tabbox-chameleon-rename.patch +# Patch1: fix-build-on-5_18_6.patch +Patch2: fix-build-on-5_25_3.patch # PATCH-FIX-UPSTRAM fix-library-links.patch hillw...@opensuse.org - Fix build on Tumbleweed # https://github.com/linuxdeepin/dde-kwin/pull/154 -Patch2: fix-library-links.patch +Patch3: fix-library-links.patch +Patch4: drop-nonexistent-translations.patch BuildRequires: fdupes BuildRequires: gtest -BuildRequires: kwin5-devel -BuildRequires: libQt5Core-private-headers-devel -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libQt5PlatformSupport-devel-static -BuildRequires: libepoxy-devel BuildRequires: libqt5-linguist -BuildRequires: plasma5-workspace-devel -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5GlobalAccel) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: cmake(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(dtkcore) BuildRequires: pkgconfig(dtkgui) >= 5.0.0 -BuildRequires: pkgconfig(gsettings-qt) BuildRequires: pkgconfig(xcb) -Requires: dbus-1 +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: cmake(KF5GlobalAccel) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: kwin5-devel +BuildRequires: libepoxy-devel +BuildRequires: plasma5-workspace-devel +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libQt5Core-private-headers-devel +BuildRequires: libQt5PlatformSupport-devel-static Requires: deepin-wallpapers +Requires: dbus-1 Requires: kwin5 Provides: deepin-kwin5 -%if "%{kwin_version}" > "%{kwin_max}" -BuildArch: noarch -%endif %description KWin configures/plugins on the DDE Let kwin work well in the Deepin Desktop Environment. -%if "%{kwin_version}" <= "%{kwin_max}" %package -n libkwin-xcb%{sover} Summary: Deepin Kwin libraries Group: System/Libraries @@ -92,47 +87,53 @@ docs for deepin-plugin-kwin. %lang_package -%endif %prep %autosetup -p1 -n %{_name}-%{version} - -%build sed -i 's|backgrounds/default_background.jpg|wallpapers/openSUSEdefault/contents/images/1920x1080.jpg|g' \ deepin-wm-dbus/deepinwmfaker.cpp plugins/kwineffects/multitasking/background.cpp sed -i 's/lrelease/lrelease-qt5/g' plugins/platforms/plugin/translate_generation.sh +sed -i 's|/usr/lib|%{_libdir}|g' plugins/platforms/plugin/{main.cpp,main_wayland.cpp} + +%if "%{kwin_version}" >= "%{kwin_max}" +# Workaround issue#3246 (https://github.com/linuxdeepin/developer-center/issues/3246) +# sed -i 's|GLRenderTarget|GLFramebuffer|g' plugins/kwineffects/scissor-window/scissorwindow.cpp +# sed -i '/(!w->isPaintingEnabled() || (mask & PAINT_WINDOW_LANCZOS)/,+2d' plugins/kwineffects/scissor-window/scissorwindow.cpp +sed -i '/add_subdirectory(kdecoration)/d' plugins/CMakeLists.txt +%endif + +%build mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DUSE_WINDOW_TOOL=OFF \ + -DENABLE_BUILTIN_BLUR=OFF \ + -DENABLE_KDECORATION=ON \ + -DENABLE_BUILTIN_MULTITASKING=OFF \ + -DENABLE_BUILTIN_BLACK_SCREEN=OFF \ +%if "%{kwin_version}" >= "%{kwin_max}" + -DENABLE_BUILTIN_SCISSOR_WINDOW=OFF \ +%endif + -DUSE_DEEPIN_WAYLAND=OFF %cmake_build %install %cmake_install -%if "%{kwin_version}" <= "%{kwin_max}" -chmod -x %{buildroot}%{_datadir}/kwin/tabbox/chameleon/contents/ui/main.qml \ - %{buildroot}%{_datadir}/kwin/tabbox/chameleon/metadata.desktop -%endif - -chmod +x %{buildroot}%{_bindir}/kwin_no_scale rm -rf %{buildroot}%{_datadir}/kwin/*/*/LICENSE rm -rf \ -%if "%{kwin_version}" <= "%{kwin_max}" - %{buildroot}%{_datadir}/kwin/tabbox/thumbnail_grid/metadata.desktop \ - %{buildroot}%{_datadir}/kwin/tabbox/thumbnail_grid/contents/ui/main.qml \ -%endif %{buildroot}%{_sysconfdir}/xdg/kwinrc \ %{buildroot}%{_sysconfdir}/xdg/kdeglobals +rm -rf %{buildroot}%{_libdir}/libkwin.so + %fdupes %{buildroot} -%if "%{kwin_version}" <= "%{kwin_max}" %post -n libkwin-xcb%{sover} -p /sbin/ldconfig %postun -n libkwin-xcb%{sover} -p /sbin/ldconfig -%endif %files %defattr(-,root,root,-) @@ -140,7 +141,6 @@ %license LICENSE %config %{_sysconfdir}/xdg/* %{_bindir}/kwin_no_scale -%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150300 %dir %{_datadir}/kwin %dir %{_datadir}/kwin/scripts %dir %{_datadir}/kwin/tabbox @@ -150,15 +150,17 @@ %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/dbus-1/services/com.deepin.wm.service %{_kf5_plugindir}/platforms/libdde-kwin-xcb.so +%if "%{kwin_version}" <= "%{kwin_max}" %{_kf5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so %dir %{_kf5_plugindir}/kwin/effects/plugins/ -%{_kf5_plugindir}/kwin/effects/plugins/libblur.so -%{_kf5_plugindir}/kwin/effects/plugins/libmultitasking.so +#%{_kf5_plugindir}/kwin/effects/plugins/libblur.so +# %{_kf5_plugindir}/kwin/effects/plugins/libmultitasking.so %{_kf5_plugindir}/kwin/effects/plugins/libscissor-window.so -%{_kf5_plugindir}/platforms/libdde-kwin-wayland.so +%else +# %{_libdir}/libkwin.so %endif +%{_kf5_plugindir}/platforms/libdde-kwin-wayland.so -%if "%{kwin_version}" <= "%{kwin_max}" %files -n libkwin-xcb%{sover} %defattr(-,root,root,-) %{_libdir}/libkwin-xcb.so.* @@ -172,6 +174,5 @@ %{_libdir}/libkwin-xcb.so %{_includedir}/%{_name} %{_libdir}/pkgconfig/dde-kwin.pc -%endif %changelog ++++++ dde-kwin-5.4.12.tar.gz -> dde-kwin-5.5.11.tar.gz ++++++ ++++ 5701 lines of diff (skipped) ++++++ deepin-kwin-tabbox-chameleon-rename.patch ++++++ ++++ 769 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/deepin-kwin/deepin-kwin-tabbox-chameleon-rename.patch ++++ and /work/SRC/openSUSE:Factory/.deepin-kwin.new.2083/deepin-kwin-tabbox-chameleon-rename.patch ++++++ drop-nonexistent-translations.patch ++++++ diff -Nur dde-kwin-5.4.26/plugins/kdecoration/themes.qrc dde-kwin-5.4.26-new/plugins/kdecoration/themes.qrc --- dde-kwin-5.4.26/plugins/kdecoration/themes.qrc 2022-02-22 19:37:10.000000000 +0800 +++ dde-kwin-5.4.26-new/plugins/kdecoration/themes.qrc 2022-06-10 21:17:31.767236073 +0800 @@ -73,18 +73,4 @@ <file>deepin/dark/icons/restore_split_hover.svg</file> <file>deepin/dark/icons/restore_split_normal.svg</file> </qresource> - <qresource prefix="/splitmenu"> - <file>translations/splitmenu_bo.qm</file> - <file>translations/splitmenu_ca.qm</file> - <file>translations/splitmenu_hu.qm</file> - <file>translations/splitmenu_nl.qm</file> - <file>translations/splitmenu_pl.qm</file> - <file>translations/splitmenu_sq.qm</file> - <file>translations/splitmenu_tr.qm</file> - <file>translations/splitmenu_ug.qm</file> - <file>translations/splitmenu_zh_CN.qm</file> - <file>translations/splitmenu_zh_HK.qm</file> - <file>translations/splitmenu_zh_TW.qm</file> - <file>translations/splitmenu.qm</file> - </qresource> </RCC> ++++++ fix-build-on-5_25_3.patch ++++++ ++++ 1083 lines (skipped) ++++++ fix-library-links.patch ++++++ --- /var/tmp/diff_new_pack.GrqzNu/_old 2022-09-10 20:17:58.848935338 +0200 +++ /var/tmp/diff_new_pack.GrqzNu/_new 2022-09-10 20:17:58.852935349 +0200 @@ -1,39 +1,28 @@ -diff -Nur dde-kwin-5.3.9/deepin-wm-dbus/CMakeLists.txt dde-kwin-5.3.9-new/deepin-wm-dbus/CMakeLists.txt ---- dde-kwin-5.3.9/deepin-wm-dbus/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/deepin-wm-dbus/CMakeLists.txt 2021-09-22 11:59:34.138218455 +0800 +diff -Nur dde-kwin-5.4.26/deepin-wm-dbus/CMakeLists.txt dde-kwin-5.4.26-new/deepin-wm-dbus/CMakeLists.txt +--- dde-kwin-5.4.26/deepin-wm-dbus/CMakeLists.txt 2022-05-16 21:17:05.695018935 +0800 ++++ dde-kwin-5.4.26-new/deepin-wm-dbus/CMakeLists.txt 2022-05-16 21:17:49.254878145 +0800 @@ -8,6 +8,7 @@ + find_package(KF5WindowSystem REQUIRED) find_package(KF5GlobalAccel REQUIRED) find_package(DtkCore REQUIRED) - find_package(PkgConfig REQUIRED) +find_package(X11 REQUIRED) + find_package(PkgConfig REQUIRED) option(DISABLE_DEEPIN_WM "disable compatibility with deepin-wm" OFF) - -diff -Nur dde-kwin-5.3.9/plugins/kdecoration/CMakeLists.txt dde-kwin-5.3.9-new/plugins/kdecoration/CMakeLists.txt ---- dde-kwin-5.3.9/plugins/kdecoration/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/plugins/kdecoration/CMakeLists.txt 2021-09-22 12:19:17.088431017 +0800 -@@ -7,6 +7,7 @@ - find_package(KF5Config REQUIRED) +diff -Nur dde-kwin-5.4.26/plugins/kdecoration/CMakeLists.txt dde-kwin-5.4.26-new/plugins/kdecoration/CMakeLists.txt +--- dde-kwin-5.4.26/plugins/kdecoration/CMakeLists.txt 2022-05-16 21:17:05.699018922 +0800 ++++ dde-kwin-5.4.26-new/plugins/kdecoration/CMakeLists.txt 2022-05-16 21:18:14.570781127 +0800 +@@ -10,6 +10,7 @@ find_package(KF5WindowSystem REQUIRED) find_package(KDecoration2 REQUIRED) + find_package(Qt5LinguistTools REQUIRED) +find_package(X11 REQUIRED) - include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) -diff -Nur dde-kwin-5.3.9/plugins/kwineffects/CMakeLists.txt dde-kwin-5.3.9-new/plugins/kwineffects/CMakeLists.txt ---- dde-kwin-5.3.9/plugins/kwineffects/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/plugins/kwineffects/CMakeLists.txt 2021-09-22 11:57:57.272349252 +0800 -@@ -1,6 +1,7 @@ - find_package(Qt5 CONFIG REQUIRED COMPONENTS Core Gui) - find_package(KF5CoreAddons REQUIRED) - find_package(KF5WindowSystem REQUIRED) -+find_package(X11 REQUIRED) - - set(INSTALL_PATH "${QT_INSTALL_PLUGINS}/kwin/effects/plugins") -diff -Nur dde-kwin-5.3.9/plugins/kwineffects/multitasking/CMakeLists.txt dde-kwin-5.3.9-new/plugins/kwineffects/multitasking/CMakeLists.txt ---- dde-kwin-5.3.9/plugins/kwineffects/multitasking/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/plugins/kwineffects/multitasking/CMakeLists.txt 2021-09-22 12:19:57.403501091 +0800 +diff -Nur dde-kwin-5.4.26/plugins/kwineffects/multitasking/CMakeLists.txt dde-kwin-5.4.26-new/plugins/kwineffects/multitasking/CMakeLists.txt +--- dde-kwin-5.4.26/plugins/kwineffects/multitasking/CMakeLists.txt 2022-02-22 19:37:10.000000000 +0800 ++++ dde-kwin-5.4.26-new/plugins/kwineffects/multitasking/CMakeLists.txt 2022-05-16 21:18:54.506618901 +0800 @@ -74,6 +74,7 @@ find_package(KF5I18n REQUIRED) find_package(PkgConfig REQUIRED) @@ -42,10 +31,10 @@ pkg_search_module(QGSETTINGS REQUIRED IMPORTED_TARGET gsettings-qt) -diff -Nur dde-kwin-5.3.9/plugins/platforms/lib/CMakeLists.txt dde-kwin-5.3.9-new/plugins/platforms/lib/CMakeLists.txt ---- dde-kwin-5.3.9/plugins/platforms/lib/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/plugins/platforms/lib/CMakeLists.txt 2021-09-22 12:22:38.499841840 +0800 -@@ -6,6 +6,7 @@ +diff -Nur dde-kwin-5.4.26/plugins/platforms/lib/CMakeLists.txt dde-kwin-5.4.26-new/plugins/platforms/lib/CMakeLists.txt +--- dde-kwin-5.4.26/plugins/platforms/lib/CMakeLists.txt 2022-05-16 21:17:05.699018922 +0800 ++++ dde-kwin-5.4.26-new/plugins/platforms/lib/CMakeLists.txt 2022-05-16 21:19:21.982470960 +0800 +@@ -7,6 +7,7 @@ find_package(KF5Config REQUIRED) find_package(KF5WindowSystem REQUIRED) find_package(KF5CoreAddons REQUIRED) @@ -53,9 +42,9 @@ if (${KF5WindowSystem_VERSION_MINOR} GREATER 45) add_definitions(-DKWINDOWSYSTEM_NO_QWIDGET) -diff -Nur dde-kwin-5.3.9/plugins/platforms/plugin/CMakeLists.txt dde-kwin-5.3.9-new/plugins/platforms/plugin/CMakeLists.txt ---- dde-kwin-5.3.9/plugins/platforms/plugin/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/plugins/platforms/plugin/CMakeLists.txt 2021-09-22 12:24:57.520744806 +0800 +diff -Nur dde-kwin-5.4.26/plugins/platforms/plugin/CMakeLists.txt dde-kwin-5.4.26-new/plugins/platforms/plugin/CMakeLists.txt +--- dde-kwin-5.4.26/plugins/platforms/plugin/CMakeLists.txt 2022-02-22 19:37:10.000000000 +0800 ++++ dde-kwin-5.4.26-new/plugins/platforms/plugin/CMakeLists.txt 2022-05-16 21:19:37.386388010 +0800 @@ -10,6 +10,7 @@ find_package(Qt5DBus REQUIRED) find_package(Qt5Widgets REQUIRED) @@ -64,10 +53,10 @@ include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) -diff -Nur dde-kwin-5.3.9/tests/CMakeLists.txt dde-kwin-5.3.9-new/tests/CMakeLists.txt ---- dde-kwin-5.3.9/tests/CMakeLists.txt 2021-04-21 18:15:25.000000000 +0800 -+++ dde-kwin-5.3.9-new/tests/CMakeLists.txt 2021-09-22 12:23:10.351127887 +0800 -@@ -18,6 +18,7 @@ +diff -Nur dde-kwin-5.4.26/tests/CMakeLists.txt dde-kwin-5.4.26-new/tests/CMakeLists.txt +--- dde-kwin-5.4.26/tests/CMakeLists.txt 2022-02-22 19:37:10.000000000 +0800 ++++ dde-kwin-5.4.26-new/tests/CMakeLists.txt 2022-05-16 21:20:11.890222459 +0800 +@@ -29,6 +29,7 @@ find_package(PkgConfig REQUIRED) find_package(Qt5LinguistTools REQUIRED) find_package(Qt5X11Extras REQUIRED)
