[arch-commits] Commit in haskell-shakespeare/trunk (PKGBUILD issue201.patch)

[Felix Yan]

    Date: Wednesday, December 28, 2016 @ 02:28:28
  Author: felixonmars
Revision: 203127

upgpkg: haskell-shakespeare 2.0.12-2

add a patch to fix a parser regression

Added:
  haskell-shakespeare/trunk/issue201.patch
Modified:
  haskell-shakespeare/trunk/PKGBUILD

----------------+
 PKGBUILD       |   15 ++++++++++++---
 issue201.patch |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-28 02:27:55 UTC (rev 203126)
+++ PKGBUILD	2016-12-28 02:28:28 UTC (rev 203127)
@@ -5,7 +5,7 @@
 _hkgname=shakespeare
 pkgname=haskell-shakespeare
 pkgver=2.0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A toolkit for making compile-time interpolated templates"
 url="http://www.yesodweb.com/book/shakespearean-templates"
 license=("MIT")
@@ -13,9 +13,18 @@
 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")
-sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        issue201.patch)
+sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91'
+            '7f5fdcd7afe63168df07ad59c4c191c76b341e811d1952b4da089763a165c6ff')
 
+prepare() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    # https://github.com/yesodweb/shakespeare/pull/201
+    patch -p1 -i ../issue201.patch
+}
+
+
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
     

Added: issue201.patch
===================================================================
--- issue201.patch	                        (rev 0)
+++ issue201.patch	2016-12-28 02:28:28 UTC (rev 203127)
@@ -0,0 +1,21 @@
+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)