Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-system-monitor for
openSUSE:Factory checked in at 2021-11-03 17:26:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-system-monitor (Old)
and /work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-system-monitor"
Wed Nov 3 17:26:01 2021 rev:10 rq:928898 version:5.8.15
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor.changes
2021-08-16 10:14:21.934896593 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1890/deepin-system-monitor.changes
2021-11-03 17:26:56.409359349 +0100
@@ -1,0 +2,13 @@
+Mon Nov 1 07:40:22 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update verion to 5.8.15
+ * Optimize for table device
+ * optimize ui
+ * Drop view path feature
+ * Fix bugs
+ * Update translations
+ * Update manual documents
+ * Add the panel icon
+- Add fix-return-type-errors.patch.
+
+-------------------------------------------------------------------
Old:
----
deepin-system-monitor-5.8.2.tar.gz
New:
----
deepin-system-monitor-5.8.15.tar.gz
deepin-system-monitor.svg
fix-return-type-errors.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.JJIqDT/_old 2021-11-03 17:26:56.833359581 +0100
+++ /var/tmp/diff_new_pack.JJIqDT/_new 2021-11-03 17:26:56.837359582 +0100
@@ -23,7 +23,7 @@
%endif
Name: deepin-system-monitor
-Version: 5.8.2
+Version: 5.8.15
Release: 0
Summary: A user-friendly system monitor
License: GPL-3.0-only
@@ -31,11 +31,20 @@
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
+Source2: %{name}.svg
+# PATCH-FIX-UPSTREAN fix-return-type-errors.patch [email protected]
+Patch0: fix-return-type-errors.patch
+%ifarch ppc ppc64 ppc64le s390 s390x
+BuildRequires: deepin-desktop-base
+%else
+BuildRequires: deepin-manual
+%endif
BuildRequires: appstream-glib
BuildRequires: deepin-gettext-tools
BuildRequires: desktop-file-utils
BuildRequires: dtkcore
BuildRequires: fdupes
+BuildRequires: gmock
BuildRequires: gtest
BuildRequires: hicolor-icon-theme
BuildRequires: libcap-devel
@@ -49,13 +58,17 @@
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(dde-dock)
+BuildRequires: pkgconfig(dframeworkdbus)
BuildRequires: pkgconfig(dtkcore) >= 5.0.0
BuildRequires: pkgconfig(dtkgui) >= 5.0.0
BuildRequires: pkgconfig(dtkwidget) >= 5.0.0
BuildRequires: pkgconfig(dtkwm)
+BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libnl-route-3.0)
@@ -75,20 +88,21 @@
deepin-system-monitor is a simple process and system monitor for the Deepin
Desktop.
+%package -n deepin-dock-plugin-system-monitor
+Summary: The system monitor plugin of deepin dock
+Group: System/GUI/Other
+Requires: %{name} = %{version}
+Requires: deepin-dock
+
+%description -n deepin-dock-plugin-system-monitor
+The package provide system monitor plugin for deepin dock
+
%lang_package
%prep
-%setup -q
+%autosetup -p1
sed -i 's/Exec=deepin-music/Exec=env QT_QPA_PLATFORMTHEME=deepin
deepin-system-monitor/g' \
-translations/desktop/%{name}.desktop
-sed -i 's/5.5//g' src/CMakeLists.txt
-
-%if 0%{?suse_version} > 1500
-# Workaround build failure with GCC 10
-sed -e 's|print_err|print_err_system|g' -i src/process/system_stat.cpp
-sed -e 's|print_err|print_err_process|g' -i src/process/process_stat.cpp
-sed -e 's|print_err|print_err_desktop|g' -i src/process/desktop_entry_stat.cpp
-%endif
+deepin-system-monitor-main/translations/desktop/%{name}.desktop
%build
%cmake -DVERSION=%{version}-%{distribution}
@@ -97,6 +111,7 @@
%install
%cmake_install
install -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+install -Dm644 %{SOURCE2}
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%find_lang %{name} --with-qt
%suse_update_desktop_file -r %{name} QT System Monitor
%fdupes %{buildroot}%{_datadir}
@@ -104,20 +119,30 @@
%files
%license LICENSE COPYING
%doc README.md CHANGELOG.md
+%config %{_sysconfdir}/xdg/autostart/%{name}-*.desktop
%{_bindir}/%{name}
+%{_bindir}/%{name}-*
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions
%{_datadir}/polkit-1/actions/com.deepin.pkexec.%{name}.policy
-%dir %{_datadir}/icons/hicolor/scalable/apps
-%{_datadir}/icons/hicolor/scalable/apps/deepin-system-monitor.svg
-%dir %{_datadir}/deepin-system-monitor
-%dir %{_datadir}/deepin-system-monitor/translations
-%{_datadir}/deepin-system-monitor/translations/deepin-system-monitor.qm
+%{_datadir}/deepin-manual/manual-assets/application/%{name}
+%{_datadir}/glib-2.0/schemas/com.deepin.*
+%{_datadir}/dbus-1/services/com.deepin.SystemMonitor.Daemon.service
+%{_datadir}/dbus-1/services/com.deepin.SystemMonitorPluginPopup.service
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+
+%files -n deepin-dock-plugin-system-monitor
+%dir %{_prefix}/lib/dde-dock
+%dir %{_prefix}/lib/dde-dock/plugins
+%{_prefix}/lib/dde-dock/plugins/libdeepin-system-monitor-plugin.so
%files lang -f %{name}.lang
# RPM currently can not handle Asturian
+%dir %{_datadir}/deepin-system-monitor
+%dir %{_datadir}/deepin-system-monitor/translations
+%{_datadir}/deepin-system-monitor/translations/deepin-system-monitor.qm
%lang(ast)
%{_datadir}/deepin-system-monitor/translations/deepin-system-monitor_ast.qm
%changelog
++++++ deepin-system-monitor-5.8.2.tar.gz ->
deepin-system-monitor-5.8.15.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-system-monitor/deepin-system-monitor-5.8.2.tar.gz
/work/SRC/openSUSE:Factory/.deepin-system-monitor.new.1890/deepin-system-monitor-5.8.15.tar.gz
differ: char 13, line 1
++++++ fix-return-type-errors.patch ++++++
diff -Nur
deepin-system-monitor-5.8.15/deepin-system-monitor-main/3rdparty/strutils.c
deepin-system-monitor-5.8.15-new/deepin-system-monitor-main/3rdparty/strutils.c
--- deepin-system-monitor-5.8.15/deepin-system-monitor-main/3rdparty/strutils.c
2021-09-26 08:59:21.000000000 +0800
+++
deepin-system-monitor-5.8.15-new/deepin-system-monitor-main/3rdparty/strutils.c
2021-11-01 16:46:43.414686745 +0800
@@ -275,6 +275,7 @@
va_end(ap);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, arg);
+ return 0;
}
#ifndef HAVE_MEMPCPY
@@ -448,6 +449,7 @@
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
+ return 0;
}
long double strtold_or_err(const char *str, const char *errmesg)
@@ -469,6 +471,7 @@
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
+ return 0;
}
long strtol_or_err(const char *str, const char *errmesg)
@@ -490,6 +493,7 @@
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
+ return 0;
}
unsigned long strtoul_or_err(const char *str, const char *errmesg)
@@ -511,6 +515,7 @@
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
+ return 0;
}
uintmax_t strtosize_or_err(const char *str, const char *errmesg)
@@ -524,6 +529,7 @@
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
+ return 0;
}
