Date: Thursday, September 9, 2021 @ 19:56:15 Author: felixonmars Revision: 1013132
upgpkg: hoogle 5.0.18.1-150: rebuild with extra 1.7.10 Added: hoogle/trunk/extra-1.7.10.patch Modified: hoogle/trunk/PKGBUILD --------------------+ PKGBUILD | 16 +++++++++++----- extra-1.7.10.patch | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-09 19:41:38 UTC (rev 1013131) +++ PKGBUILD 2021-09-09 19:56:15 UTC (rev 1013132) @@ -3,7 +3,7 @@ pkgname=hoogle pkgver=5.0.18.1 -pkgrel=149 +pkgrel=150 pkgdesc="Haskell API Search" url="https://www.haskell.org/hoogle/"; license=("BSD") @@ -17,11 +17,17 @@ 'haskell-uniplate' 'haskell-utf8-string' 'haskell-vector' 'haskell-wai' 'haskell-wai-logger' 'haskell-warp' 'haskell-warp-tls' 'haskell-zlib') makedepends=('ghc') -source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";) -sha512sums=('00abbcf557824c604abbd5e9d27a5ca3d4a89e943888b6eef70dea46b8f786dfc851cb1c8f1531c808f4b71b34d3899258f3b009b0a38a385fc5c393a914da17') +source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"; + extra-1.7.10.patch) +sha512sums=('00abbcf557824c604abbd5e9d27a5ca3d4a89e943888b6eef70dea46b8f786dfc851cb1c8f1531c808f4b71b34d3899258f3b009b0a38a385fc5c393a914da17' + '5397bcc5554b4e0a1a30947cf646bbc5f010e86113dfb0ecbe7e1024769ae85d8d7401b30306fd588f5f8103837c82978665fcba742578fef7d37deec2982f6d') +prepare() { + patch -d $pkgname-$pkgver -p1 < extra-1.7.10.patch +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" \ @@ -35,7 +41,7 @@ } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh" install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh" Added: extra-1.7.10.patch =================================================================== --- extra-1.7.10.patch (rev 0) +++ extra-1.7.10.patch 2021-09-09 19:56:15 UTC (rev 1013132) @@ -0,0 +1,23 @@ +From 620da73bc474786b4addf669f17af76142e891f1 Mon Sep 17 00:00:00 2001 +From: Neil Mitchell <[email protected]> +Date: Mon, 30 Aug 2021 21:25:36 +0100 +Subject: [PATCH] Qualify !? so it doesn't conflict with extra + +--- + CHANGES.txt | 1 + + src/Action/Server.hs | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Action/Server.hs b/src/Action/Server.hs +index f05dbc69..935cc313 100644 +--- a/src/Action/Server.hs ++++ b/src/Action/Server.hs +@@ -163,7 +163,7 @@ replyServer log local links haddock store cdn home htmlDir scope Input{..} = cas + html = templateMarkup + text = templateMarkup . H.string + +- tagOptions sel = mconcat [H.option !? (x `elem` sel, H.selected "selected") $ H.string x | x <- completionTags store] ++ tagOptions sel = mconcat [H.option Text.Blaze.!? (x `elem` sel, H.selected "selected") $ H.string x | x <- completionTags store] + params = + [("cdn", text cdn) + ,("home", text home)
