summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Markus Rothe <mrothe@exherbo.org> 2017-04-15 15:10:58 +0200
committerAvatar Markus Rothe <mrothe@exherbo.org> 2017-04-15 15:12:05 +0200
commit2afb48a70cc4bd38b8b400dd55d73de62aa47356 (patch)
treee0269eed45e6ac97d3a282f7718084c4558e6dfa
parentd9ad87e3bcc5f6b72d1831684c8b5b5f886dbbf8 (diff)
downloadhaskell-2afb48a70cc4bd38b8b400dd55d73de62aa47356.tar.gz
haskell-2afb48a70cc4bd38b8b400dd55d73de62aa47356.tar.xz
xmonad-extras: xmonad 0.13 compatibility
-rw-r--r--packages/x11-plugins/xmonad-extras/files/xmonad-extras-0.12.1-xmonad-0.13.patch33
-rw-r--r--packages/x11-plugins/xmonad-extras/xmonad-extras-0.12.1-r2.exheres-0 (renamed from packages/x11-plugins/xmonad-extras/xmonad-extras-0.12.1-r1.exheres-0)8
2 files changed, 39 insertions, 2 deletions
diff --git a/packages/x11-plugins/xmonad-extras/files/xmonad-extras-0.12.1-xmonad-0.13.patch b/packages/x11-plugins/xmonad-extras/files/xmonad-extras-0.12.1-xmonad-0.13.patch
new file mode 100644
index 0000000..0c7e37f
--- /dev/null
+++ b/packages/x11-plugins/xmonad-extras/files/xmonad-extras-0.12.1-xmonad-0.13.patch
@@ -0,0 +1,33 @@
+Source: https://github.com/xmonad/xmonad-extras/commit/2bf3fedeb8602637cc388dff0e67e69eb0cbf329
+Upstream: yes
+Reason: compatibility with xmonad 0.13
+
+From 2bf3fedeb8602637cc388dff0e67e69eb0cbf329 Mon Sep 17 00:00:00 2001
+From: kpbochenek <kpbochenek@gmail.com>
+Date: Mon, 20 Feb 2017 12:38:13 +0100
+Subject: [PATCH] xmonad 0.13 compatibility
+
+---
+ xmonad-extras.cabal | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xmonad-extras.cabal b/xmonad-extras.cabal
+index df80cc6..369cf40 100644
+--- a/xmonad-extras.cabal
++++ b/xmonad-extras.cabal
+@@ -1,5 +1,5 @@
+ name: xmonad-extras
+-version: 0.12.1
++version: 0.13.0
+ homepage: http://projects.haskell.org/xmonad-extras
+ synopsis: Third party extensions for xmonad with wacky dependencies
+ description: Various modules for xmonad that cannot be added to xmonad-contrib
+@@ -44,7 +44,7 @@ library
+ else
+ build-depends: base < 3
+
+- build-depends: mtl, unix, X11>=1.4.3, xmonad>=0.10 && <0.13, xmonad-contrib>=0.10 && <0.13
++ build-depends: mtl, unix, X11>=1.4.3, xmonad>=0.10 && <0.14, xmonad-contrib>=0.10 && <0.14
+
+ if true
+ ghc-options: -fwarn-tabs -Wall
diff --git a/packages/x11-plugins/xmonad-extras/xmonad-extras-0.12.1-r1.exheres-0 b/packages/x11-plugins/xmonad-extras/xmonad-extras-0.12.1-r2.exheres-0
index 528a317..40618a9 100644
--- a/packages/x11-plugins/xmonad-extras/xmonad-extras-0.12.1-r1.exheres-0
+++ b/packages/x11-plugins/xmonad-extras/xmonad-extras-0.12.1-r2.exheres-0
@@ -24,8 +24,8 @@ DEPENDENCIES="
dev-haskell/random
dev-haskell/split[>=0.1&<0.3]
dev-haskell/unix
- x11-plugins/xmonad-contrib[>=0.10&<0.13]
- x11-wm/xmonad[>=0.10&<0.13]
+ x11-plugins/xmonad-contrib[>=0.10&<0.14]
+ x11-wm/xmonad[>=0.10&<0.14]
")
"
@@ -36,3 +36,7 @@ CABAL_SRC_CONFIGURE_PARAMS=(
"--flags=-with_mpd"
)
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-xmonad-0.13.patch
+)
+