gentoo resync : 25.11.2020

3 files changed, 30 insertions, 2 deletions

diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 0c5308420393..fe096beb9eb4 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,3 +1,4 @@
+AUX xfce4-systemload-plugin-1.2.3-panel-4.15.patch 691 BLAKE2B a4957c90625825b4d7d96bacc9072245be6588ce80df567e91a5b6af8dfd4b9a313114195745e24e376081017070c3db3a6ba5b742e0de870d222739a3848774 SHA512 2b0c5090086588a59011138ece073d4b626e84235e0551a1d147e69271037948affe7eb708af12655f2243a57054a9677b4dfc71561a84f9d36354bb9290ecb5
 DIST xfce4-systemload-plugin-1.2.3.tar.bz2 349074 BLAKE2B 74cdc8f759824222faf5da04fd3189210883db1ad1ed138978e8cb31075a390d17f32ffa4648cace7745faadfc818878601c70b89a8da9d7e7961768a3f9caac SHA512 98985b2250bfff3ae8314f5671ec4438f4c53702cf9e1b76563cdc5d1b4b62174d6cfa559603294c1fc8fbbd5e15a833cc112c75b106a85b1e11788ded4da538
-EBUILD xfce4-systemload-plugin-1.2.3.ebuild 750 BLAKE2B f9450558067efce6b323df528be34bab68b2096a46326035450cc8a6835c0001b286db161e97bfb64a229c51820893b5a0da125b6b8cc8f7f43b5333b744c80c SHA512 6f452d6c319ef0cb240ea7df645f160f6fecdf74456372947c2e280e8549b6373f209d129f58d09d38cf50e93c95fd0768ef524df6828a7edd07fd534a2a1930
+EBUILD xfce4-systemload-plugin-1.2.3.ebuild 824 BLAKE2B 47f19d591352f9fdf43e08ed5ff1394d2d260b40bf7d86ae4be9242bd052afa024e001bdd30a5a4d6b215613eec638371e22d1be521ed2e5b77f98935c0aaa9b SHA512 83ae9d45e2efe380ad235d3ea09970e1d88b3224bb909be46df50626a66a29f3b8667aad8beff649ed38e62518097a681fe655b84b0264466fa86d6d460455b4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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 000000000000..72bb9e848480
--- /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 562eaf22ac2d..79aebb924271 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)
 }