Hello community,
here is the log from the commit of package deepin-system-monitor for
openSUSE:Factory checked in at 2020-01-27 00:22:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-system-monitor"
Mon Jan 27 00:22:55 2020 rev:4 rq:767303 version:1.5.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2019-09-27 14:53:27.731982515 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.26092/deepin-system-monitor.changes
2020-01-27 00:23:27.225525720 +0100
@@ -1,0 +2,6 @@
+Sat Jan 25 12:44:30 UTC 2020 - Hillwood Yang <[email protected]>
+
+- Add Fix-redefinition-error.patch.
+ * Fix redefinition of 'struct std::hash<QString>' error
+
+-------------------------------------------------------------------
New:
----
Fix-redefinition-error.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.SuMkjx/_old 2020-01-27 00:23:29.181526642 +0100
+++ /var/tmp/diff_new_pack.SuMkjx/_new 2020-01-27 00:23:29.209526655 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deepin-system-monitor
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,14 @@
Name: deepin-system-monitor
Version: 1.5.2
Release: 0
-Summary: A more user-friendly system monitor
+Summary: A user-friendly system monitor
License: GPL-3.0-only
Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-system-monitor
Source0:
https://github.com/linuxdeepin/deepin-system-monitor/archive/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-appdata.xml
+# PATCH-FIX-UPSTEAM Fix-redefinition-error.patch [email protected] - Fix
redefinition of 'struct std::hash<QString>' error
+Patch0: Fix-redefinition-error.patch
BuildRequires: appstream-glib
BuildRequires: desktop-file-utils
BuildRequires: dtkcore
@@ -59,6 +61,7 @@
%prep
%setup -q
+%patch0 -p1
sed -i 's/lrelease/lrelease-qt5/g' translations/translate_generation.sh
%build
@@ -74,7 +77,8 @@
%files
%defattr(-,root,root,-)
-%doc README.md LICENSE
+%doc README.md CHANGELOG.md
+%license LICENSE COPYING
%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
++++++ Fix-redefinition-error.patch ++++++
diff -Nur deepin-system-monitor-1.5.2/src/hashqstring.h
deepin-system-monitor-1.5.2-new/src/hashqstring.h
--- deepin-system-monitor-1.5.2/src/hashqstring.h 2020-01-25
20:16:33.431149900 +0800
+++ deepin-system-monitor-1.5.2-new/src/hashqstring.h 2020-01-25
20:32:22.865333300 +0800
@@ -27,6 +27,7 @@
#include <QString>
#include <string>
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace std {
template<> struct hash<QString>
{
@@ -36,5 +37,6 @@
}
};
}
+#endif
#endif // HASHQSTRING_H
