[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-systemload-plugin/files/, xfce-extra/xfce4-systemload-plugin/

[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-systemload-plugin/files/, xfce-extra/xfce4-systemload-plugin/

[Michał Górny]

commit:     c918a115d3a69df37a4e64e03839b4838b4f1bdf
Author:     Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com>
AuthorDate: Sun Sep  6 12:56:42 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 08:19:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c918a115

xfce-extra/xfce4-systemload-plugin: panel-4.15 compatibility

Closes: https://bugs.gentoo.org/733952
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17437
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../xfce4-systemload-plugin-1.2.3-panel-4.15.patch | 25 ++++++++++++++++++++++
 .../xfce4-systemload-plugin-1.2.3.ebuild           |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch
new file mode 100644
index 00000000000..72bb9e84848
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch
@@ -0,0 +1,25 @@
+From 35b50d425209773c9dd21f125b1bd3f8c3daa46b Mon Sep 17 00:00:00 2001
+From: Andre Miranda <andreldm@xfce.org>
+Date: Fri, 4 Oct 2019 00:45:46 -0300
+Subject: [PATCH] Allow compilation with panel 4.15
+
+---
+ panel-plugin/systemload.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
+index af75be4..c6174b8 100644
+--- a/panel-plugin/systemload.c
++++ b/panel-plugin/systemload.c
+@@ -38,7 +38,7 @@
+ 
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4ui/libxfce4ui.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #ifdef HAVE_UPOWER_GLIB
+ #include <upower.h>
+-- 
+GitLab
+

diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
index 562eaf22ac2..79aebb92427 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/xfce4-systemload-plugin-1.2.3-panel-4.15.patch" )
+
 src_configure() {
 	econf $(use_enable upower)
 }

[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-systemload-plugin/files/, xfce-extra/xfce4-systemload-plugin/

[Michał Górny]

commit:     b7613cd062684dca7f6aad45663c90ab1f44419c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 01:00:23 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 01:04:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7613cd0

xfce-extra/xfce4-systemload-plugin: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 xfce-extra/xfce4-systemload-plugin/Manifest        |  1 -
 .../xfce4-systemload-plugin-1.2.3-panel-4.15.patch | 25 -----------------
 .../xfce4-systemload-plugin-1.2.3.ebuild           | 31 ----------------------
 3 files changed, 57 deletions(-)

diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 6f57312b121..e2696666f11 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-systemload-plugin-1.2.3.tar.bz2 349074 BLAKE2B 74cdc8f759824222faf5da04fd3189210883db1ad1ed138978e8cb31075a390d17f32ffa4648cace7745faadfc818878601c70b89a8da9d7e7961768a3f9caac SHA512 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
 DIST xfce4-systemload-plugin-1.2.4.tar.bz2 378644 BLAKE2B b50806925f02ce2a792cb72198bdd2cb0124e1d4ce12c91de124c9f4085e5908200a6f0c3b50fffdc1a6a5ae871eef0f04ec9687f43d8e8d5de1372d808a5fad SHA512 1f57ffe861e9906a1744a02b0b50b1dd9e755ea4d0f8b93dba7f42416cd3727834eca60129465fa6f665ac93ec43c3a5272ce9ceae5f4bb17bf180d88e87bddd

diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch
deleted file mode 100644
index 72bb9e84848..00000000000
--- a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.2.3-panel-4.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 35b50d425209773c9dd21f125b1bd3f8c3daa46b Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Fri, 4 Oct 2019 00:45:46 -0300
-Subject: [PATCH] Allow compilation with panel 4.15
-
----
- panel-plugin/systemload.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
-index af75be4..c6174b8 100644
---- a/panel-plugin/systemload.c
-+++ b/panel-plugin/systemload.c
-@@ -38,7 +38,7 @@
- 
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #ifdef HAVE_UPOWER_GLIB
- #include <upower.h>
--- 
-GitLab
-

diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
deleted file mode 100644
index 945435ae7f0..00000000000
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="System load plug-in for Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="upower"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/xfce4-systemload-plugin-1.2.3-panel-4.15.patch" )
-
-src_configure() {
-	econf $(use_enable upower)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-systemload-plugin/files/, xfce-extra/xfce4-systemload-plugin/

[Sam James]

commit:     7d8dc57c3570616a47e7599b3e7692788ac81180
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 04:15:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 04:17:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8dc57c

xfce-extra/xfce4-systemload-plugin: fix build on x86

Closes: https://bugs.gentoo.org/905084
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xfce4-systemload-plugin-1.3.2-x86.patch  | 22 ++++++++
 .../xfce4-systemload-plugin-1.3.2-r1.ebuild        | 60 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.3.2-x86.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.3.2-x86.patch
new file mode 100644
index 000000000000..027aea406823
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-1.3.2-x86.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/905084
+https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/issues/25
+https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/commit/13a2e3ecb4b6cf6aad26c6b1d2388ef6922a5c92
+
+From 13a2e3ecb4b6cf6aad26c6b1d2388ef6922a5c92 Mon Sep 17 00:00:00 2001
+From: Akbarkhon Variskhanov <akbarkhon.variskhanov@gmail.com>
+Date: Tue, 20 Dec 2022 13:50:40 +0500
+Subject: [PATCH] build: Fix failure due to wrong var type (Fixes #25)
+
+--- a/panel-plugin/network.cc
++++ b/panel-plugin/network.cc
+@@ -114,7 +114,7 @@ read_netload_proc (gulong *bytes)
+ gint
+ read_netload (gulong *net, gulong *NTotal)
+ {
+-    static guint64 bytes[2];
++    static gulong bytes[2];
+     static gint64 time[2];
+ 
+     *net = 0;
+-- 
+GitLab

diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2-r1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..27fc98975a83
--- /dev/null
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="System load plug-in for Xfce panel"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/
+"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="upower"
+
+DEPEND="
+	>=xfce-base/libxfce4ui-4.16:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.17.2:=
+	>=xfce-base/xfce4-panel-4.16:=
+	>=xfce-base/xfconf-4.14:=
+	upower? ( >=sys-power/upower-0.9.23 )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-x86.patch
+)
+
+src_configure() {
+	local myconf=(
+		# gtop is needed only as fallback when /proc is not available
+		--disable-libgtop
+		$(use_enable upower)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}