Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xmobar/, x11-misc/xmobar/files/
Date: Wed, 30 Nov 2016 09:58:53
Message-Id: 1480499924.d792824ec49f5518240c4a50ead0e2a6cfb62e55.slyfox@gentoo
1 commit: d792824ec49f5518240c4a50ead0e2a6cfb62e55
2 Author: Sergei Trofimovich <siarheit <AT> google <DOT> com>
3 AuthorDate: Wed Nov 30 09:56:18 2016 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 30 09:58:44 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d792824e
7
8 x11-misc/xmobar: in USE=-xmp don't use XPMFile in preprocessor, bug #601262
9
10 Reported-by: Toralf Förster
11 Bug: https://bugs.gentoo.org/601262
12
13 Package-Manager: portage-2.3.2
14
15 x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch | 9 +++++++++
16 x11-misc/xmobar/xmobar-0.24.3.ebuild | 2 ++
17 2 files changed, 11 insertions(+)
18
19 diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
20 new file mode 100644
21 index 00000000..8f4da6b
22 --- /dev/null
23 +++ b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
24 @@ -0,0 +1,9 @@
25 +diff --git a/xmobar.cabal b/xmobar.cabal
26 +index f6a6dae..8a17579 100644
27 +--- a/xmobar.cabal
28 ++++ b/xmobar.cabal
29 +@@ -89,3 +89,3 @@ executable xmobar
30 + Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize,
31 +- XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal,
32 ++ XUtil, StatFS, Runnable, ColorCache, Window, Signal,
33 + Environment,
34
35 diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
36 index 2440311..dcd9f32 100644
37 --- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
38 +++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
39 @@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
40 >=dev-haskell/cabal-1.18.1.3
41 "
42
43 +PATCHES=("${FILESDIR}"/${P}-noxpm.patch)
44 +
45 src_prepare() {
46 default
47 # xmobar is an idle multithreaded program