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

[Felix Yan]

    Date: Monday, May 21, 2018 @ 14:15:09
  Author: felixonmars
Revision: 326170

upgpkg: hoogle 5.0.17.3-1

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

-------------------+
 PKGBUILD          |   17 +++++------------
 extra-1.6.6.patch |   42 ------------------------------------------
 2 files changed, 5 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-21 14:10:36 UTC (rev 326169)
+++ PKGBUILD	2018-05-21 14:15:09 UTC (rev 326170)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=hoogle
-pkgver=5.0.16
-pkgrel=69
+pkgver=5.0.17.3
+pkgrel=1
 pkgdesc="Haskell API Search"
 url="http://www.haskell.org/hoogle/"
 license=("custom:BSD3")
@@ -14,19 +14,12 @@
          'haskell-http-conduit' 'haskell-http-types' 'haskell-js-flot' 'haskell-js-jquery'
          'haskell-mmap' 'haskell-network' 'haskell-network-uri' 'haskell-old-locale'
          'haskell-process-extras' 'haskell-resourcet' 'haskell-storable-tuple' 'haskell-tar'
-         'haskell-text' 'haskell-uniplate' 'haskell-utf8-string' 'haskell-vector' 'haskell-wai'
+         '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.6.6.patch)
-sha512sums=('14b0d6290927234be7e6e6548529fef61d44972a21b9ac22815325214241095b61d60e3b95b6f20a5d40bf9386beff4036942a2c61925c745b767f2525b915c9'
-            'be1cac2d0833e8fff846af9db097dbef23d97d69531b592fc33873813b0ec7c0c58a268f3b26ec4b079e474b9c0f7782355272d955eda54bf1aee77d294d39b2')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('b8113e9dc6f44fbf684edfe6134eb44d55b1ef43afc3cb2051920daaec3e108df6209cfe822a8eeff884360c9b9415f2ab8273e7681e6bbcc1b9c77490370195')
 
-prepare() {
-    cd $pkgname-$pkgver
-    patch -p1 -i ../extra-1.6.6.patch
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: extra-1.6.6.patch
===================================================================
--- extra-1.6.6.patch	2018-05-21 14:10:36 UTC (rev 326169)
+++ extra-1.6.6.patch	2018-05-21 14:15:09 UTC (rev 326170)
@@ -1,42 +0,0 @@
-From b3ef6ca4f59fb5854e42fe844c9593f6832ebd25 Mon Sep 17 00:00:00 2001
-From: Neil Mitchell <ndmitchell at gmail.com>
-Date: Fri, 13 Apr 2018 19:06:26 +0100
-Subject: [PATCH] Require extra-1.6.6, so I can use escape/unescape HTML
-
----
- CHANGES.txt         |  1 +
- hoogle.cabal        |  2 +-
- src/General/Util.hs | 20 --------------------
- 3 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/src/General/Util.hs b/src/General/Util.hs
-index 2f51c644..abfe89ec 100755
---- a/src/General/Util.hs
-+++ b/src/General/Util.hs
-@@ -200,26 +200,6 @@ tarballReadFiles file = f . Tar.read . GZip.decompress <$> LBS.readFile file
-         f (Fail e) = error $ "tarballReadFiles on " ++ file ++ ", " ++ show e
- 
- 
---- | Take a piece of text and escape all the HTML special bits
--escapeHTML :: String -> String
--escapeHTML = concatMap f
--    where
--        f '<' = "<"
--        f '>' = ">"
--        f '&' = "&"
--        f '\"' = """
--        f  x  = [x]
--
---- | Only guarantees to be the inverse of escapeHTML
--unescapeHTML :: String -> String
--unescapeHTML ('&':xs)
--    | Just xs <- stripPrefix "lt;" xs = '<' : unescapeHTML xs
--    | Just xs <- stripPrefix "gt;" xs = '>' : unescapeHTML xs
--    | Just xs <- stripPrefix "amp;" xs = '&' : unescapeHTML xs
--    | Just xs <- stripPrefix "quot;" xs = '\"' : unescapeHTML xs
--unescapeHTML (x:xs) = x : unescapeHTML xs
--unescapeHTML [] = []
--
- innerTextHTML :: String -> String
- innerTextHTML ('<':xs) = innerTextHTML $ drop 1 $ dropWhile (/= '>') xs
- innerTextHTML (x:xs) = x : innerTextHTML xs