[arch-commits] Commit in xmonad-contrib/trunk (PKGBUILD ghc9.patch)

[Felix Yan]

    Date: Saturday, July 9, 2022 @ 22:27:37
  Author: felixonmars
Revision: 1249256

upgpkg: xmonad-contrib 0.17.0-1: rebuild with xmonad 0.17.0, xmonad-contrib 0.17.0

Modified:
  xmonad-contrib/trunk/PKGBUILD
Deleted:
  xmonad-contrib/trunk/ghc9.patch

------------+
 PKGBUILD   |   29 +++++++++++++----------------
 ghc9.patch |   37 -------------------------------------
 2 files changed, 13 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-09 22:25:16 UTC (rev 1249255)
+++ PKGBUILD	2022-07-09 22:27:37 UTC (rev 1249256)
@@ -5,30 +5,22 @@
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
-pkgver=0.16
-pkgrel=177
-pkgdesc='Add-ons for xmonad'
+pkgver=0.17.0
+pkgrel=1
+pkgdesc='Community-maintained extensions extensions 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')
+depends=('ghc-libs' 'xmonad' 'haskell-x11' 'haskell-x11-xft' 'haskell-utf8-string' 'haskell-random')
+makedepends=('ghc' 'haskell-quickcheck' 'haskell-hspec')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad-contrib/archive/v${pkgver}.tar.gz)
+sha512sums=('1676d96acb6a7474457c44ee52bb792b23a233c897757ffdb0448a3bed16f71851e4d7f0c3d7bfd6ae48a4cc617fee5ceecea33260f454caf9189a0b785cca57')
 
-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
+             --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname --enable-tests
   runhaskell Setup build $MAKEFLAGS
   runhaskell Setup register --gen-script
   runhaskell Setup unregister --gen-script
@@ -36,6 +28,11 @@
   sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
+check() {
+  cd ${pkgname}-${pkgver}
+  runhaskell Setup test --show-details=direct
+}
+
 package() {
   cd ${pkgname}-${pkgver}
   install -Dm 744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"

Deleted: ghc9.patch
===================================================================
--- ghc9.patch	2022-07-09 22:25:16 UTC (rev 1249255)
+++ ghc9.patch	2022-07-09 22:27:37 UTC (rev 1249256)
@@ -1,37 +0,0 @@
-From 1033818631a5007aa53a8bba56c5b7bd7c25af3a Mon Sep 17 00:00:00 2001
-From: Sergey Alirzaev <zl29ah at gmail.com>
-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 at 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.StackSet                as 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)