[arch-commits] Commit in xmonad-contrib/trunk (3 files)

Jelle van der Waa jelle at archlinux.org
Sun Jan 8 11:33:46 UTC 2017


    Date: Sunday, January 8, 2017 @ 11:33:45
  Author: jelle
Revision: 206087

upgpkg: xmonad-contrib 0.12-9

haskell-x11 rebuild

Added:
  xmonad-contrib/trunk/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
  xmonad-contrib/trunk/x11.patch
Modified:
  xmonad-contrib/trunk/PKGBUILD

------------------------------------------------+
 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch |   31 +++++++++++++++++++++++
 PKGBUILD                                       |   15 ++++++++---
 x11.patch                                      |   12 ++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)

Added: 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
===================================================================
--- 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch	                        (rev 0)
+++ 800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch	2017-01-08 11:33:45 UTC (rev 206087)
@@ -0,0 +1,31 @@
+From 800ae670e2927128ea4fd0a3011a4a5b029e92ef Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <me at dmwit.com>
+Date: Tue, 15 Dec 2015 07:44:36 -0800
+Subject: [PATCH] use a record pattern to be robust against additions to the
+ X11 library
+
+---
+ XMonad/Util/DebugWindow.hs | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/XMonad/Util/DebugWindow.hs b/XMonad/Util/DebugWindow.hs
+index d4f5138..283297b 100644
+--- a/XMonad/Util/DebugWindow.hs
++++ b/XMonad/Util/DebugWindow.hs
+@@ -41,7 +41,15 @@ debugWindow w =  do
+   case w' of
+     Nothing                                   ->
+       return $ "(deleted window " ++ wx ++ ")"
+-    Just (WindowAttributes x y wid ht bw m o) -> do
++    Just (WindowAttributes
++      { wa_x                 = x
++      , wa_y                 = y
++      , wa_width             = wid
++      , wa_height            = ht
++      , wa_border_width      = bw
++      , wa_map_state         = m
++      , wa_override_redirect = o
++      }) -> do
+       c' <- withDisplay $ \d ->
+             io (getWindowProperty8 d wM_CLASS w)
+       let c = case c' of

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-08 11:32:59 UTC (rev 206086)
+++ PKGBUILD	2017-01-08 11:33:45 UTC (rev 206087)
@@ -5,14 +5,21 @@
 
 pkgname=xmonad-contrib
 pkgver=0.12
-pkgrel=8
+pkgrel=9
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
 depends=('ghc=8.0.1' 'xmonad=0.12' 'sh' 'haskell-x11' 'haskell-x11-xft' 'haskell-utf8-string' 'haskell-random' 'haskell-old-time')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz" "x11.patch"
+        "800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch") # Haskell-X11 1.8 compatibility.
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/x11.patch
+  patch -Np1 -i $srcdir/800ae670e2927128ea4fd0a3011a4a5b029e92ef.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
 
@@ -36,4 +43,6 @@
 
   install -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-md5sums=('5538c34c020946016cc31b49594c7d4b')
+md5sums=('5538c34c020946016cc31b49594c7d4b'
+         '3ed821b1bb263d924511c17be518089a'
+         'c064084a9084c82e6dc362edd52f843b')

Added: x11.patch
===================================================================
--- x11.patch	                        (rev 0)
+++ x11.patch	2017-01-08 11:33:45 UTC (rev 206087)
@@ -0,0 +1,12 @@
+diff -aur xmonad-contrib-0.12/xmonad-contrib.cabal xmonad-contrib-0.12.new/xmonad-contrib.cabal
+--- xmonad-contrib-0.12/xmonad-contrib.cabal	2015-12-18 21:11:11.000000000 +0100
++++ xmonad-contrib-0.12.new/xmonad-contrib.cabal	2017-01-08 12:13:09.828927857 +0100
+@@ -64,7 +64,7 @@
+                     random,
+                     mtl >= 1 && < 3,
+                     unix,
+-                    X11>=1.6.1 && < 1.7,
++                    X11>=1.6.1 && < 1.8,
+                     xmonad>=0.12   && < 0.13,
+                     utf8-string
+ 



More information about the arch-commits mailing list