Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-control-center for openSUSE:Factory checked in at 2021-08-16 10:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-control-center (Old) and /work/SRC/openSUSE:Factory/.deepin-control-center.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-control-center" Mon Aug 16 10:09:13 2021 rev:2 rq:910907 version:5.4.47 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-control-center/deepin-control-center.changes 2021-04-26 16:39:26.974058949 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-control-center.new.1899/deepin-control-center.changes 2021-08-16 10:14:13.778907011 +0200 @@ -1,0 +2,8 @@ +Sun Jul 25 12:45:20 UTC 2021 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.4.47 + * Fix bugs + * Use DBus to provide timezoon +- Add fix-qDBusRegisterMetaType-error.patch. + +------------------------------------------------------------------- Old: ---- dde-control-center-5.4.17.tar.gz New: ---- dde-control-center-5.4.47.tar.gz fix-qDBusRegisterMetaType-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-control-center.spec ++++++ --- /var/tmp/diff_new_pack.HV8Ef8/_old 2021-08-16 10:14:14.282906367 +0200 +++ /var/tmp/diff_new_pack.HV8Ef8/_new 2021-08-16 10:14:14.286906362 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-control-center # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define _name dde-control-center %if 0%{?is_opensuse} %define distribution openSUSE-Edition @@ -23,10 +24,10 @@ %endif Name: deepin-control-center -Version: 5.4.17 +Version: 5.4.47 Release: 0 Summary: New control center for Linux Deepin -License: GPL-3.0+ +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/dde-control-center Source0: https://github.com/linuxdeepin/dde-control-center/archive/%{version}/%{_name}-%{version}.tar.gz # PATCH-FOR-OPENSUSE deepin-control-center-no-user-experience.patch hillw...@opensuse.org @@ -34,44 +35,46 @@ Patch0: %{name}-no-user-experience.patch # PATCH-FOR-OPENSUSE systeminfo-deepin-icon.patch hillw...@opensuse.org - Use deepin icons instead of UOS Patch1: systeminfo-deepin-icon.patch +# PATCH-FOR-UPSTEAM fix-qDBusRegisterMetaType-error.patch hillw...@opensuse.org +Patch2: fix-qDBusRegisterMetaType-error.patch Group: System/GUI/Other -BuildRequires: fdupes BuildRequires: cmake -BuildRequires: gtest -BuildRequires: dtkcore -BuildRequires: update-desktop-files -BuildRequires: desktop-file-utils -BuildRequires: deepin-dock-devel BuildRequires: deepin-desktop-base +BuildRequires: deepin-dock-devel BuildRequires: deepin-pw-check-devel +BuildRequires: desktop-file-utils +BuildRequires: dtkcore +BuildRequires: fdupes +BuildRequires: gtest +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libQt5Widgets-private-headers-devel +BuildRequires: libqt5-linguist +BuildRequires: update-desktop-files BuildRequires: cmake(KF5NetworkManagerQt) -BuildRequires: pkgconfig(dtkwidget) >= 5.0.0 -BuildRequires: pkgconfig(dtkcore) >= 5.0.0 -BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 -BuildRequires: pkgconfig(dde-network-utils) -BuildRequires: pkgconfig(gsettings-qt) -BuildRequires: pkgconfig(Qt5Core) +BuildRequires: cmake(PolkitQt5-1) BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(dde-network-utils) +BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 +BuildRequires: pkgconfig(dtkcore) >= 5.0.0 +BuildRequires: pkgconfig(dtkwidget) >= 5.0.0 +BuildRequires: pkgconfig(gsettings-qt) +BuildRequires: pkgconfig(udisks2-qt5) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(udisks2-qt5) -BuildRequires: cmake(PolkitQt5-1) -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libQt5Widgets-private-headers-devel -BuildRequires: libqt5-linguist Requires: deepin-account-faces Requires: deepin-api Requires: deepin-daemon -Requires: qt5integration Requires: deepin-start -Requires: redshift Requires: libqt5-qdbus +Requires: qt5integration +Requires: redshift Recommends: %{name}-data Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ dde-control-center-5.4.17.tar.gz -> dde-control-center-5.4.47.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-control-center/dde-control-center-5.4.17.tar.gz /work/SRC/openSUSE:Factory/.deepin-control-center.new.1899/dde-control-center-5.4.47.tar.gz differ: char 13, line 1 ++++++ fix-qDBusRegisterMetaType-error.patch ++++++ >From 77de2c237cf56acaf70e47b8ee6e88053db1ceeb Mon Sep 17 00:00:00 2001 From: Felix Yan <felixonm...@archlinux.org> Date: Tue, 6 Jul 2021 00:35:02 +0800 Subject: [PATCH] fix: build failure due to missing include on QDBusMetaType MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following build failure: ``` /build/deepin-control-center/src/dde-control-center-5.4.47/src/frame/window/modules/network/connectioneditpage.cpp: In member function ???void dccV20::network::ConnectionEditPage::prepareConnection()???: /build/deepin-control-center/src/dde-control-center-5.4.47/src/frame/window/modules/network/connectioneditpage.cpp:354:9: error: ???qDBusRegisterMetaType??? was not declared in this scope; did you mean ???qRegisterMetaType???? 354 | qDBusRegisterMetaType<QByteArrayList>(); | ^~~~~~~~~~~~~~~~~~~~~ | qRegisterMetaType /build/deepin-control-center/src/dde-control-center-5.4.47/src/frame/window/modules/network/connectioneditpage.cpp:354:45: error: expected primary-expression before ???>??? token 354 | qDBusRegisterMetaType<QByteArrayList>(); | ^ /build/deepin-control-center/src/dde-control-center-5.4.47/src/frame/window/modules/network/connectioneditpage.cpp:354:47: error: expected primary-expression before ???)??? token 354 | qDBusRegisterMetaType<QByteArrayList>(); | ^ ``` Log: --- src/frame/window/modules/network/connectioneditpage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frame/window/modules/network/connectioneditpage.h b/src/frame/window/modules/network/connectioneditpage.h index 41020b663..f9ddd4fe0 100644 --- a/src/frame/window/modules/network/connectioneditpage.h +++ b/src/frame/window/modules/network/connectioneditpage.h @@ -29,6 +29,7 @@ #include "interface/moduleinterface.h" #include "interface/namespace.h" +#include <QDBusMetaType> #include <QPointer> #include <QPushButton> #include <QVBoxLayout>