Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-dock for openSUSE:Factory checked in at 2022-03-07 17:46:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-dock (Old) and /work/SRC/openSUSE:Factory/.deepin-dock.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-dock" Mon Mar 7 17:46:09 2022 rev:6 rq:959460 version:5.5.9 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-dock/deepin-dock.changes 2022-01-31 22:57:14.297615357 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-dock.new.1958/deepin-dock.changes 2022-03-07 17:46:13.743132181 +0100 @@ -1,0 +2,8 @@ +Wed Feb 23 12:05:20 UTC 2022 - Hillwood Yang <[email protected]> + +- Update version to 5.5.9 + * Add control center plugin + * Update translations + * Fix bug + +------------------------------------------------------------------- Old: ---- dde-dock-5.4.69.tar.gz New: ---- dde-dock-5.5.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-dock.spec ++++++ --- /var/tmp/diff_new_pack.xUC8q4/_old 2022-03-07 17:46:14.435131981 +0100 +++ /var/tmp/diff_new_pack.xUC8q4/_new 2022-03-07 17:46:14.443131979 +0100 @@ -1,8 +1,8 @@ # # spec file for package deepin-dock # -# Copyright (c) 2021 SUSE LLC -# Copyright (c) 2021 Hillwood Yang <[email protected]> +# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2022 Hillwood Yang <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,17 @@ %define _name dde-dock Name: deepin-dock -Version: 5.4.69 +Version: 5.5.9 Release: 0 Summary: Deepin dock License: LGPL-3.0-or-later Group: System/GUI/Other URL: https://github.com/linuxdeepin/dde-dock Source0: https://github.com/linuxdeepin/dde-dock/archive/%{version}/%{_name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM deepin-dock-link-libraries.patch [email protected] - link some libraries to fix build Patch0: %{name}-link-libraries.patch BuildRequires: cmake +BuildRequires: dtkcommon >= 5.5.20 BuildRequires: dtkcore >= 5.0.0 BuildRequires: gmock BuildRequires: gtest @@ -37,6 +39,7 @@ BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: libqt5-qtdeclarative-devel BuildRequires: libqt5-qttools-devel +BuildRequires: cmake(DdeControlCenter) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -51,11 +54,13 @@ BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 BuildRequires: pkgconfig(dtkwidget) >= 5.0.0 BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(libdeepin_pw_check) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-composite) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) +BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xtst) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,9 +75,10 @@ %description devel The deepin-dock-devel package contains the header files for deepin-dock. +%lang_package + %prep -%setup -q -n %{_name}-%{version} -%patch0 -p1 +%autosetup -p1 -n %{_name}-%{version} sed -i "s/lrelease/lrelease-qt5/g" translate_generation.sh sed -i 's|no</allow_any>|auth_admin</allow_any>|g' plugins/overlay-warning/com.deepin.dde.dock.overlay.policy # sed -i 's|lib/|${CMAKE_INSTALL_LIBDIR}/|g' plugins/*/CMakeLists.txt @@ -93,6 +99,7 @@ %build %cmake +%cmake_build %install %cmake_install @@ -100,7 +107,6 @@ rm -rf %{buildroot}%{_datadir}/polkit-1 %files -%defattr(-,root,root) %doc README.md CHANGELOG.md %license LICENSE %{_bindir}/%{_name} @@ -110,12 +116,21 @@ %dir %{_sysconfdir}/dde-dock %dir %{_sysconfdir}/dde-dock/indicator %config %{_sysconfdir}/dde-dock/indicator/keybord_layout.json +%dir %{_datadir}/dsg +%dir %{_datadir}/dsg/apps +%{_datadir}/dsg/apps/%{_name} +%{_datadir}/dsg/apps/dde-control-center +%dir %{_libdir}/dde-control-center +%dir %{_libdir}/dde-control-center/modules +%{_libdir}/dde-control-center/modules/libdcc-dock-plugin.so %files devel -%defattr(-,root,root) %{_includedir}/%{_name} %dir %{_libdir}/cmake/DdeDock %{_libdir}/cmake/DdeDock/DdeDockConfig.cmake %{_libdir}/pkgconfig/%{_name}.pc +%files lang +%{_datadir}/dcc-dock-plugin + %changelog ++++++ dde-dock-5.4.69.tar.gz -> dde-dock-5.5.9.tar.gz ++++++ ++++ 26984 lines of diff (skipped) ++++++ deepin-dock-link-libraries.patch ++++++ --- /var/tmp/diff_new_pack.xUC8q4/_old 2022-03-07 17:46:14.711131901 +0100 +++ /var/tmp/diff_new_pack.xUC8q4/_new 2022-03-07 17:46:14.715131900 +0100 @@ -1,12 +1,91 @@ -diff -Nur dde-dock-5.1.0.1/plugins/onboard/CMakeLists.txt dde-dock-5.1.0.1-new/plugins/onboard/CMakeLists.txt ---- dde-dock-5.1.0.1/plugins/onboard/CMakeLists.txt 2020-04-26 18:42:42.000000000 +0800 -+++ dde-dock-5.1.0.1-new/plugins/onboard/CMakeLists.txt 2020-04-28 12:52:44.776334645 +0800 -@@ -23,6 +23,7 @@ - ${DtkWidget_LIBRARIES} +diff -Nur dde-dock-5.5.9/plugins/airplane-mode/CMakeLists.txt dde-dock-5.5.9-new/plugins/airplane-mode/CMakeLists.txt +--- dde-dock-5.5.9/plugins/airplane-mode/CMakeLists.txt 2021-12-17 13:22:22.000000000 +0800 ++++ dde-dock-5.5.9-new/plugins/airplane-mode/CMakeLists.txt 2022-02-23 19:28:54.416273939 +0800 +@@ -12,6 +12,7 @@ + find_package(Qt5DBus REQUIRED) + find_package(DtkWidget REQUIRED) + ++pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor) + pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) + pkg_check_modules(QGSettings REQUIRED gsettings-qt) + +@@ -27,6 +28,7 @@ + ../../frame/util + ) + target_link_libraries(${PLUGIN_NAME} PRIVATE ++ ${XCB_EWMH_LIBRARIES} + ${DtkWidget_LIBRARIES} + ${DFrameworkDBus_LIBRARIES} + ${QGSettings_LIBRARIES} +diff -Nur dde-dock-5.5.9/plugins/bluetooth/CMakeLists.txt dde-dock-5.5.9-new/plugins/bluetooth/CMakeLists.txt +--- dde-dock-5.5.9/plugins/bluetooth/CMakeLists.txt 2021-12-17 13:22:22.000000000 +0800 ++++ dde-dock-5.5.9-new/plugins/bluetooth/CMakeLists.txt 2022-02-23 19:26:38.184923248 +0800 +@@ -15,6 +15,7 @@ + find_package(Qt5DBus REQUIRED) + find_package(DtkWidget REQUIRED) + ++pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor) + pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) + pkg_check_modules(QGSettings REQUIRED gsettings-qt) + +@@ -30,6 +31,7 @@ + + target_link_libraries(${PLUGIN_NAME} PRIVATE + ${DtkWidget_LIBRARIES} ++ ${XCB_EWMH_LIBRARIES} + ${DFrameworkDBus_LIBRARIES} + ${QGSettings_LIBRARIES} + ${Qt5DBus_LIBRARIES} +diff -Nur dde-dock-5.5.9/plugins/onboard/CMakeLists.txt dde-dock-5.5.9-new/plugins/onboard/CMakeLists.txt +--- dde-dock-5.5.9/plugins/onboard/CMakeLists.txt 2021-12-17 13:22:22.000000000 +0800 ++++ dde-dock-5.5.9-new/plugins/onboard/CMakeLists.txt 2022-02-23 19:15:58.315485651 +0800 +@@ -9,6 +9,7 @@ + find_package(PkgConfig REQUIRED) + find_package(Qt5Widgets REQUIRED) + find_package(Qt5DBus REQUIRED) ++find_package(DtkGui REQUIRED) + find_package(DtkWidget REQUIRED) + + add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN") +@@ -19,6 +20,9 @@ + ../../interfaces) + target_link_libraries(${PLUGIN_NAME} PRIVATE ${Qt5Widgets_LIBRARIES} - ${Qt5Svg_LIBRARIES} + ${Qt5DBus_LIBRARIES} ++ ${DtkGui_LIBRARIES} ++ ${DtkWidget_LIBRARIES} ${DFrameworkDBus_LIBRARIES} ) +diff -Nur dde-dock-5.5.9/plugins/sound/CMakeLists.txt dde-dock-5.5.9-new/plugins/sound/CMakeLists.txt +--- dde-dock-5.5.9/plugins/sound/CMakeLists.txt 2021-12-17 13:22:22.000000000 +0800 ++++ dde-dock-5.5.9-new/plugins/sound/CMakeLists.txt 2022-02-23 19:23:30.333818618 +0800 +@@ -13,6 +13,7 @@ + find_package(Qt5DBus REQUIRED) + find_package(DtkWidget REQUIRED) + ++pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11 xcursor) + pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) + pkg_check_modules(QGSettings REQUIRED gsettings-qt) + +@@ -29,6 +30,7 @@ + + target_link_libraries(${PLUGIN_NAME} PRIVATE + ${DtkWidget_LIBRARIES} ++ ${XCB_EWMH_LIBRARIES} + ${DFrameworkDBus_LIBRARIES} + ${QGSettings_LIBRARIES} + ${Qt5DBus_LIBRARIES} +diff -Nur dde-dock-5.5.9/plugins/tray/CMakeLists.txt dde-dock-5.5.9-new/plugins/tray/CMakeLists.txt +--- dde-dock-5.5.9/plugins/tray/CMakeLists.txt 2021-12-17 13:22:22.000000000 +0800 ++++ dde-dock-5.5.9-new/plugins/tray/CMakeLists.txt 2022-02-23 19:24:33.221518879 +0800 +@@ -26,7 +26,7 @@ + find_package(DtkWidget REQUIRED) + find_package(dbusmenu-qt5 REQUIRED) + +-pkg_check_modules(XCB_LIBS REQUIRED xcb-ewmh xcb xcb-image xcb-composite xtst x11 xext xcb-icccm dbusmenu-qt5) ++pkg_check_modules(XCB_LIBS REQUIRED xcb-ewmh xcb xcb-image xcb-composite xtst x11 xext xcb-icccm dbusmenu-qt5 xcursor) + pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) + pkg_check_modules(QGSettings REQUIRED gsettings-qt) +
