[arch-commits] Commit in cmark/trunk (PKGBUILD python3.8-normalize-test.patch)

[Antonio Rojas]

    Date: Sunday, June 20, 2021 @ 21:16:44
  Author: arojas
Revision: 418509

Update to 0.30.0

Modified:
  cmark/trunk/PKGBUILD
Deleted:
  cmark/trunk/python3.8-normalize-test.patch

--------------------------------+
 PKGBUILD                       |   40 ++++++++++++++-------------------------
 python3.8-normalize-test.patch |   32 -------------------------------
 2 files changed, 15 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-20 20:59:57 UTC (rev 418508)
+++ PKGBUILD	2021-06-20 21:16:44 UTC (rev 418509)
@@ -2,39 +2,29 @@
 # 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"
+pkgver=0.30.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" python3.8-normalize-test.patch)
-sha512sums=('06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112'
-            '74f2566b06fc9ea856d1ef784a1e72bd88eddcc2429d1009f43f6c1467eb6f0a4267c41fe93a585087b95032f72849209a0be9d97298b4a8129bb6329113b087')
+depends=(glibc)
+makedepends=(cmake python)
+source=(https://github.com/jgm/cmark/archive/$pkgver/$pkgname-$pkgver.tar.gz)
+sha512sums=('53bbb8cdcac5431b88000f69df0aecfc7bd0d9ec0f7bc5a343281ca75e98304ef2674f55f76733acd81f8e8b9079eefabc9b3f3ef7dcd64087497282f17034a9')
 
-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
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
 }
 
 check() {
-  cd build
-  make test
+  cmake --build build --target test
 }
 
 package() {
-  cd build
-  make install DESTDIR="$pkgdir"
+  DESTDIR="$pkgdir" cmake --install build
 
-  install -D -m 644 "$srcdir"/cmark-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -Dm 644 $pkgname-$pkgver/COPYING -t "$pkgdir"/usr/share/licenses/$pkgname
 }

Deleted: python3.8-normalize-test.patch
===================================================================
--- python3.8-normalize-test.patch	2021-06-20 20:59:57 UTC (rev 418508)
+++ python3.8-normalize-test.patch	2021-06-20 21:16:44 UTC (rev 418509)
@@ -1,32 +0,0 @@
-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"