diff options
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | libcmark-gfm-extensions/build/bootstrap.build | 2 | ||||
| -rw-r--r-- | libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile | 5 | ||||
| -rw-r--r-- | libcmark-gfm-extensions/manifest | 4 | ||||
| -rw-r--r-- | libcmark-gfm/build/bootstrap.build | 2 | ||||
| -rw-r--r-- | libcmark-gfm/libcmark-gfm/buildfile | 5 | ||||
| -rw-r--r-- | libcmark-gfm/manifest | 5 | ||||
| m--------- | upstream | 0 |
8 files changed, 22 insertions, 7 deletions
@@ -3,3 +3,9 @@ On the revision: On the release: Note that this requires bumping build2 version requirement to 0.15.0. + +Additional (permanent) notes: + +- Review '@@ TMP' notes. + +- Add/remove 'priority: security' manifest value, if required. diff --git a/libcmark-gfm-extensions/build/bootstrap.build b/libcmark-gfm-extensions/build/bootstrap.build index 8f66880..bb5b65f 100644 --- a/libcmark-gfm-extensions/build/bootstrap.build +++ b/libcmark-gfm-extensions/build/bootstrap.build @@ -17,7 +17,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 = 2 + upstream_version_gfm = 3 abi_version = "$upstream_version_major.$upstream_version_minor.$(upstream_version_patch).gfm.$upstream_version_gfm" } diff --git a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile index 76e0df9..464a9b7 100644 --- a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile +++ b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile @@ -28,7 +28,12 @@ switch $c.class # that works across compilers/version (some -Wno-* options are only # recognized in newer versions). # + # @@ TMP: try to re-enable on next release. + # c.coptions += -Wno-extra + + if ($c.id.type == 'clang' && $c.version.major >= 15) + c.coptions += -Wno-strict-prototypes } case 'msvc' { diff --git a/libcmark-gfm-extensions/manifest b/libcmark-gfm-extensions/manifest index dbc80a3..aebdc77 100644 --- a/libcmark-gfm-extensions/manifest +++ b/libcmark-gfm-extensions/manifest @@ -3,8 +3,8 @@ name: libcmark-gfm-extensions # Note: remember to update build/bootstrap.build! # -version: 0.29.0-a.2.z -upstream-version: 0.29.0.gfm.2 +version: 0.29.0-a.4+1 +upstream-version: 0.29.0.gfm.3 project: cmark-gfm priority: security diff --git a/libcmark-gfm/build/bootstrap.build b/libcmark-gfm/build/bootstrap.build index 48f1937..57d96d7 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 = 2 + upstream_version_gfm = 3 abi_version = "$upstream_version_major.$upstream_version_minor.$(upstream_version_patch).gfm.$upstream_version_gfm" } diff --git a/libcmark-gfm/libcmark-gfm/buildfile b/libcmark-gfm/libcmark-gfm/buildfile index 5c4ec19..10d1c02 100644 --- a/libcmark-gfm/libcmark-gfm/buildfile +++ b/libcmark-gfm/libcmark-gfm/buildfile @@ -46,7 +46,12 @@ if ($c.class == 'gcc') # works across compilers/version (some -Wno-* options are only recognized in # newer versions). # + # @@ TMP: try to re-enable on next release. + # c.coptions += -Wno-extra + + if ($c.id.type == 'clang' && $c.version.major >= 15) + c.coptions += -Wno-strict-prototypes } # Export options. diff --git a/libcmark-gfm/manifest b/libcmark-gfm/manifest index e8f958e..b02e8df 100644 --- a/libcmark-gfm/manifest +++ b/libcmark-gfm/manifest @@ -3,11 +3,10 @@ name: libcmark-gfm # Note: remember to update build/bootstrap.build! # -version: 0.29.0-a.2.z -upstream-version: 0.29.0.gfm.2 +version: 0.29.0-a.4+1 +upstream-version: 0.29.0.gfm.3 project: cmark-gfm -priority: security summary: GitHub-flavored CommonMark parsing and rendering C library license: BSD-2-Clause AND MIT ; BSD 2-Clause "Simplified" License for the most of original files. topics: C, CommonMark, Markdown, documentation generation diff --git a/upstream b/upstream -Subproject 766f161ef6d61019acf3a69f5099489e7d14cd4 +Subproject cf7577d2f74289cb83de0a652afc1a8b08a3703 |