summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO11
-rw-r--r--libcmark-gfm-extensions/.gitignore5
-rw-r--r--libcmark-gfm-extensions/README3
-rw-r--r--libcmark-gfm-extensions/build/bootstrap.build2
-rw-r--r--libcmark-gfm-extensions/build/export.build4
-rw-r--r--libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile6
-rw-r--r--libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h28
-rw-r--r--libcmark-gfm-extensions/manifest7
-rw-r--r--libcmark-gfm-extensions/tests/basic/driver.c3
-rw-r--r--libcmark-gfm/.gitignore5
-rw-r--r--libcmark-gfm/build/bootstrap.build2
-rw-r--r--libcmark-gfm/build/export.build4
-rw-r--r--libcmark-gfm/libcmark-gfm/buildfile6
-rw-r--r--libcmark-gfm/libcmark-gfm/cmark-gfm_export.h32
-rw-r--r--libcmark-gfm/libcmark-gfm/cmark-gfm_version.h3
-rw-r--r--libcmark-gfm/libcmark-gfm/config.h4
-rw-r--r--libcmark-gfm/manifest7
-rw-r--r--libcmark-gfm/tests/basic/driver.c3
m---------upstream0
19 files changed, 62 insertions, 73 deletions
diff --git a/TODO b/TODO
index 2674ca8..a91a4ee 100644
--- a/TODO
+++ b/TODO
@@ -2,17 +2,6 @@ On the revision:
- Canonicalize the license in the package manifests.
-- Normalize C comments in the tests source code replacing
-
- /*
- * ...
- */
-
- with
-
- /* ...
- */
-
On the release:
- Use legal{} target type for legal documentation (LICENSE, AUTHORS, etc).
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
*/
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
*/
diff --git a/upstream b/upstream
-Subproject b8eb2e00de094999f978e9cb02b1a78d810812d
+Subproject 766f161ef6d61019acf3a69f5099489e7d14cd4