diff --git a/ports-mgmt/appstream-generator/Makefile b/ports-mgmt/appstream-generator/Makefile index d52b76e5a107..cf89eacea0b8 100644 --- a/ports-mgmt/appstream-generator/Makefile +++ b/ports-mgmt/appstream-generator/Makefile @@ -1,59 +1,58 @@ PORTNAME= appstream-generator DISTVERSIONPREFIX= v -DISTVERSION= 0.10.1 -PORTREVISION= 1 +DISTVERSION= 0.10.2 CATEGORIES= ports-mgmt MAINTAINER= arrowd@FreeBSD.org COMMENT= Fast AppStream metadata generator WWW= https://github.com/ximion/appstream-generator LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json \ inja>=3:devel/inja \ catch2>0:devel/catch2 \ ${LOCALBASE}/include/__generator.hpp:devel/stdgenerator \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl LIB_DEPENDS= libappstream.so:devel/appstream \ libappstream-compose.so:devel/appstream-compose \ libCatch2.so:devel/catch2 \ libcurl.so:ftp/curl \ liblmdb.so:databases/lmdb \ libicuuc.so:devel/icu \ libtbb.so:devel/onetbb \ libfyaml.so:textproc/libfyaml USES= compiler:c++23-lang gnome libarchive meson pkgconfig USE_GNOME= glib20 libxml2 libxslt:build USE_CXXSTD= c++23 USE_GITHUB= yes GH_ACCOUNT= ximion OPTIONS_DEFINE= MANPAGES MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt MESON_ARGS= -Ddownload-js=false -Dbackward=false CFLAGS+= -fexperimental-library DATADIR= ${PREFIX}/share/appstream OPTIONS_SUB= yes .include .if ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH:Marmv?} post-patch: @${REINPLACE_CMD} -e "/tbb_dep/s|'tbb'|'tbb32'|" \ ${WRKSRC}/meson.build .endif post-install: cd ${WRKSRC}/data && \ ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${PATCHDIR}/poudriere-hook-bulk.sh ${STAGEDIR}${DATADIR} .include diff --git a/ports-mgmt/appstream-generator/distinfo b/ports-mgmt/appstream-generator/distinfo index 1808e31bcdd8..af96c572670d 100644 --- a/ports-mgmt/appstream-generator/distinfo +++ b/ports-mgmt/appstream-generator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759931829 -SHA256 (ximion-appstream-generator-v0.10.1_GH0.tar.gz) = 002c509c54daa39b3bc179afca84227c9675368264040d19e7847540b7d0ed48 -SIZE (ximion-appstream-generator-v0.10.1_GH0.tar.gz) = 580502 +TIMESTAMP = 1770817726 +SHA256 (ximion-appstream-generator-v0.10.2_GH0.tar.gz) = cfafd3de39e124208123591e83f3165e40196edb9aa6acc536dc2cea5662ec81 +SIZE (ximion-appstream-generator-v0.10.2_GH0.tar.gz) = 583256 diff --git a/ports-mgmt/appstream-generator/files/patch-meson.build b/ports-mgmt/appstream-generator/files/patch-meson.build deleted file mode 100644 index 59bb727a1897..000000000000 --- a/ports-mgmt/appstream-generator/files/patch-meson.build +++ /dev/null @@ -1,13 +0,0 @@ ---- meson.build.orig 2025-09-25 21:14:13 UTC -+++ meson.build -@@ -57,8 +57,8 @@ endif - # - # Compiler flags - # --add_project_arguments('-D_POSIX_C_SOURCE=201710L', language: 'c') --add_project_arguments('-D_POSIX_C_SOURCE=201710L', language: 'cpp') -+#add_project_arguments('-D_POSIX_C_SOURCE=201710L', language: 'c') -+#add_project_arguments('-D_POSIX_C_SOURCE=201710L', language: 'cpp') - - if get_option('maintainer') - maintainer_c_args = [ diff --git a/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.h b/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.h deleted file mode 100644 index 8ea32db22c6b..000000000000 --- a/ports-mgmt/appstream-generator/files/patch-src_backends_freebsd_fbsdpkg.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/backends/freebsd/fbsdpkg.h.orig 2025-09-25 21:14:13 UTC -+++ src/backends/freebsd/fbsdpkg.h -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/ports-mgmt/appstream-generator/files/patch-src_config.h b/ports-mgmt/appstream-generator/files/patch-src_config.h deleted file mode 100644 index f53b0ebb8062..000000000000 --- a/ports-mgmt/appstream-generator/files/patch-src_config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/config.h.orig 2025-10-02 19:33:23 UTC -+++ src/config.h -@@ -44,7 +44,7 @@ inline constexpr std::array AllowedIconS - /** - * Fake package name AppStream Generator uses internally to inject additional metainfo on users' request - */ --inline constexpr std::string EXTRA_METAINFO_FAKE_PKGNAME = "+extra-metainfo"; -+inline const std::string EXTRA_METAINFO_FAKE_PKGNAME = "+extra-metainfo"; - - /** - * Describes a suite in a software repository. diff --git a/ports-mgmt/appstream-generator/files/patch-src_engine.cpp b/ports-mgmt/appstream-generator/files/patch-src_engine.cpp deleted file mode 100644 index d99f8a59a7e8..000000000000 --- a/ports-mgmt/appstream-generator/files/patch-src_engine.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/engine.cpp.orig 2025-10-02 19:33:23 UTC -+++ src/engine.cpp -@@ -35,6 +35,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -68,7 +69,7 @@ Engine::Engine() - // Configure a TBB task arena to limit parallelism a little (use half the available CPU cores, or at least 6 - // threads) This avoids having too many parallel downloads on high-core-count machines, and also leaves some room - // for additional parallelism of the used libraries, e.g. for image processing. -- const auto numCPU = std::thread::hardware_concurrency(); -+ std::int32_t const numCPU = std::thread::hardware_concurrency(); - const auto maxThreads = std::max(numCPU > 6 ? 6L : numCPU, std::lround(numCPU * 0.60)); - m_taskArena = std::make_unique(maxThreads); -