x11-misc/xmobar: in USE=-xmp don't use XPMFile in preprocessor, bug #601262

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/601262

Package-Manager: portage-2.3.2

diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
new file mode 100644 (file)
index 0000000..8f4da6b
--- /dev/null
+++ b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
@@ -0,0 +1,9 @@
+diff --git a/xmobar.cabal b/xmobar.cabal
+index f6a6dae..8a17579 100644
+--- a/xmobar.cabal
++++ b/xmobar.cabal
+@@ -89,3 +89,3 @@ executable xmobar
+       Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize,
+-      XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal,
++      XUtil, StatFS, Runnable, ColorCache, Window, Signal,
+       Environment,

diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 2440311da365cd9e013e20d77be3ceec14d6c42c..dcd9f32aa67fc7a173bd952c2abf1d54f9ce35e7 100644 (file)
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
        >=dev-haskell/cabal-1.18.1.3
 "
 
+PATCHES=("${FILESDIR}"/${P}-noxpm.patch)
+
 src_prepare() {
        default
        # xmobar is an idle multithreaded program