[packages/xfce4-systemload-plugin] - up to 1.3.3

[mrozowik]

commit b1dccc0b2a9e9d076a6ff93ea3953330b1f483d5
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Dec 28 00:29:36 2024 +0000

    - up to 1.3.3

 convert-gulong.patch         | 27 ---------------------------
 xfce4-systemload-plugin.spec | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 37 deletions(-)
---
diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec
index 1a27bc0..f522fe7 100644
--- a/xfce4-systemload-plugin.spec
+++ b/xfce4-systemload-plugin.spec
@@ -1,25 +1,27 @@
 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:	2
+Version:	1.3.3
+Release:	1
 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
+Source0:	https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/%{name}-%{version}.tar.bz2
+# Source0-md5:	70685d1c66cd0336069d284f2cef95c3
+URL:		https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-tools
-BuildRequires:	intltool
+BuildRequires:	glib2-devel >= 1:2.50.0
+BuildRequires:	gtk+3-devel >= 3.22.0
+BuildRequires:	libgtop-devel >= 2.32.0
 BuildRequires:	libtool
 BuildRequires:	libxfce4ui-devel >= 4.16.0
 BuildRequires:	libxfce4util-devel >= 4.17.2
 BuildRequires:	pkgconfig
-BuildRequires:	xfconf-devel >= 4.14.0
+BuildRequires:	upower-devel >= 0.99.0
 BuildRequires:	xfce4-dev-tools >= 4.16.0
 BuildRequires:	xfce4-panel-devel >= 4.16.0
+BuildRequires:	xfconf-devel >= 4.16.0
 Requires:	xfce4-panel >= 4.16.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,10 +37,8 @@ systemu w panelu Xfce.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
diff --git a/convert-gulong.patch b/convert-gulong.patch
deleted file mode 100644
index 7440258..0000000
--- a/convert-gulong.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/b1dccc0b2a9e9d076a6ff93ea3953330b1f483d5