[arch-commits] Commit in haskell-shakespeare/trunk (PKGBUILD issue201.patch)
Felix Yan
felixonmars at archlinux.org
Mon Jan 2 08:45:30 UTC 2017
Date: Monday, January 2, 2017 @ 08:45:29
Author: felixonmars
Revision: 204196
upgpkg: haskell-shakespeare 2.0.12.1-1
rebuild with shakespeare-2.0.12.1
Modified:
haskell-shakespeare/trunk/PKGBUILD
Deleted:
haskell-shakespeare/trunk/issue201.patch
----------------+
PKGBUILD | 17 ++++-------------
issue201.patch | 47 -----------------------------------------------
2 files changed, 4 insertions(+), 60 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-02 08:42:12 UTC (rev 204195)
+++ PKGBUILD 2017-01-02 08:45:29 UTC (rev 204196)
@@ -4,8 +4,8 @@
_hkgname=shakespeare
pkgname=haskell-shakespeare
-pkgver=2.0.12
-pkgrel=3
+pkgver=2.0.12.1
+pkgrel=1
pkgdesc="A toolkit for making compile-time interpolated templates"
url="http://www.yesodweb.com/book/shakespearean-templates"
license=("MIT")
@@ -13,18 +13,9 @@
depends=("ghc=8.0.1" "haskell-aeson" "haskell-blaze-html" "haskell-blaze-markup"
"haskell-exceptions" "haskell-parsec" "haskell-scientific" "haskell-text"
"haskell-unordered-containers" "haskell-vector")
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
- issue201.patch)
-sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91'
- '01d6550508d2651cf5d7fdceaa929a6749ab1340977dbf3a0462325eb5a317c3')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha256sums=('057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac')
-prepare() {
- cd "${srcdir}/${_hkgname}-${pkgver}"
- # https://github.com/yesodweb/shakespeare/pull/201
- patch -p1 -i ../issue201.patch
-}
-
-
build() {
cd "${srcdir}/${_hkgname}-${pkgver}"
Deleted: issue201.patch
===================================================================
--- issue201.patch 2017-01-02 08:42:12 UTC (rev 204195)
+++ issue201.patch 2017-01-02 08:45:29 UTC (rev 204196)
@@ -1,47 +0,0 @@
-From 81875f9409cb306ec518d61812a6f3f075e16339 Mon Sep 17 00:00:00 2001
-From: Tyler Erickson <me at tylererickson.com>
-Date: Tue, 27 Dec 2016 12:09:46 -0800
-Subject: [PATCH] Fixed regression caused by previous merge
-
----
- Text/Hamlet/Parse.hs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
-index d0c9961..27b65a7 100644
---- a/Text/Hamlet/Parse.hs
-+++ b/Text/Hamlet/Parse.hs
-@@ -257,6 +257,7 @@ parseLine set = do
- case x of
- Left "#" -> case cr of
- InContent -> return (ContentRaw "#", False)
-+ NotInQuotesAttr -> return (ContentRaw "#", False)
- _ -> fail "Expected hash at end of line, got Id"
- Left str -> return (ContentRaw str, null str)
- Right deref -> return (ContentVar deref, False)
-From b43ceba3f033e1aa83c3c424a661996a3e272194 Mon Sep 17 00:00:00 2001
-From: Tyler Erickson <me at tylererickson.com>
-Date: Tue, 27 Dec 2016 12:22:44 -0800
-Subject: [PATCH] Reversed Test cases; NotInQuotes -> fail; otherwise ->
- succeed
-
----
- Text/Hamlet/Parse.hs | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
-index 27b65a7..3f77df6 100644
---- a/Text/Hamlet/Parse.hs
-+++ b/Text/Hamlet/Parse.hs
-@@ -256,9 +256,8 @@ parseLine set = do
- x <- parseHash
- case x of
- Left "#" -> case cr of
-- InContent -> return (ContentRaw "#", False)
-- NotInQuotesAttr -> return (ContentRaw "#", False)
-- _ -> fail "Expected hash at end of line, got Id"
-+ NotInQuotes -> fail "Expected hash at end of lin, got Id"
-+ _ -> return (ContentRaw "#", False)
- Left str -> return (ContentRaw str, null str)
- Right deref -> return (ContentVar deref, False)
- contentAt = do
More information about the arch-commits
mailing list