From dd69c32c8961634b8c8c1eb4564dc6138a026f01 Mon Sep 17 00:00:00 2001 From: Deimos Date: Wed, 17 Oct 2018 20:45:15 -0600 Subject: [PATCH] Update cmark-gfm to 0.28.3.gfm.17 Required a couple of minor code changes as well, since they did some minor renaming of a few things. --- salt/salt/cmark-gfm.sls | 4 ++-- tildes/tildes/lib/cmark.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/salt/cmark-gfm.sls b/salt/salt/cmark-gfm.sls index 763f2d1..df7a794 100644 --- a/salt/salt/cmark-gfm.sls +++ b/salt/salt/cmark-gfm.sls @@ -3,8 +3,8 @@ unpack-cmark-gfm: - name: /tmp/cmark-gfm - source: - salt://cmark-gfm.tar.gz - - https://github.com/github/cmark/archive/0.28.0.gfm.11.tar.gz - - source_hash: sha256=8100698cd6fa4e3d870d9c7fbf92ef795a60ea3d7b00e3a4d1904105b1191fae + - https://github.com/github/cmark-gfm/archive/0.28.3.gfm.17.tar.gz + - source_hash: sha256=101ccfcd4f0fd8b05c20994006d992f2e81d6f96655afee4c66742ccc21f1f7d - if_missing: /usr/local/lib/libcmark-gfm.so - options: --strip-components=1 - enforce_toplevel: False diff --git a/tildes/tildes/lib/cmark.py b/tildes/tildes/lib/cmark.py index 4c6ab5a..6180068 100644 --- a/tildes/tildes/lib/cmark.py +++ b/tildes/tildes/lib/cmark.py @@ -5,7 +5,7 @@ from ctypes import CDLL, c_char_p, c_int, c_size_t, c_void_p CMARK_DLL = CDLL("/usr/local/lib/libcmark-gfm.so") -CMARK_EXT_DLL = CDLL("/usr/local/lib/libcmark-gfmextensions.so") +CMARK_EXT_DLL = CDLL("/usr/local/lib/libcmark-gfm-extensions.so") # enables the --hardbreaks option for cmark # (can I import this? it's defined in cmark.h as CMARK_OPT_HARDBREAKS) @@ -49,7 +49,7 @@ cmark_render_html = CMARK_DLL.cmark_render_html cmark_render_html.restype = c_char_p cmark_render_html.argtypes = (c_void_p, c_int, c_void_p) -register = CMARK_EXT_DLL.core_extensions_ensure_registered +register = CMARK_EXT_DLL.cmark_gfm_core_extensions_ensure_registered register.restype = None register.argtypes = () register()