[lilac] updated to 1.9.0-6

3 files changed, 33 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 398536ef9740..8d2201322755 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-commonmark
 	pkgdesc = High Performance CommonMark and Github Markdown Rendering in R
 	pkgver = 1.9.0
-	pkgrel = 4
+	pkgrel = 6
 	url = https://cran.r-project.org/package=commonmark
 	arch = x86_64
 	license = BSD
@@ -13,7 +13,10 @@ pkgbase = r-commonmark
 	optdepends = r-testthat
 	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/commonmark_1.9.0.tar.gz
+	source = system-cmark-gfm.patch
 	md5sums = a6c6a1c1bf0ee0cc0cde65ce2d577cfc
+	md5sums = 31357c9e94c77a617485e752ead93868
 	sha256sums = 6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f
+	sha256sums = d2360beb79eeee5fcb34e468704aa9af1c98c6effbe2cadafde4f32a6d6fab86
 
 pkgname = r-commonmark
diff --git a/PKGBUILD b/PKGBUILD
index e41c2df599d0..7b77ab16ce6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 _pkgname=commonmark
 _pkgver=1.9.0
 pkgname=r-${_pkgname,,}
-pkgver=${_pkgver//[:-]/.}
-pkgrel=4
+pkgver=${_pkgver//-/.}
+pkgrel=6
 pkgdesc="High Performance CommonMark and Github Markdown Rendering in R"
 arch=(x86_64)
 url="https://cran.r-project.org/package=${_pkgname}"
@@ -26,16 +26,16 @@ optdepends=(
   r-testthat
   r-xml2
 )
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-md5sums=('a6c6a1c1bf0ee0cc0cde65ce2d577cfc')
-sha256sums=('6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "system-cmark-gfm.patch")
+md5sums=('a6c6a1c1bf0ee0cc0cde65ce2d577cfc'
+         '31357c9e94c77a617485e752ead93868')
+sha256sums=('6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f'
+            'd2360beb79eeee5fcb34e468704aa9af1c98c6effbe2cadafde4f32a6d6fab86')
 
 prepare() {
   # build against system cmark-gfm
-  sed -e 's/-Lcmark -lstatcmark/-lcmark-gfm -lcmark-gfm-extensions/' \
-      -e 's/$(SHLIB): $(STATLIB)/$(SHLIB):/' \
-      -e '/all: clean/d' \
-      -i "$_pkgname/src/Makevars"
+  patch -Np1 -i system-cmark-gfm.patch
 }
 
 build() {
diff --git a/system-cmark-gfm.patch b/system-cmark-gfm.patch
new file mode 100644
index 000000000000..20a430b357c5
--- /dev/null
+++ b/system-cmark-gfm.patch
@@ -0,0 +1,20 @@
+diff --git a/commonmark/src/Makevars b/commonmark/src/Makevars
+index 23ba950..7a1df04 100644
+--- a/commonmark/src/Makevars
++++ b/commonmark/src/Makevars
+@@ -12,13 +12,12 @@ 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 extensions/tasklist.o
+ 
+-PKG_LIBS = -Lcmark -lstatcmark
++PKG_LIBS = -lcmark-gfm -lcmark-gfm-extensions
+ STATLIB = cmark/libstatcmark.a
+ 
+ # For development only
+-all: clean
+ 
+-$(SHLIB): $(STATLIB)
++$(SHLIB):
+ 
+ $(STATLIB): $(LIBCMARK)
+ 	$(AR) rcs $(STATLIB) $(LIBCMARK)