Build against system cmark-gfm and add check() function

4 files changed, 78 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c8510e4da4e..4d991c959a45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
 pkgbase = r-commonmark
 	pkgdesc = High Performance CommonMark and Github Markdown Rendering in R
 	pkgver = 1.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=commonmark
 	arch = i686
 	arch = x86_64
-	license = BSD2
+	license = BSD
+	checkdepends = r-testthat
+	checkdepends = r-xml2
+	depends = cmark-gfm
 	depends = r
 	optdepends = r-curl
 	optdepends = r-testthat
 	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/commonmark_1.7.tar.gz
+	source = system-cmark-gfm.patch
+	source = R-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause
 	sha256sums = d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108
+	sha256sums = 42f29d26c067e84859c90bee49613043e4425d086f430a95da6077dfc41be1b4
+	sha256sums = 19a23bcfa6515217ca3bd3b99c27fe425f41817a034e3279b570a60fed27c499
 
 pkgname = r-commonmark
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 80690b2ce321..43de821cb883 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Alex Branham <alex.branham@gmail.com>
 
@@ -6,22 +7,42 @@ _cranname=commonmark
 _cranver=1.7
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="High Performance CommonMark and Github Markdown Rendering in R"
 arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
-license=(BSD2)
-depends=(r)
+license=(BSD)
+depends=(cmark-gfm r)
+checkdepends=(r-testthat r-xml2)
 optdepends=(r-curl r-testthat r-xml2)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108')
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
+        "system-cmark-gfm.patch"
+        "R-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause")
+sha256sums=('d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108'
+            '42f29d26c067e84859c90bee49613043e4425d086f430a95da6077dfc41be1b4'
+            '19a23bcfa6515217ca3bd3b99c27fe425f41817a034e3279b570a60fed27c499')
+
+prepare() {
+  # build against system cmark-gfm
+  cd "${_cranname}"
+  patch -Np1 -i "${srcdir}/system-cmark-gfm.patch"
+}
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+}
+
+check() {
+  cd "${_cranname}/tests"
+  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+
+  install -Dm644 R-BSD_2_clause-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/BSD_2_clause"
+  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/system-cmark-gfm.patch b/system-cmark-gfm.patch
new file mode 100644
index 000000000000..dd4b242cdbe3
--- /dev/null
+++ b/system-cmark-gfm.patch
@@ -0,0 +1,36 @@
+diff --git a/src/Makevars b/src/Makevars
+index cad9d54..e07d4ab 100644
+--- a/src/Makevars
++++ b/src/Makevars
+@@ -12,16 +12,10 @@ LIBCMARK = cmark/cmark.o cmark/node.o cmark/iterator.o cmark/blocks.o cmark/inli
+ 	extensions/autolink.o extensions/core-extensions.o extensions/ext_scanners.o \
+ 	extensions/strikethrough.o extensions/table.o extensions/tagfilter.o
+ 
+-PKG_LIBS = -Lcmark -lstatcmark
++PKG_LIBS = -lcmark-gfm -lcmark-gfm-extensions
+ STATLIB = cmark/libstatcmark.a
+ 
+-# For development only
+-all: clean
+-
+-$(SHLIB): $(STATLIB)
+-
+-$(STATLIB): $(LIBCMARK)
+-	$(AR) rcs $(STATLIB) $(LIBCMARK)
++$(SHLIB):
+ 
+ clean:
+ 	rm -f $(LIBCMARK) $(OBJECTS) $(SHLIB) $(STATLIB)
+diff --git a/tests/testthat/test-extensions.R b/tests/testthat/test-extensions.R
+index d0eb354..fa922fe 100644
+--- a/tests/testthat/test-extensions.R
++++ b/tests/testthat/test-extensions.R
+@@ -1,7 +1,7 @@
+ context("test-extensions")
+ 
+ test_that("list extensions", {
+-  expect_equal(list_extensions(), c("table", "strikethrough", "autolink", "tagfilter"))
++  expect_equal(list_extensions(), c("table", "strikethrough", "autolink", "tagfilter", "tasklist"))
+ })
+ 
+ test_that("strikethrough", {