[arch-commits] Commit in hoogle/trunk (PKGBUILD extra-1.7.10.patch)

[Felix Yan]

    Date: Saturday, October 2, 2021 @ 21:38:39
  Author: felixonmars
Revision: 1027072

upgpkg: hoogle 5.0.18.2-1

Modified:
  hoogle/trunk/PKGBUILD
Deleted:
  hoogle/trunk/extra-1.7.10.patch

--------------------+
 PKGBUILD           |   14 ++++----------
 extra-1.7.10.patch |   23 -----------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-02 20:51:59 UTC (rev 1027071)
+++ PKGBUILD	2021-10-02 21:38:39 UTC (rev 1027072)
@@ -2,8 +2,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=hoogle
-pkgver=5.0.18.1
-pkgrel=161
+pkgver=5.0.18.2
+pkgrel=1
 pkgdesc="Haskell API Search"
 url="https://www.haskell.org/hoogle/"
 license=("BSD")
@@ -17,15 +17,9 @@
          '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"
-        extra-1.7.10.patch)
-sha512sums=('00abbcf557824c604abbd5e9d27a5ca3d4a89e943888b6eef70dea46b8f786dfc851cb1c8f1531c808f4b71b34d3899258f3b009b0a38a385fc5c393a914da17'
-            '5397bcc5554b4e0a1a30947cf646bbc5f010e86113dfb0ecbe7e1024769ae85d8d7401b30306fd588f5f8103837c82978665fcba742578fef7d37deec2982f6d')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('933564b12ffc95a89610e00fc8c7b35c90ce45a732a3812b58a9173c821dcec2e44a6625fa9b8b369706ea5d6e823c075ad3266664ed6649a057356d22f824df')
 
-prepare() {
-    patch -d $pkgname-$pkgver -p1 < extra-1.7.10.patch
-}
-
 build() {
     cd $pkgname-$pkgver
 

Deleted: extra-1.7.10.patch
===================================================================
--- extra-1.7.10.patch	2021-10-02 20:51:59 UTC (rev 1027071)
+++ extra-1.7.10.patch	2021-10-02 21:38:39 UTC (rev 1027072)
@@ -1,23 +0,0 @@
-From 620da73bc474786b4addf669f17af76142e891f1 Mon Sep 17 00:00:00 2001
-From: Neil Mitchell <ndmitchell at gmail.com>
-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)