summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-11-09 09:12:39 +0100
committerMichał Górny <mgorny@gentoo.org>2020-11-09 09:14:52 +0100
commitb758e0cc985c32c8e28055408ae76114368f771b (patch)
tree8cb230af3c533d2e8cef56233f20738edac224e8 /xfce-extra
parentdev-python/diskcache: Bump to 5.1.0 (diff)
downloadgentoo-b758e0cc985c32c8e28055408ae76114368f771b.tar.gz
gentoo-b758e0cc985c32c8e28055408ae76114368f771b.tar.bz2
gentoo-b758e0cc985c32c8e28055408ae76114368f771b.zip
xfce-extra/xfce4-xkb-plugin: Backport fix for panel-4.15
Closes: https://bugs.gentoo.org/732698 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch25
-rw-r--r--xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild6
2 files changed, 30 insertions, 1 deletions
diff --git a/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch
new file mode 100644
index 000000000000..aeb1b0a2be2d
--- /dev/null
+++ b/xfce-extra/xfce4-xkb-plugin/files/xfce4-xkb-plugin-0.8.1-panel-4.15.patch
@@ -0,0 +1,25 @@
+From 7ecfb91c6b68477262111125977a8229ff142058 Mon Sep 17 00:00:00 2001
+From: Andre Miranda <andreldm@xfce.org>
+Date: Sat, 19 Oct 2019 19:23:30 -0300
+Subject: [PATCH] Fix build with panel 4.15
+
+---
+ panel-plugin/xkb-plugin.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panel-plugin/xkb-plugin.h b/panel-plugin/xkb-plugin.h
+index 3fe3ce5..eeb10e5 100644
+--- a/panel-plugin/xkb-plugin.h
++++ b/panel-plugin/xkb-plugin.h
+@@ -26,7 +26,7 @@
+ #ifndef _XFCE_XKB_H_
+ #define _XFCE_XKB_H_
+
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+
+ #include "xkb-xfconf.h"
+
+--
+GitLab
+
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
index 3b5cb074fe65..fe250799a9ff 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.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=6
@@ -30,6 +30,10 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${P}-panel-4.15.patch
+)
+
src_configure() {
local myconf=(
--libexecdir="${EPREFIX}"/usr/$(get_libdir)