summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarri Nieminen <moikkis@gmail.com>2017-03-26 10:31:06 +0300
committerDavid Seifert <soap@gentoo.org>2017-04-01 12:20:54 +0200
commitf87a7939f464757daef7cdd5559a9639129fcbbc (patch)
tree90f8acdaeed1341115879671790c0122081b13bd /x11-misc/trayer
parentmedia-tv/kodi: Add dependency on dev-libs/rapidjson, remove dependency on dev... (diff)
downloadgentoo-f87a7939f464757daef7cdd5559a9639129fcbbc.tar.gz
gentoo-f87a7939f464757daef7cdd5559a9639129fcbbc.tar.bz2
gentoo-f87a7939f464757daef7cdd5559a9639129fcbbc.zip
x11-misc/trayer: Dont include libXmu
Gentoo-Bug: https://bugs.gentoo.org/613842 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4302
Diffstat (limited to 'x11-misc/trayer')
-rw-r--r--x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch24
-rw-r--r--x11-misc/trayer/trayer-1.0-r2.ebuild2
-rw-r--r--x11-misc/trayer/trayer-1.0-r3.ebuild1
3 files changed, 27 insertions, 0 deletions
diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
new file mode 100644
index 000000000000..8b9fd291d15f
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
@@ -0,0 +1,24 @@
+From 710efb0c8192e704a83fd3d4b8b3c0d6be984246 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sun, 26 Mar 2017 10:08:05 +0300
+Subject: [PATCH] Don't include libXmu
+
+---
+ systray/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/systray/main.c b/systray/main.c
+index dff5455..79cbe34 100644
+--- a/systray/main.c
++++ b/systray/main.c
+@@ -2,7 +2,6 @@
+ #include <unistd.h>
+ #include <string.h>
+
+-#include <X11/Xmu/WinUtil.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+
+ #include "panel.h"
+--
+2.12.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r2.ebuild b/x11-misc/trayer/trayer-1.0-r2.ebuild
index eb0f827a998c..9876527f2e6f 100644
--- a/x11-misc/trayer/trayer-1.0-r2.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r2.ebuild
@@ -24,6 +24,8 @@ DEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}"/${P}-dont-include-libXmu.patch )
+
src_prepare() {
default
# fix for as-needed, bug #141707
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
index 574902f5043d..ad5fb8df846f 100644
--- a/x11-misc/trayer/trayer-1.0-r3.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r3.ebuild
@@ -26,6 +26,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+ "${FILESDIR}"/${P}-dont-include-libXmu.patch
"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
)