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 2021-09-22 22:12:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-kwin (Old) and /work/SRC/openSUSE:Factory/.deepin-kwin.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-kwin" Wed Sep 22 22:12:53 2021 rev:4 rq:920722 version:5.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-kwin/deepin-kwin.changes 2021-08-16 10:14:21.198897533 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-kwin.new.1899/deepin-kwin.changes 2021-09-22 22:13:02.996327654 +0200 @@ -1,0 +2,5 @@ +Wed Sep 22 04:09:04 UTC 2021 - Hillwood Yang <hillw...@opensuse.org> + +- Add fix-library-links.patch, fix build on Tumbleweed + +------------------------------------------------------------------- New: ---- fix-library-links.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-kwin.spec ++++++ --- /var/tmp/diff_new_pack.ztRsY8/_old 2021-09-22 22:13:04.224328675 +0200 +++ /var/tmp/diff_new_pack.ztRsY8/_new 2021-09-22 22:13:04.224328675 +0200 @@ -34,6 +34,9 @@ Patch1: deepin-kwin-crash.patch BuildRequires: cmake(KWaylandServer) %endif +# 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 BuildRequires: fdupes BuildRequires: gtest BuildRequires: libqt5-linguist ++++++ fix-library-links.patch ++++++ 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 @@ -8,6 +8,7 @@ find_package(KF5GlobalAccel REQUIRED) find_package(DtkCore REQUIRED) find_package(PkgConfig REQUIRED) +find_package(X11 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) find_package(KF5WindowSystem REQUIRED) find_package(KDecoration2 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 @@ -74,6 +74,7 @@ find_package(KF5I18n REQUIRED) find_package(PkgConfig REQUIRED) find_package(Qt5LinguistTools REQUIRED) +find_package(X11 REQUIRED) 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 @@ find_package(KF5Config REQUIRED) find_package(KF5WindowSystem REQUIRED) find_package(KF5CoreAddons REQUIRED) +find_package(X11 REQUIRED) 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 @@ -10,6 +10,7 @@ find_package(Qt5DBus REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(DtkGui REQUIRED) +find_package(X11 REQUIRED) 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 @@ find_package(PkgConfig REQUIRED) find_package(Qt5LinguistTools REQUIRED) find_package(Qt5X11Extras REQUIRED) +find_package(X11 REQUIRED) pkg_search_module(QGSETTINGS REQUIRED IMPORTED_TARGET gsettings-qt)
