[arch-commits] Commit in darcs/trunk (PKGBUILD sandi-0.4.patch)

[Felix Yan]

    Date: Tuesday, September 6, 2016 @ 13:59:41
  Author: felixonmars
Revision: 188754

upgpkg: darcs 2.12.1-1

rebuild with JuicyPixels-3.2.8, cpphs-1.20.2, darcs-2.12.1, dlist-0.8.0.2, unix-time-0.3.7, wai-extra-3.0.17, wai-websockets-3.0.1.1, yaml-0.8.18.5

Modified:
  darcs/trunk/PKGBUILD
Deleted:
  darcs/trunk/sandi-0.4.patch

-----------------+
 PKGBUILD        |   20 ++++++--------------
 sandi-0.4.patch |   13 -------------
 2 files changed, 6 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-06 13:46:22 UTC (rev 188753)
+++ PKGBUILD	2016-09-06 13:59:41 UTC (rev 188754)
@@ -3,8 +3,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=darcs
-pkgver=2.12.0
-pkgrel=16
+pkgver=2.12.1
+pkgrel=1
 pkgdesc="A distributed, interactive, smart revision control system"
 url="http://darcs.net"
 license=("GPL")
@@ -18,23 +18,15 @@
              "haskell-regex-compat-tdfa" "haskell-tar" "haskell-text"
              "haskell-transformers-compat" "haskell-unix-compat" "haskell-utf8-string"
              "haskell-vector" "haskell-zip-archive" "haskell-zlib")
-source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        sandi-0.4.patch)
-sha256sums=('17318d1b49ca4b1aa00a4bffc2ab30a448e7440ce1945eed9bf382d77582308d'
-            'f144bf4ce7ee9f718e086267a936e2b113f9eb08c23688cbedb40276538562d3')
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('017034cf23427a59d0a7576ea9543fc493500f378cdef4654184e7aea4ed504f')
 
-prepare() {
-    sed -i 's/sandi        >= 0.2 && < 0.4,/sandi        >= 0.2 \&\& < 0.5,/' $pkgname-$pkgver/$pkgname.cabal
-    (cd $pkgname-$pkgver && patch -p1 -i ../sandi-0.4.patch)
-}
-
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     
     runhaskell Setup configure -O --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
-        -fcurl -fpkgconfig -fhttp -f-static -fterminfo -fthreaded -fexecutable \
-        -f-rts -foptimize -f-warn-as-error \
-        -f-libiconv -fuse-time-1point5 -fnetwork-uri
+        -fcurl -fpkgconfig -f-static -fterminfo -fthreaded -fexecutable \
+        -f-rts -foptimize -f-warn-as-error -f-libiconv -fnetwork-uri
     runhaskell Setup build
 }
 

Deleted: sandi-0.4.patch
===================================================================
--- sandi-0.4.patch	2016-09-06 13:46:22 UTC (rev 188753)
+++ sandi-0.4.patch	2016-09-06 13:59:41 UTC (rev 188754)
@@ -1,13 +0,0 @@
---- a/src/Darcs/Util/Hash.hs	2016-06-09 11:45:13.303203462 +0800
-+++ b/src/Darcs/Util/Hash.hs	2016-06-09 11:45:29.330047632 +0800
-@@ -27,8 +27,8 @@
- base16 :: BS.ByteString -> BS.ByteString
- debase16 :: BS.ByteString -> Maybe BS.ByteString
- 
--base16 = BS8.map toLower . B16.b16_enc
--debase16 bs = case B16.b16_dec $ BS8.map toUpper bs of
-+base16 = BS8.map toLower . B16.b16Enc
-+debase16 bs = case B16.b16Dec $ BS8.map toUpper bs of
-                 Right (s, _) -> Just s
-                 Left _ -> Nothing
-