Date: Saturday, July 9, 2022 @ 22:24:58 Author: felixonmars Revision: 1249254
upgpkg: xmonad 0.17.0-1: rebuild with xmonad 0.17.0, xmonad-contrib 0.17.0 Modified: xmonad/trunk/PKGBUILD xmonad/trunk/dynamic-compilation.patch ---------------------------+ PKGBUILD | 29 ++++++++++++++--------------- dynamic-compilation.patch | 14 +++++++------- 2 files changed, 21 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-07-09 22:08:30 UTC (rev 1249253) +++ PKGBUILD 2022-07-09 22:24:58 UTC (rev 1249254) @@ -5,23 +5,20 @@ # Contributor: shild <[email protected]> pkgname=xmonad -pkgver=0.15 -pkgrel=195 +pkgver=0.17.0 +pkgrel=1 pkgdesc='Lightweight X11 tiled window manager written in Haskell' url='https://xmonad.org/' arch=('x86_64') license=('BSD') -depends=('ghc' 'haskell-x11' 'sh' 'haskell-utf8-string' 'haskell-extensible-exceptions' - 'haskell-data-default' 'haskell-setlocale') -makedepends=('gendesk' 'uusi') +depends=('ghc' 'haskell-x11' 'haskell-data-default-class' 'haskell-setlocale') +makedepends=('gendesk' 'pandoc' 'haskell-quickcheck' 'haskell-quickcheck-instances') optdepends=('xorg-xmessage: for displaying visual error messages') source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad/archive/v${pkgver}.tar.gz - $pkgname-ghc9.patch::https://github.com/xmonad/xmonad/commit/2a1a18023a15d13247148638edf29ca6bf9c3bce.patch dynamic-compilation.patch xmonad.svg) -sha512sums=('07bf61a1355548679d264e62423dfe6c4ee886aff28ac748588aa7f4f9a4f1bf2afabb1104451fa56f5a3989d79b6044f479d2804e416940e02f52f18b443996' - '9b4d20ec1bc24770981ff4848734074d75ffe474d641fa3f3e17e6507bce2aaa0684638a1778cbeea0b209d9cd06793abc8f62fbc0dad0e196f866390bb878b3' - 'abc598ebc4b55917186cd4d549fc970f53905f820d394ada9a092c08d8833050ad18b23e2f4fd7f281487da2db5b0ca058600e995ac97b18d3be4c62071562d6' +sha512sums=('87b26b3f6ef3534a5cbb06f6e61b258ecbae0935ae695b39fe574630ccefb97d5e7fa59bf97be34d8009214474c79d0c380d18f67c1fdab2ce4c80378688287e' + 'ddfc766627459c804c3d675250132d0d9b34db0d1c6191ec91717801f6ee495521303d3f0f288cc162abf9d141ee3d276167b6540fa6c806340b90f9229bb377' '31f0ceb724a9931aeda75ab706c8908b5d8341af4df50ab1d749814baacb748ad3622601cd99ac03bf936b698fcd854b23d1541e1772306e3337a13a79b110b6') prepare() { @@ -28,8 +25,6 @@ gendesk --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/dynamic-compilation.patch" - patch -p1 -i "${srcdir}/$pkgname-ghc9.patch" - uusi -u X11 ${pkgname}.cabal } build() { @@ -42,7 +37,7 @@ --prefix=/usr \ --dynlibdir=/usr/lib \ --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname \ - --datasubdir="${pkgname}" \ + --enable-tests \ --libsubdir=\$compiler/site-local/\$pkgid --ghc-option=-fllvm \ --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \ --ghc-option='-pie' @@ -51,8 +46,15 @@ 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 + + make -C man } +check() { + cd ${pkgname}-${pkgver} + runhaskell Setup test --show-details=direct +} + package() { cd ${pkgname}-${pkgver} @@ -61,9 +63,6 @@ runhaskell Setup.lhs copy --destdir="${pkgdir}" - # Requires pandoc, regex-posix, Pretty and cabal - #runhaskell util/GenerateManpage.hs - install -Dm 644 man/xmonad.1 -t "${pkgdir}/usr/share/man/man1" install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/xmonad" install -Dm 644 "$srcdir/xmonad.svg" -t "${pkgdir}/usr/share/pixmaps" Modified: dynamic-compilation.patch =================================================================== --- dynamic-compilation.patch 2022-07-09 22:08:30 UTC (rev 1249253) +++ dynamic-compilation.patch 2022-07-09 22:24:58 UTC (rev 1249254) @@ -2,10 +2,10 @@ --- xmonad-0.13.orig/src/XMonad/Core.hs 2017-06-23 17:13:06.154600231 +0300 +++ xmonad-0.13/src/XMonad/Core.hs 2017-06-23 17:13:51.021867441 +0300 @@ -626,6 +626,7 @@ - , "-ilib" - , "-fforce-recomp" - , "-main-is", "main" -+ , "-dynamic" - , "-v0" - , "-o", bin - ] (Just dir) Nothing Nothing Nothing (Just errHandle) + , "-ilib" + , "-fforce-recomp" + , "-main-is", "main" ++ , "-dynamic" + , "-v0" + , "-outputdir", buildDirName dirs + , "-o", binFileName dirs
