Upgrade to 0.29.0.gfm.2

8 files changed, 30 insertions, 28 deletions

diff --git a/libcmark-gfm-extensions/.gitignore b/libcmark-gfm-extensions/.gitignore
index cece09c..6435b97 100644
--- a/libcmark-gfm-extensions/.gitignore
+++ b/libcmark-gfm-extensions/.gitignore
@@ -3,9 +3,14 @@
 *.d
 *.t
 *.i
+*.i.*
 *.ii
+*.ii.*
 *.o
 *.obj
+*.gcm
+*.pcm
+*.ifc
 *.so
 *.dll
 *.a
diff --git a/libcmark-gfm-extensions/README b/libcmark-gfm-extensions/README
index d492628..6d4bbea 100644
--- a/libcmark-gfm-extensions/README
+++ b/libcmark-gfm-extensions/README
@@ -16,6 +16,7 @@ https://github.com/github/cmark-gfm/issues. Send build system and
 packaging-related feedback to the packaging@build2.org mailing list (see
 https://lists.build2.org for posting guidelines, etc).
 
-The packaging of libcmark-gfm for build2 is tracked in a Git repository at:
+The packaging of libcmark-gfm-extensions for build2 is tracked in a Git
+repository at:
 
 https://git.build2.org/cgit/packaging/cmark-gfm/
diff --git a/libcmark-gfm-extensions/build/bootstrap.build b/libcmark-gfm-extensions/build/bootstrap.build
index 9640299..b513d63 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 = 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-extensions/build/export.build b/libcmark-gfm-extensions/build/export.build
index 0d34a84..86966fb 100644
--- a/libcmark-gfm-extensions/build/export.build
+++ b/libcmark-gfm-extensions/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-extensions/libcmark-gfm-extensions/buildfile b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile
index 4f44887..c6dadb2 100644
--- a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile
+++ b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile
@@ -26,11 +26,9 @@ switch $c.class
     # 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.
+    # recognized in newer versions).
     #
-    c.coptions += -Wno-extra -Wno-error
+    c.coptions += -Wno-extra
   }
   case 'msvc'
   {
diff --git a/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h b/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h
index bfafe32..d02783a 100644
--- a/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h
+++ b/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h
@@ -5,37 +5,35 @@
 #ifndef CMARK_GFM_EXTENSIONS_EXPORT_H
 #define CMARK_GFM_EXTENSIONS_EXPORT_H
 
-/*
- * The upstream's version of this file is auto-generated by cmake. We implement
- * it from scratch (see cmark-gfm_export.h for details).
+/* The upstream's version of this file is auto-generated by cmake. We
+ * implement it from scratch (see cmark-gfm_export.h for details).
  */
-#if defined(CMARK_GFM_EXTENSIONS_STATIC)         // Using static.
+#if defined(CMARK_GFM_EXTENSIONS_STATIC)         /* Using static. */
 #  define CMARK_GFM_EXTENSIONS_EXPORT
-#elif defined(CMARK_GFM_EXTENSIONS_STATIC_BUILD) // Building static.
+#elif defined(CMARK_GFM_EXTENSIONS_STATIC_BUILD) /* Building static. */
 #  define CMARK_GFM_EXTENSIONS_EXPORT
-#elif defined(CMARK_GFM_EXTENSIONS_SHARED)       // Using shared.
+#elif defined(CMARK_GFM_EXTENSIONS_SHARED)       /* Using shared. */
 #  ifdef _WIN32
 #    define CMARK_GFM_EXTENSIONS_EXPORT __declspec(dllimport)
 #  else
 #    define CMARK_GFM_EXTENSIONS_EXPORT
 #  endif
-#elif defined(CMARK_GFM_EXTENSIONS_SHARED_BUILD) // Building shared.
+#elif defined(CMARK_GFM_EXTENSIONS_SHARED_BUILD) /* Building shared. */
 #  ifdef _WIN32
 #    define CMARK_GFM_EXTENSIONS_EXPORT __declspec(dllexport)
 #  else
 #    define CMARK_GFM_EXTENSIONS_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_EXTENSIONS_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_EXTENSIONS_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_EXTENSIONS_NO_EXPORT
diff --git a/libcmark-gfm-extensions/manifest b/libcmark-gfm-extensions/manifest
index 34e8bb9..daf524f 100644
--- a/libcmark-gfm-extensions/manifest
+++ b/libcmark-gfm-extensions/manifest
@@ -3,10 +3,11 @@ name: libcmark-gfm-extensions
 
 # 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 extensions 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-extensions/tests/basic/driver.c b/libcmark-gfm-extensions/tests/basic/driver.c
index 8ace082..ca6f475 100644
--- a/libcmark-gfm-extensions/tests/basic/driver.c
+++ b/libcmark-gfm-extensions/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
  */