diff --git a/README.md b/README.md index 273e1e5..04c5efa 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,12 @@ Server = https://git.ignuranza.net/alecs/cringe/raw/branch/master/$arch ``` Pacchetti al momento disponibili: + - figa - figasm - honusbot-cli - multimc-free +- xmonad-git +- xmonad-contrib-git Potranno levare ```figa``` dalla AUR ma non potranno levare AUR dalla ```figa``` diff --git a/pkgbuilds/xmonad-contrib-git/PKGBUILD b/pkgbuilds/xmonad-contrib-git/PKGBUILD new file mode 100644 index 0000000..1156f8e --- /dev/null +++ b/pkgbuilds/xmonad-contrib-git/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Øyvind 'Mr.Elendig' Heggstad +# Contributor:: Sergej Pupykin +# Contributor:: Vesa Kaihlavirta +# Contributor: orbisvicis +# Contributor: alecs + +pkgname=xmonad-contrib-git +pkgver=v0.16.r575.ge9334b52 +pkgrel=1 +pkgdesc="Add-ons for xmonad" +arch=('x86_64') +url="http://xmonad.org/" +license=('BSD') +depends=('ghc' + 'xmonad-git' + 'sh' + 'haskell-x11>=1.10' + 'haskell-x11-xft>=0.2' + 'haskell-utf8-string' + 'haskell-random' + 'haskell-old-time') +makedepends=('git') +conflicts=('xmonad-contrib') +provides=('xmonad-contrib') +source=('git://github.com/xmonad/xmonad-contrib') +md5sums=('SKIP') + +pkgver() { + cd "${pkgname/-git}" + sed -i -e '/semigroups/d' -e 's/utf8-string,/utf8-string/' ${pkgname/-git}.cabal + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +build() { + cd "${pkgname/-git}" + 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 + 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/-git}" + install -Dm 744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname/-git}.sh" + install -Dm 744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname/-git}.sh" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/pkgbuilds/xmonad-git/PKGBUILD b/pkgbuilds/xmonad-git/PKGBUILD new file mode 100644 index 0000000..9a75aa9 --- /dev/null +++ b/pkgbuilds/xmonad-git/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Øyvind 'Mr.Elendig' Heggstad +# Contributor: Sergej Pupykin +# Contributor: Vesa Kaihlavirta +# Contributor: shild +# Contributor: alecs + +pkgname=xmonad-git +pkgver=v0.15.r118.gb14b3ff +pkgrel=1 +pkgdesc="Lightweight X11 tiled window manager written in Haskell" +arch=('x86_64') +url="http://xmonad.org/" +license=('BSD') +depends=('ghc' + 'sh' + 'gmp' + 'haskell-x11>=1.10' + 'haskell-mtl' + 'haskell-utf8-string>=0.3' 'haskell-utf8-string<1.1' + 'haskell-extensible-exceptions' + 'haskell-setlocale') +makedepends=('gendesk' 'git') +optdepends=('xorg-xmessage: for displaying visual error messages') +conflicts=('xmonad') +provides=('xmonad') +source=('git://github.com/xmonad/xmonad.git' + 'dynamic-compilation.patch' + 'xmonad.svg') +md5sums=('SKIP' + 'b2e645bb5aa91c64f85004806e049b8d' + '72bfa5e62e4e44fe7fa59b6a7593d993') +options=('staticlibs') + +pkgver() { + cd "${pkgname/-git}" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + gendesk --pkgname "${pkgname/-git}" --pkgdesc "$pkgdesc" + cd "$srcdir"/${pkgname/-git} + patch -p1 -i "${srcdir}/dynamic-compilation.patch" +} + +build() { + cd "$srcdir"/${pkgname/-git} + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ + --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \ + --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + 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 "$srcdir"/${pkgname/-git} + + install -Dm 744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname/-git}.sh" + install -Dm 744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname/-git}.sh" + + 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" + install -Dm 644 "$srcdir/xmonad.desktop" -t "${pkgdir}/usr/share/xsessions" +} diff --git a/pkgbuilds/xmonad-git/dynamic-compilation.patch b/pkgbuilds/xmonad-git/dynamic-compilation.patch new file mode 100644 index 0000000..6a28845 --- /dev/null +++ b/pkgbuilds/xmonad-git/dynamic-compilation.patch @@ -0,0 +1,11 @@ +diff -ura xmonad-0.13.orig/src/XMonad/Core.hs xmonad-0.13/src/XMonad/Core.hs +--- 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) diff --git a/pkgbuilds/xmonad-git/xmonad.svg b/pkgbuilds/xmonad-git/xmonad.svg new file mode 100644 index 0000000..5fc8842 --- /dev/null +++ b/pkgbuilds/xmonad-git/xmonad.svg @@ -0,0 +1,77 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/x86_64/cringe.db b/x86_64/cringe.db index 6c916d4..aaac904 100644 Binary files a/x86_64/cringe.db and b/x86_64/cringe.db differ diff --git a/x86_64/cringe.files b/x86_64/cringe.files index d63d326..7827058 100644 Binary files a/x86_64/cringe.files and b/x86_64/cringe.files differ diff --git a/x86_64/xmonad-contrib-git-v0.16.r575.ge9334b52-1-x86_64.pkg.tar.zst b/x86_64/xmonad-contrib-git-v0.16.r575.ge9334b52-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..dded027 Binary files /dev/null and b/x86_64/xmonad-contrib-git-v0.16.r575.ge9334b52-1-x86_64.pkg.tar.zst differ diff --git a/x86_64/xmonad-git-v0.15.r118.gb14b3ff-1-x86_64.pkg.tar.zst b/x86_64/xmonad-git-v0.15.r118.gb14b3ff-1-x86_64.pkg.tar.zst new file mode 100644 index 0000000..4fb891e Binary files /dev/null and b/x86_64/xmonad-git-v0.15.r118.gb14b3ff-1-x86_64.pkg.tar.zst differ