diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2021-10-27 16:54:16 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-10-29 10:48:15 +0300 |
commit | f7edc2c3ff634514a6a1bf9d1fac34536bc727ab (patch) | |
tree | a6814284587a9ac75f996ea29e2dfeeeb35715ec /libcmark-gfm | |
parent | b99870847ed87a37beaab7f5d6f822bac837c274 (diff) |
Upgrade to 0.29.0.gfm.2
Diffstat (limited to 'libcmark-gfm')
-rw-r--r-- | libcmark-gfm/.gitignore | 5 | ||||
-rw-r--r-- | libcmark-gfm/build/bootstrap.build | 2 | ||||
-rw-r--r-- | libcmark-gfm/build/export.build | 4 | ||||
-rw-r--r-- | libcmark-gfm/libcmark-gfm/buildfile | 6 | ||||
-rw-r--r-- | libcmark-gfm/libcmark-gfm/cmark-gfm_export.h | 32 | ||||
-rw-r--r-- | libcmark-gfm/libcmark-gfm/cmark-gfm_version.h | 3 | ||||
-rw-r--r-- | libcmark-gfm/libcmark-gfm/config.h | 4 | ||||
-rw-r--r-- | libcmark-gfm/manifest | 7 | ||||
-rw-r--r-- | libcmark-gfm/tests/basic/driver.c | 3 |
9 files changed, 32 insertions, 34 deletions
diff --git a/libcmark-gfm/.gitignore b/libcmark-gfm/.gitignore index cece09c..6435b97 100644 --- a/libcmark-gfm/.gitignore +++ b/libcmark-gfm/.gitignore @@ -3,9 +3,14 @@ *.d *.t *.i +*.i.* *.ii +*.ii.* *.o *.obj +*.gcm +*.pcm +*.ifc *.so *.dll *.a diff --git a/libcmark-gfm/build/bootstrap.build b/libcmark-gfm/build/bootstrap.build index 98aa105..c8a159c 100644 --- a/libcmark-gfm/build/bootstrap.build +++ b/libcmark-gfm/build/bootstrap.build @@ -40,7 +40,7 @@ if ($version.major == 0 && $version.minor == 29 && $version.patch == 0) upstream_version_major = 0 upstream_version_minor = 29 upstream_version_patch = 0 - upstream_version_gfm = 0 + upstream_version_gfm = 2 abi_version = "$upstream_version_major.$upstream_version_minor.$(upstream_version_patch).gfm.$upstream_version_gfm" } diff --git a/libcmark-gfm/build/export.build b/libcmark-gfm/build/export.build index f753739..720121b 100644 --- a/libcmark-gfm/build/export.build +++ b/libcmark-gfm/build/export.build @@ -1,5 +1,5 @@ -# file : build/root.build -# license : FreeBSD License; see accompanying COPYING file +# file : build/export.build +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file $out_root/ { diff --git a/libcmark-gfm/libcmark-gfm/buildfile b/libcmark-gfm/libcmark-gfm/buildfile index 9aff2ba..8d0ccfb 100644 --- a/libcmark-gfm/libcmark-gfm/buildfile +++ b/libcmark-gfm/libcmark-gfm/buildfile @@ -44,11 +44,9 @@ if ($c.class == 'gcc') # Disable warnings that pop up with -Wextra. Upstream doesn't seem to care # about these and it is not easy to disable specific warnings in a way that # works across compilers/version (some -Wno-* options are only recognized in - # newer versions). There are still some warnings left that appear for - # certain platforms/compilers. We pass them through but disable treating - # them as errors. + # newer versions). # - c.coptions += -Wno-extra -Wno-error + c.coptions += -Wno-extra } # Export options. diff --git a/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h b/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h index ca6b3cf..ca72d98 100644 --- a/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h +++ b/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h @@ -5,43 +5,39 @@ #ifndef CMARK_GFM_EXPORT_H #define CMARK_GFM_EXPORT_H -/* - * The upstream's version of this file is auto-generated by cmake. It looks - * quite convoluted and contains unused macro definitions. Moreover it seems - * to be broken, mismatching build/use pre-processor options (see the issue - * #156). Note that currently the upstream disables building shared libraries - * with VC. +/* The upstream's version of this file is auto-generated by cmake. It looks + * quite convoluted and contains unused macro definitions. Note that currently + * the upstream disables building shared libraries with VC. * * We implement this file from scratch using the standard build2 export header * as a template. */ -#if defined(CMARK_GFM_STATIC) // Using static. +#if defined(CMARK_GFM_STATIC) /* Using static. */ # define CMARK_GFM_EXPORT -#elif defined(CMARK_GFM_STATIC_BUILD) // Building static. +#elif defined(CMARK_GFM_STATIC_BUILD) /* Building static. */ # define CMARK_GFM_EXPORT -#elif defined(CMARK_GFM_SHARED) // Using shared. +#elif defined(CMARK_GFM_SHARED) /* Using shared. */ # ifdef _WIN32 # define CMARK_GFM_EXPORT __declspec(dllimport) # else # define CMARK_GFM_EXPORT # endif -#elif defined(CMARK_GFM_SHARED_BUILD) // Building shared. +#elif defined(CMARK_GFM_SHARED_BUILD) /* Building shared. */ # ifdef _WIN32 # define CMARK_GFM_EXPORT __declspec(dllexport) # else # define CMARK_GFM_EXPORT __attribute__((visibility("default"))) # endif #else -// If none of the above macros are defined, then we assume we are being used -// by some third-party build system that cannot/doesn't signal the library -// type. Note that this fallback works for both static and shared but in case -// of shared will be sub-optimal compared to having dllimport. -// -# define CMARK_GFM_EXPORT // Using static or shared. +/* If none of the above macros are defined, then we assume we are being used + * by some third-party build system that cannot/doesn't signal the library + * type. Note that this fallback works for both static and shared but in case + * of shared will be sub-optimal compared to having dllimport. + */ +# define CMARK_GFM_EXPORT /* Using static or shared. */ #endif -/* - * Undefining these cmake-generated macros is not technically required, but +/* Undefining these cmake-generated macros is not technically required, but * let's keep them for the record. */ #undef CMARK_GFM_NO_EXPORT diff --git a/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h b/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h index 928f8b9..1b7b67b 100644 --- a/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h +++ b/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h @@ -1,5 +1,4 @@ -/* - * file : libcmark-gfm/cmark-gfm_version.h +/* file : libcmark-gfm/cmark-gfm_version.h * license : FreeBSD License; see accompanying COPYING file */ diff --git a/libcmark-gfm/libcmark-gfm/config.h b/libcmark-gfm/libcmark-gfm/config.h index 955b03b..cd62e03 100644 --- a/libcmark-gfm/libcmark-gfm/config.h +++ b/libcmark-gfm/libcmark-gfm/config.h @@ -5,8 +5,8 @@ extern "C" { #endif -/* - * For the semantics of the following macros refer to src/CMakeLists.txt. +/* For the semantics of the following macros refer to upstream's + * src/CMakeLists.txt. */ #define HAVE_STDBOOL_H diff --git a/libcmark-gfm/manifest b/libcmark-gfm/manifest index 2e807ac..8257a8c 100644 --- a/libcmark-gfm/manifest +++ b/libcmark-gfm/manifest @@ -3,10 +3,11 @@ name: libcmark-gfm # Note: remember to update build/bootstrap.build! # -version: 0.29.0-a.1+7 -upstream-version: 0.29.0.gfm.0 +version: 0.29.0-a.2.z +upstream-version: 0.29.0.gfm.2 project: cmark-gfm +priority: security summary: GitHub-flavored CommonMark parsing and rendering C library license: BSD2; Simplified 2-clause BSD License. topics: C, CommonMark, Markdown, documentation generation @@ -16,7 +17,7 @@ src-url: https://git.build2.org/cgit/packaging/cmark-gfm/cmark-gfm/tree/libcmark package-url: https://git.build2.org/cgit/packaging/cmark-gfm/ email: packaging@build2.org ; Report issues at https://github.com/github/cmark-gfm/issues. package-email: packaging@build2.org ; Mailing list. -build-error-email: builds@build2.org +build-warning-email: builds@build2.org builds: all depends: * build2 >= 0.12.0 depends: * bpkg >= 0.12.0 diff --git a/libcmark-gfm/tests/basic/driver.c b/libcmark-gfm/tests/basic/driver.c index 1cd06c2..c093f71 100644 --- a/libcmark-gfm/tests/basic/driver.c +++ b/libcmark-gfm/tests/basic/driver.c @@ -1,5 +1,4 @@ -/* - * file : tests/basic/driver.c +/* file : tests/basic/driver.c * license : FreeBSD License; see accompanying COPYING file */ |