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

2022-07-05 Thread Felix Yan via arch-commits
Date: Tuesday, July 5, 2022 @ 17:44:15
  Author: felixonmars
Revision: 1244971

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1244970, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1244970, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1244970, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-07-05 17:44:15 UTC (rev 1244971)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=177
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1244970, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-07-05 17:44:15 UTC (rev 1244971)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-06-29 Thread Felix Yan via arch-commits
Date: Wednesday, June 29, 2022 @ 19:28:28
  Author: felixonmars
Revision: 1241174

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1241173, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1241173, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1241173, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-06-29 19:28:28 UTC (rev 1241174)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=176
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1241173, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-06-29 19:28:28 UTC (rev 1241174)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-06-11 Thread Felix Yan via arch-commits
Date: Saturday, June 11, 2022 @ 22:06:20
  Author: felixonmars
Revision: 1235207

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1235206, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1235206, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1235206, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-06-11 22:06:20 UTC (rev 1235207)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=175
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1235206, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-06-11 22:06:20 UTC (rev 1235207)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-06-10 Thread Felix Yan via arch-commits
Date: Friday, June 10, 2022 @ 18:09:12
  Author: felixonmars
Revision: 1231191

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1231190, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1231190, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1231190, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-06-10 18:09:12 UTC (rev 1231191)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=174
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1231190, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-06-10 18:09:12 UTC (rev 1231191)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-06-05 Thread Felix Yan via arch-commits
Date: Sunday, June 5, 2022 @ 18:16:06
  Author: felixonmars
Revision: 1223756

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1223755, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1223755, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1223755, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-06-05 18:16:06 UTC (rev 1223756)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=173
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1223755, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-06-05 18:16:06 UTC (rev 1223756)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-06-03 Thread Felix Yan via arch-commits
Date: Friday, June 3, 2022 @ 09:14:08
  Author: felixonmars
Revision: 1219739

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1219738, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1219738, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1219738, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-06-03 09:14:08 UTC (rev 1219739)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=172
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1219738, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-06-03 09:14:08 UTC (rev 1219739)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-05-30 Thread Felix Yan via arch-commits
Date: Monday, May 30, 2022 @ 10:12:23
  Author: felixonmars
Revision: 1215636

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1215635, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1215635, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1215635, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-05-30 10:12:23 UTC (rev 1215636)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=171
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1215635, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-05-30 10:12:23 UTC (rev 1215636)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-05-28 Thread Felix Yan via arch-commits
Date: Saturday, May 28, 2022 @ 15:51:12
  Author: felixonmars
Revision: 1211972

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1211971, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1211971, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1211971, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-05-28 15:51:12 UTC (rev 1211972)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=170
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1211971, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-05-28 15:51:12 UTC (rev 1211972)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-05-14 Thread Felix Yan via arch-commits
Date: Saturday, May 14, 2022 @ 13:23:02
  Author: felixonmars
Revision: 1204509

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1204508, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1204508, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1204508, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-05-14 13:23:02 UTC (rev 1204509)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=169
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1204508, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-05-14 13:23:02 UTC (rev 1204509)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-05-13 Thread Felix Yan via arch-commits
Date: Friday, May 13, 2022 @ 08:26:39
  Author: felixonmars
Revision: 1201009

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1201008, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1201008, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1201008, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-05-13 08:26:39 UTC (rev 1201009)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=167
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1201008, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-05-13 08:26:39 UTC (rev 1201009)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-05-04 Thread Felix Yan via arch-commits
Date: Wednesday, May 4, 2022 @ 12:17:21
  Author: felixonmars
Revision: 1193571

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1193570, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1193570, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1193570, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-05-04 12:17:21 UTC (rev 1193571)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=166
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1193570, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-05-04 12:17:21 UTC (rev 1193571)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-04-23 Thread Felix Yan via arch-commits
Date: Saturday, April 23, 2022 @ 21:10:17
  Author: felixonmars
Revision: 1188569

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1188568, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1188568, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1188568, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-04-23 21:10:17 UTC (rev 1188569)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=165
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1188568, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-04-23 21:10:17 UTC (rev 1188569)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-04-09 Thread Felix Yan via arch-commits
Date: Sunday, April 10, 2022 @ 00:41:04
  Author: felixonmars
Revision: 1183975

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1183974, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1183974, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1183974, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-04-10 00:41:04 UTC (rev 1183975)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=164
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1183974, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-04-10 00:41:04 UTC (rev 1183975)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-31 Thread Felix Yan via arch-commits
Date: Friday, April 1, 2022 @ 04:26:16
  Author: felixonmars
Revision: 1178787

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1178786, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1178786, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1178786, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-04-01 04:26:16 UTC (rev 1178787)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=163
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1178786, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-04-01 04:26:16 UTC (rev 1178787)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-23 Thread Felix Yan via arch-commits
Date: Thursday, March 24, 2022 @ 01:02:30
  Author: felixonmars
Revision: 1172946

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1172945, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1172945, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1172945, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-24 01:02:30 UTC (rev 1172946)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=162
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1172945, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-24 01:02:30 UTC (rev 1172946)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-21 Thread Felix Yan via arch-commits
Date: Monday, March 21, 2022 @ 17:59:21
  Author: felixonmars
Revision: 1167795

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1167794, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1167794, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1167794, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-21 17:59:21 UTC (rev 1167795)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=161
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1167794, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-21 17:59:21 UTC (rev 1167795)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-20 Thread Felix Yan via arch-commits
Date: Sunday, March 20, 2022 @ 22:23:22
  Author: felixonmars
Revision: 1166336

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1166335, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1166335, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1166335, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-20 22:23:22 UTC (rev 1166336)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=160
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1166335, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-20 22:23:22 UTC (rev 1166336)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-20 Thread Felix Yan via arch-commits
Date: Sunday, March 20, 2022 @ 17:56:50
  Author: felixonmars
Revision: 1164581

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1164580, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1164580, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1164580, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-20 17:56:50 UTC (rev 1164581)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=159
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1164580, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-20 17:56:50 UTC (rev 1164581)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-19 Thread Felix Yan via arch-commits
Date: Saturday, March 19, 2022 @ 15:09:44
  Author: felixonmars
Revision: 1161274

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1161273, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1161273, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1161273, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-19 15:09:44 UTC (rev 1161274)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=158
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1161273, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-19 15:09:44 UTC (rev 1161274)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-18 Thread Felix Yan via arch-commits
Date: Friday, March 18, 2022 @ 04:22:24
  Author: felixonmars
Revision: 1158302

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1158301, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1158301, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1158301, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-18 04:22:24 UTC (rev 1158302)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=157
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1158301, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-18 04:22:24 UTC (rev 1158302)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-16 Thread Felix Yan via arch-commits
Date: Wednesday, March 16, 2022 @ 11:08:37
  Author: felixonmars
Revision: 1155365

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1155364, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1155364, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1155364, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-16 11:08:37 UTC (rev 1155365)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=156
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1155364, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-16 11:08:37 UTC (rev 1155365)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-14 Thread Felix Yan via arch-commits
Date: Monday, March 14, 2022 @ 10:22:46
  Author: felixonmars
Revision: 1152271

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1152270, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1152270, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1152270, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-14 10:22:46 UTC (rev 1152271)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=155
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1152270, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-14 10:22:46 UTC (rev 1152271)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-10 Thread Felix Yan via arch-commits
Date: Friday, March 11, 2022 @ 07:44:09
  Author: felixonmars
Revision: 1147922

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1147921, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1147921, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1147921, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-11 07:44:09 UTC (rev 1147922)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=154
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1147921, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-11 07:44:09 UTC (rev 1147922)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-07 Thread Felix Yan via arch-commits
Date: Monday, March 7, 2022 @ 20:36:18
  Author: felixonmars
Revision: 1144980

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1144979, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1144979, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1144979, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-07 20:36:18 UTC (rev 1144980)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=153
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1144979, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-07 20:36:18 UTC (rev 1144980)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-03-03 Thread Felix Yan via arch-commits
Date: Thursday, March 3, 2022 @ 19:14:11
  Author: felixonmars
Revision: 1141039

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1141038, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1141038, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1141038, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-03-03 19:14:11 UTC (rev 1141039)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=152
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1141038, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-03-03 19:14:11 UTC (rev 1141039)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-02-19 Thread Felix Yan via arch-commits
Date: Saturday, February 19, 2022 @ 21:16:51
  Author: felixonmars
Revision: 1135012

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1135011, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1135011, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1135011, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-02-19 21:16:51 UTC (rev 1135012)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=151
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1135011, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-02-19 21:16:51 UTC (rev 1135012)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-02-07 Thread Felix Yan via arch-commits
Date: Monday, February 7, 2022 @ 17:28:31
  Author: felixonmars
Revision: 1128402

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1128401, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1128401, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1128401, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-02-07 17:28:31 UTC (rev 1128402)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=150
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1128401, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-02-07 17:28:31 UTC (rev 1128402)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-02-03 Thread Felix Yan via arch-commits
Date: Thursday, February 3, 2022 @ 23:26:10
  Author: felixonmars
Revision: 1124966

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1124965, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1124965, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1124965, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-02-03 23:26:10 UTC (rev 1124966)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=149
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1124965, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-02-03 23:26:10 UTC (rev 1124966)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-02-02 Thread Felix Yan via arch-commits
Date: Wednesday, February 2, 2022 @ 19:27:11
  Author: felixonmars
Revision: 1123129

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1123128, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1123128, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1123128, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-02-02 19:27:11 UTC (rev 1123129)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=148
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1123128, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-02-02 19:27:11 UTC (rev 1123129)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-01-27 Thread Felix Yan via arch-commits
Date: Thursday, January 27, 2022 @ 22:48:34
  Author: felixonmars
Revision: 1118007

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1118006, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1118006, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1118006, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-01-27 22:48:34 UTC (rev 1118007)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=147
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1118006, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-01-27 22:48:34 UTC (rev 1118007)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-01-24 Thread Felix Yan via arch-commits
Date: Tuesday, January 25, 2022 @ 05:26:33
  Author: felixonmars
Revision: 1115062

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1115061, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1115061, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1115061, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-01-25 05:26:33 UTC (rev 1115062)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=146
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1115061, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-01-25 05:26:33 UTC (rev 1115062)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-01-17 Thread Felix Yan via arch-commits
Date: Monday, January 17, 2022 @ 23:38:11
  Author: felixonmars
Revision: 1108413

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1108412, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1108412, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1108412, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-01-17 23:38:11 UTC (rev 1108413)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=145
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1108412, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-01-17 23:38:11 UTC (rev 1108413)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-01-11 Thread Felix Yan via arch-commits
Date: Tuesday, January 11, 2022 @ 18:33:44
  Author: felixonmars
Revision: 1100741

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1100740, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1100740, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1100740, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-01-11 18:33:44 UTC (rev 1100741)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=144
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1100740, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-01-11 18:33:44 UTC (rev 1100741)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-01-07 Thread Felix Yan via arch-commits
Date: Friday, January 7, 2022 @ 23:25:46
  Author: felixonmars
Revision: 1096586

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1096585, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1096585, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1096585, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-01-07 23:25:46 UTC (rev 1096586)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=143
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1096585, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-01-07 23:25:46 UTC (rev 1096586)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2022-01-05 Thread Felix Yan via arch-commits
Date: Thursday, January 6, 2022 @ 00:22:18
  Author: felixonmars
Revision: 1093901

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1093900, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1093900, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1093900, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2022-01-06 00:22:18 UTC (rev 1093901)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=142
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1093900, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2022-01-06 00:22:18 UTC (rev 1093901)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-12-30 Thread Felix Yan via arch-commits
Date: Friday, December 31, 2021 @ 06:40:10
  Author: felixonmars
Revision: 1089628

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1089627, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1089627, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1089627, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-12-31 06:40:10 UTC (rev 1089628)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=141
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1089627, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-12-31 06:40:10 UTC (rev 1089628)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-12-28 Thread Felix Yan via arch-commits
Date: Tuesday, December 28, 2021 @ 00:37:22
  Author: felixonmars
Revision: 1084627

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1084626, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1084626, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1084626, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-12-28 00:37:22 UTC (rev 1084627)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=140
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1084626, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-12-28 00:37:22 UTC (rev 1084627)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-12-20 Thread Felix Yan via arch-commits
Date: Monday, December 20, 2021 @ 20:05:50
  Author: felixonmars
Revision: 1080716

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1080715, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1080715, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1080715, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-12-20 20:05:50 UTC (rev 1080716)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=139
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1080715, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-12-20 20:05:50 UTC (rev 1080716)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-12-18 Thread Felix Yan via arch-commits
Date: Saturday, December 18, 2021 @ 16:57:20
  Author: felixonmars
Revision: 1077295

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1077294, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1077294, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1077294, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-12-18 16:57:20 UTC (rev 1077295)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=138
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1077294, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-12-18 16:57:20 UTC (rev 1077295)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-12-15 Thread Felix Yan via arch-commits
Date: Thursday, December 16, 2021 @ 03:10:53
  Author: felixonmars
Revision: 1073639

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1073638, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1073638, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1073638, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-12-16 03:10:53 UTC (rev 1073639)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=137
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1073638, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-12-16 03:10:53 UTC (rev 1073639)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-11-28 Thread Felix Yan via arch-commits
Date: Sunday, November 28, 2021 @ 23:22:59
  Author: felixonmars
Revision: 1055829

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1055828, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1055828, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1055828, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-11-28 23:22:59 UTC (rev 1055829)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=136
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1055828, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-11-28 23:22:59 UTC (rev 1055829)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-11-17 Thread Felix Yan via arch-commits
Date: Thursday, November 18, 2021 @ 03:42:42
  Author: felixonmars
Revision: 1051791

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1051790, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1051790, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1051790, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-11-18 03:42:42 UTC (rev 1051791)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=135
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1051790, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-11-18 03:42:42 UTC (rev 1051791)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-11-16 Thread Felix Yan via arch-commits
Date: Wednesday, November 17, 2021 @ 03:26:26
  Author: felixonmars
Revision: 1049397

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1049396, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1049396, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1049396, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-11-17 03:26:26 UTC (rev 1049397)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=134
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1049396, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-11-17 03:26:26 UTC (rev 1049397)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-11-13 Thread Felix Yan via arch-commits
Date: Saturday, November 13, 2021 @ 15:18:51
  Author: felixonmars
Revision: 1045458

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1045457, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1045457, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1045457, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-11-13 15:18:51 UTC (rev 1045458)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=133
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1045457, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-11-13 15:18:51 UTC (rev 1045458)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-11-11 Thread Felix Yan via arch-commits
Date: Friday, November 12, 2021 @ 02:21:20
  Author: felixonmars
Revision: 1042915

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1042914, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1042914, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1042914, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-11-12 02:21:20 UTC (rev 1042915)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=132
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1042914, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-11-12 02:21:20 UTC (rev 1042915)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-11-10 Thread Felix Yan via arch-commits
Date: Wednesday, November 10, 2021 @ 20:20:00
  Author: felixonmars
Revision: 1040254

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1040253, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1040253, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1040253, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-11-10 20:20:00 UTC (rev 1040254)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=131
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1040253, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-11-10 20:20:00 UTC (rev 1040254)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-10-26 Thread Felix Yan via arch-commits
Date: Tuesday, October 26, 2021 @ 18:43:49
  Author: felixonmars
Revision: 1034295

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1034294, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1034294, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1034294, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-10-26 18:43:49 UTC (rev 1034295)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=130
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1034294, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-10-26 18:43:49 UTC (rev 1034295)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-09-24 Thread Felix Yan via arch-commits
Date: Friday, September 24, 2021 @ 07:20:43
  Author: felixonmars
Revision: 1023429

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1023428, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1023428, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1023428, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-09-24 07:20:43 UTC (rev 1023429)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=129
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
--ghc-option=-fllvm \
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1023428, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-09-24 07:20:43 UTC (rev 1023429)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-09-21 Thread Felix Yan via arch-commits
Date: Tuesday, September 21, 2021 @ 19:40:23
  Author: felixonmars
Revision: 1020809

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1020808, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1020808, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1020808, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-09-21 19:40:23 UTC (rev 1020809)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=128
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1020808, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-09-21 19:40:23 UTC (rev 1020809)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-09-19 Thread Felix Yan via arch-commits
Date: Monday, September 20, 2021 @ 00:04:00
  Author: felixonmars
Revision: 1017975

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1017974, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1017974, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1017974, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-09-20 00:04:00 UTC (rev 1017975)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=127
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1017974, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-09-20 00:04:00 UTC (rev 1017975)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-08-28 Thread Felix Yan via arch-commits
Date: Sunday, August 29, 2021 @ 01:17:59
  Author: felixonmars
Revision: 1008345

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1008344, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1008344, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1008344, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-08-29 01:17:59 UTC (rev 1008345)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=126
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1008344, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-08-29 01:17:59 UTC (rev 1008345)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-08-25 Thread Felix Yan via arch-commits
Date: Thursday, August 26, 2021 @ 04:30:03
  Author: felixonmars
Revision: 1005470

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1005469, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1005469, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1005469, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-08-26 04:30:03 UTC (rev 1005470)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=125
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1005469, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-08-26 04:30:03 UTC (rev 1005470)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-08-17 Thread Felix Yan via arch-commits
Date: Tuesday, August 17, 2021 @ 16:06:50
  Author: felixonmars
Revision: 1001979

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1001978, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1001978, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1001978, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-08-17 16:06:50 UTC (rev 1001979)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=124
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1001978, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-08-17 16:06:50 UTC (rev 1001979)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-08-16 Thread Felix Yan via arch-commits
Date: Monday, August 16, 2021 @ 14:57:06
  Author: felixonmars
Revision: 1001036

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1001035, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 1001035, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
1001035, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-08-16 14:57:06 UTC (rev 1001036)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=123
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
1001035, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-08-16 14:57:06 UTC (rev 1001036)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-08-15 Thread Felix Yan via arch-commits
Date: Sunday, August 15, 2021 @ 20:54:12
  Author: felixonmars
Revision: 999311

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 999310, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 999310, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
999310, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-08-15 20:54:12 UTC (rev 999311)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=122
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
999310, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-08-15 20:54:12 UTC (rev 999311)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-08-08 Thread Felix Yan via arch-commits
Date: Sunday, August 8, 2021 @ 18:21:14
  Author: felixonmars
Revision: 995442

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 995441, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 995441, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
995441, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-08-08 18:21:14 UTC (rev 995442)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=121
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
995441, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-08-08 18:21:14 UTC (rev 995442)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-07-26 Thread Felix Yan via arch-commits
Date: Monday, July 26, 2021 @ 20:15:25
  Author: felixonmars
Revision: 985863

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 985862, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 985862, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
985862, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-07-26 20:15:25 UTC (rev 985863)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=120
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
985862, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-07-26 20:15:25 UTC (rev 985863)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-07-21 Thread Felix Yan via arch-commits
Date: Wednesday, July 21, 2021 @ 12:22:31
  Author: felixonmars
Revision: 981862

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 981861, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 981861, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
981861, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-07-21 12:22:31 UTC (rev 981862)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=119
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
981861, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-07-21 12:22:31 UTC (rev 981862)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-07-20 Thread Felix Yan via arch-commits
Date: Tuesday, July 20, 2021 @ 07:10:03
  Author: felixonmars
Revision: 979250

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 979249, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 979249, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
979249, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-07-20 07:10:03 UTC (rev 979250)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=118
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
979249, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-07-20 07:10:03 UTC (rev 979250)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-07-06 Thread Felix Yan via arch-commits
Date: Tuesday, July 6, 2021 @ 11:34:13
  Author: felixonmars
Revision: 973031

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 973030, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 973030, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
973030, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-07-06 11:34:13 UTC (rev 973031)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=117
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
973030, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-07-06 11:34:13 UTC (rev 973031)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-07-01 Thread Felix Yan via arch-commits
Date: Thursday, July 1, 2021 @ 20:25:23
  Author: felixonmars
Revision: 969748

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 969747, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 969747, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
969747, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-07-01 20:25:23 UTC (rev 969748)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=116
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
969747, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-07-01 20:25:23 UTC (rev 969748)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)



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

2021-06-20 Thread Felix Yan via arch-commits
Date: Monday, June 21, 2021 @ 03:35:02
  Author: felixonmars
Revision: 966331

archrelease: copy trunk to community-staging-x86_64

Added:
  xmonad-contrib/repos/community-staging-x86_64/
  xmonad-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 966330, xmonad-contrib/trunk/PKGBUILD)
  xmonad-contrib/repos/community-staging-x86_64/ghc9.patch
(from rev 966330, xmonad-contrib/trunk/ghc9.patch)

+
 PKGBUILD   |   45 +
 ghc9.patch |   37 +
 2 files changed, 82 insertions(+)

Copied: xmonad-contrib/repos/community-staging-x86_64/PKGBUILD (from rev 
966330, xmonad-contrib/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2021-06-21 03:35:02 UTC (rev 966331)
@@ -0,0 +1,45 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jelle van der Waa 
+# Contributor: Sergej Pupykin 
+# Contributor: Vesa Kaihlavirta 
+# Contributor: orbisvicis 
+
+pkgname=xmonad-contrib
+pkgver=0.16
+pkgrel=115
+pkgdesc='Add-ons for xmonad'
+url='https://xmonad.org/'
+arch=('x86_64')
+license=('BSD')
+depends=('ghc-libs' 'xmonad' 'sh' 'haskell-x11' 'haskell-x11-xft' 
'haskell-utf8-string' 'haskell-random'
+ 'haskell-old-time')
+makedepends=('ghc' 'uusi')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz
+ghc9.patch)
+sha512sums=('68f93ef6bcc1f2b3f5422c35a9ddcf846c75c1e9d8e6177750f4fad8dec818642e0a7159d295a381f0656c85b1f52382af1e32d577a825c4fcbdfa4c131581cc'
+
'aced6dbfa91edbbb46e6cf29593a12e73df0cd89ad66de5ab646c8e6b9a49b54c93478c3e589377a106b3bc6c5d68246aecd2d662870b33421f2c0ee70995c6c')
+
+prepare() {
+  uusi -d semigroups -u X11 ${pkgname}-${pkgver}/${pkgname}.cabal
+  patch -d ${pkgname}-${pkgver} -p1 < ghc9.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup.lhs configure -O --enable-shared 
--enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr -fuse_xft --libsubdir=\$compiler/site-local/\$pkgid 
\
+ --docdir=/usr/share/doc/${pkgname}
+  runhaskell Setup build $MAKEFLAGS
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm 744 register.sh   
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+  install -Dm 744 unregister.sh 
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+  runhaskell Setup.lhs copy --destdir="${pkgdir}"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: xmonad-contrib/repos/community-staging-x86_64/ghc9.patch (from rev 
966330, xmonad-contrib/trunk/ghc9.patch)
===
--- community-staging-x86_64/ghc9.patch (rev 0)
+++ community-staging-x86_64/ghc9.patch 2021-06-21 03:35:02 UTC (rev 966331)
@@ -0,0 +1,37 @@
+From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev 
+Date: Fri, 26 Mar 2021 05:19:31 +0300
+Subject: [PATCH] ghc-9.0.1 compatibility fixes
+
+---
+ CHANGES.md   | 2 ++
+ XMonad/Actions/GridSelect.hs | 2 +-
+ XMonad/Layout/NoBorders.hs   | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/XMonad/Actions/GridSelect.hs b/XMonad/Actions/GridSelect.hs
+index 69bb4f1b2..a0c46b880 100644
+--- a/XMonad/Actions/GridSelect.hs
 b/XMonad/Actions/GridSelect.hs
+@@ -388,7 +388,7 @@ updateElementsWithColorizer colorizer elementmap = do
+ stdHandle :: Event -> TwoD a (Maybe a) -> TwoD a (Maybe a)
+ stdHandle (ButtonEvent { ev_event_type = t, ev_x = x, ev_y = y }) 
contEventloop
+ | t == buttonRelease = do
+-s @  TwoDState { td_paneX = px, td_paneY = py,
++s@TwoDState { td_paneX = px, td_paneY = py,
+  td_gsconfig = (GSConfig ch cw _ _ _ _ _ _ _ _) } <- 
get
+ let gridX = (fi x - (px - cw) `div` 2) `div` cw
+ gridY = (fi y - (py - ch) `div` 2) `div` ch
+diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
+index 0c340e6b2..e08570cef 100644
+--- a/XMonad/Layout/NoBorders.hs
 b/XMonad/Layout/NoBorders.hs
+@@ -38,7 +38,7 @@ import   XMonad.Layout.LayoutModifier
+ import qualified XMonad.StackSetas W
+ import qualified XMonad.Util.Rectangle  as R
+ 
+-import   Data.List
++import   Data.List  hiding (singleton)
+ import   Data.Monoid
+ import qualified Data.Map   as M
+ import   Data.Function  (on)