[arch-commits] Commit in cmark/repos/extra-x86_64 (3 files)

[Jelle van der Waa]

    Date: Sunday, May 31, 2020 @ 15:59:10
  Author: jelle
Revision: 387970

archrelease: copy trunk to extra-x86_64

Added:
  cmark/repos/extra-x86_64/PKGBUILD
    (from rev 387969, cmark/trunk/PKGBUILD)
  cmark/repos/extra-x86_64/python3.8-normalize-test.patch
    (from rev 387969, cmark/trunk/python3.8-normalize-test.patch)
Deleted:
  cmark/repos/extra-x86_64/PKGBUILD

--------------------------------+
 PKGBUILD                       |   76 ++++++++++++++++++++-------------------
 python3.8-normalize-test.patch |   32 ++++++++++++++++
 2 files changed, 72 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-31 15:58:59 UTC (rev 387969)
+++ PKGBUILD	2020-05-31 15:59:10 UTC (rev 387970)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Veeti Paananen <veeti.paananen at rojekti.fi>
-
-pkgname=cmark
-pkgver=0.29.0
-pkgrel=1
-pkgdesc="CommonMark parsing and rendering library and program in C"
-arch=('x86_64')
-url="https://github.com/jgm/cmark"
-license=('custom:BSD2')
-depends=('glibc')
-makedepends=('cmake' 'python')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/jgm/cmark/archive/$pkgver.tar.gz")
-sha512sums=('06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib ../cmark-$pkgver
-  make
-}
-
-check() {
-  cd build
-  make test
-}
-
-package() {
-  cd build
-  make install DESTDIR="$pkgdir"
-
-  install -D -m 644 "$srcdir"/cmark-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}

Copied: cmark/repos/extra-x86_64/PKGBUILD (from rev 387969, cmark/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-31 15:59:10 UTC (rev 387970)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Veeti Paananen <veeti.paananen at rojekti.fi>
+
+pkgname=cmark
+pkgver=0.29.0
+pkgrel=2
+pkgdesc="CommonMark parsing and rendering library and program in C"
+arch=('x86_64')
+url="https://github.com/jgm/cmark"
+license=('custom:BSD2')
+depends=('glibc')
+makedepends=('cmake' 'python')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/jgm/cmark/archive/$pkgver.tar.gz" python3.8-normalize-test.patch)
+sha512sums=('06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112'
+            '74f2566b06fc9ea856d1ef784a1e72bd88eddcc2429d1009f43f6c1467eb6f0a4267c41fe93a585087b95032f72849209a0be9d97298b4a8129bb6329113b087')
+
+prepare() {
+  mkdir -p build
+
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/python3.8-normalize-test.patch
+}
+
+build() {
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib ../cmark-$pkgver
+  make
+}
+
+check() {
+  cd build
+  make test
+}
+
+package() {
+  cd build
+  make install DESTDIR="$pkgdir"
+
+  install -D -m 644 "$srcdir"/cmark-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}

Copied: cmark/repos/extra-x86_64/python3.8-normalize-test.patch (from rev 387969, cmark/trunk/python3.8-normalize-test.patch)
===================================================================
--- python3.8-normalize-test.patch	                        (rev 0)
+++ python3.8-normalize-test.patch	2020-05-31 15:59:10 UTC (rev 387970)
@@ -0,0 +1,32 @@
+From 68c3a91166347a32a57fb81223750a63cfd92105 Mon Sep 17 00:00:00 2001
+From: John MacFarlane <jgm at berkeley.edu>
+Date: Wed, 27 Nov 2019 22:04:16 -0800
+Subject: [PATCH] normalize.py: use html.escape instead of cgi.escape.
+
+Closes #313.
+---
+ test/normalize.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/normalize.py b/test/normalize.py
+index 6073bf01..f8ece18d 100644
+--- a/test/normalize.py
++++ b/test/normalize.py
+@@ -13,7 +13,7 @@ class HTMLParseError(Exception):
+ from html.entities import name2codepoint
+ import sys
+ import re
+-import cgi
++import html
+ 
+ # Normalization code, adapted from
+ # https://github.com/karlcow/markdown-testsuite/
+@@ -66,7 +66,7 @@ def handle_starttag(self, tag, attrs):
+                     self.output += ("=" + '"' +
+                             urllib.quote(urllib.unquote(v), safe='/') + '"')
+                 elif v != None:
+-                    self.output += ("=" + '"' + cgi.escape(v,quote=True) + '"')
++                    self.output += ("=" + '"' + html.escape(v,quote=True) + '"')
+         self.output += ">"
+         self.last_tag = tag
+         self.last = "starttag"