[packages/xfce4-systemload-plugin] - added convert-gulong.patch (from opensuse)

mrozowik mrozowik at pld-linux.org
Sat Jun 3 10:27:41 CEST 2023


commit 1983c1138a0d26c351f3c5835fe3228605fbc84e
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Jun 3 08:27:26 2023 +0000

    - added convert-gulong.patch (from opensuse)

 convert-gulong.patch         | 27 +++++++++++++++++++++++++++
 xfce4-systemload-plugin.spec |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec
index 2290497..1a27bc0 100644
--- a/xfce4-systemload-plugin.spec
+++ b/xfce4-systemload-plugin.spec
@@ -2,11 +2,12 @@ Summary:	Xfce plugin which displays the current system load
 Summary(pl.UTF-8):	Wtyczka Xfce wyświetlająca aktualne obciążenie systemu
 Name:		xfce4-systemload-plugin
 Version:	1.3.2
-Release:	1
+Release:	2
 License:	BSD-like (see COPYING)
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/%{name}-%{version}.tar.bz2
 # Source0-md5:	9389bcec82361aaace9f70653df6647e
+Patch0:		convert-gulong.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -34,6 +35,7 @@ systemu w panelu Xfce.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
diff --git a/convert-gulong.patch b/convert-gulong.patch
new file mode 100644
index 0000000..7440258
--- /dev/null
+++ b/convert-gulong.patch
@@ -0,0 +1,27 @@
+diff -rup xfce4-systemload-plugin-1.3.2.orig/panel-plugin/network.cc xfce4-systemload-plugin-1.3.2/panel-plugin/network.cc
+--- xfce4-systemload-plugin-1.3.2.orig/panel-plugin/network.cc	2022-02-16 19:57:05.000000000 +0100
++++ xfce4-systemload-plugin-1.3.2/panel-plugin/network.cc	2022-12-22 11:12:43.287510914 +0100
+@@ -114,6 +114,7 @@ read_netload_proc (gulong *bytes)
+ gint
+ read_netload (gulong *net, gulong *NTotal)
+ {
++    gulong tbytes[2];
+     static guint64 bytes[2];
+     static gint64 time[2];
+ 
+@@ -122,10 +123,12 @@ read_netload (gulong *net, gulong *NTota
+ 
+     time[1] = g_get_monotonic_time ();
+ 
+-    if (read_netload_proc (&bytes[1]) != 0)
+-        if (read_netload_libgtop (&bytes[1]) != 0)
++    if (read_netload_proc (&tbytes[1]) != 0)
++        if (read_netload_libgtop (&tbytes[1]) != 0)
+             return -1;
+ 
++    bytes[0] = tbytes[0];
++    bytes[1] = tbytes[1];
+     if (time[0] != 0 && G_LIKELY (time[1] > time[0]) && G_LIKELY (bytes[1] >= bytes[0]))
+     {
+         guint64 diff_bits = 8 * (bytes[1] - bytes[0]);
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfce4-systemload-plugin.git/commitdiff/1983c1138a0d26c351f3c5835fe3228605fbc84e



More information about the pld-cvs-commit mailing list