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 <andre...@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) }