git: 924e2bd965b5 - main - ports-mgmt/appstream-generator: Update to 1.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Sep 2026 18:20:45 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=924e2bd965b5e96a775c07557b0019cdda0a86eb
commit 924e2bd965b5e96a775c07557b0019cdda0a86eb
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-09-09 18:19:11 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-09-09 18:19:25 +0000
ports-mgmt/appstream-generator: Update to 1.0.0
---
ports-mgmt/appstream-generator/Makefile | 23 +-----
ports-mgmt/appstream-generator/distinfo | 8 +-
ports-mgmt/appstream-generator/files/patch-backend | 96 ----------------------
.../files/patch-contrib_setup_build__js.sh | 16 ----
.../patch-contrib_setup_meson-install-templates.sh | 14 ----
ports-mgmt/appstream-generator/pkg-plist | 32 +++-----
6 files changed, 20 insertions(+), 169 deletions(-)
diff --git a/ports-mgmt/appstream-generator/Makefile b/ports-mgmt/appstream-generator/Makefile
index bd6c151449bf..214f46190926 100644
--- a/ports-mgmt/appstream-generator/Makefile
+++ b/ports-mgmt/appstream-generator/Makefile
@@ -1,10 +1,7 @@
PORTNAME= appstream-generator
DISTVERSIONPREFIX= v
-DISTVERSION= 0.10.2
-PORTREVISION= 5
+DISTVERSION= 1.0.0
CATEGORIES= ports-mgmt
-MASTER_SITES= LOCAL/arrowd/:assets
-DISTFILES= ${_ASSETS_DISTNAME}${EXTRACT_SUFX}:assets
MAINTAINER= arrowd@FreeBSD.org
COMMENT= Fast AppStream metadata generator
@@ -17,7 +14,9 @@ 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
+ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+ ${LOCALBASE}/lib/cmake/quill/quill-config.cmake:devel/quill \
+ docbook-xsl-ns>=0:textproc/docbook-xsl-ns
LIB_DEPENDS= libappstream.so:devel/appstream \
libappstream-compose.so:devel/appstream-compose \
libCatch2.so:devel/catch2 \
@@ -44,11 +43,6 @@ CFLAGS+= -fexperimental-library
DATADIR= ${PREFIX}/share/appstream
OPTIONS_SUB= yes
-# only needed to fool meson
-BINARY_ALIAS= npm=true
-
-_ASSETS_DISTNAME=${PORTNAME}-js-assets-${_ASSETS_VERSION}
-_ASSETS_VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
@@ -65,13 +59,4 @@ post-install:
${INSTALL_SCRIPT} ${PATCHDIR}/poudriere-hook-bulk.sh \
${STAGEDIR}${PREFIX}/etc/poudriere.d/hooks/appstream-post-bulk.sh.sample
-repackage-js:
- pkg info npm > /dev/null
- cd ${WRKSRC}/contrib/setup && ./build_js.sh
- cd ${WRKDIR} && ${TAR} -czf /tmp/${_ASSETS_DISTNAME}${EXTRACT_SUFX} \
- ${WRKSRC:T}/data/templates/default/static/js
- @cd /tmp && sha256 ${_ASSETS_DISTNAME}${EXTRACT_SUFX} \
- && ${ECHO_CMD} -n "SIZE (${_ASSETS_DISTNAME}${EXTRACT_SUFX}) = " \
- && ${STAT} -f %z ${_ASSETS_DISTNAME}${EXTRACT_SUFX} \
-
.include <bsd.port.post.mk>
diff --git a/ports-mgmt/appstream-generator/distinfo b/ports-mgmt/appstream-generator/distinfo
index da39fd9e1659..1fa3eb27d0c9 100644
--- a/ports-mgmt/appstream-generator/distinfo
+++ b/ports-mgmt/appstream-generator/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1775749894
-SHA256 (appstream-generator-js-assets-0.10.2.tar.gz) = 43ae30af71ccffa12bc679e3003004b7671cca2976e553b78f852d71ee86076d
-SIZE (appstream-generator-js-assets-0.10.2.tar.gz) = 680623
-SHA256 (ximion-appstream-generator-v0.10.2_GH0.tar.gz) = cfafd3de39e124208123591e83f3165e40196edb9aa6acc536dc2cea5662ec81
-SIZE (ximion-appstream-generator-v0.10.2_GH0.tar.gz) = 583256
+TIMESTAMP = 1788948107
+SHA256 (ximion-appstream-generator-v1.0.0_GH0.tar.gz) = ec5e45c28e4126809872d37ea41937908e3d1f237f6faac0086332454666b067
+SIZE (ximion-appstream-generator-v1.0.0_GH0.tar.gz) = 725257
diff --git a/ports-mgmt/appstream-generator/files/patch-backend b/ports-mgmt/appstream-generator/files/patch-backend
deleted file mode 100644
index b8df2f4f9d7a..000000000000
--- a/ports-mgmt/appstream-generator/files/patch-backend
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0426e92d54ea53b83fb03eab84194f6026356c3d Mon Sep 17 00:00:00 2001
-From: Gleb Popov <6yearold@gmail.com>
-Date: Sun, 15 Feb 2026 19:11:30 +0300
-Subject: [PATCH] FreeBSD backend: little fixes for the packageForFile() code
- path
-
----
- src/backends/freebsd/fbsdpkg.cpp | 6 +++---
- src/backends/freebsd/fbsdpkgindex.cpp | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git src/backends/freebsd/fbsdpkg.cpp src/backends/freebsd/fbsdpkg.cpp
-index 3b6ef9b..62b0ecd 100644
---- src/backends/freebsd/fbsdpkg.cpp
-+++ src/backends/freebsd/fbsdpkg.cpp
-@@ -40,7 +40,7 @@ FreeBSDPackage *FreeBSDPackage::CreateFromWorkdir(const std::string &workDir)
- if (!entry.is_regular_file())
- continue;
-
-- if (entry.path().extension() != "pkg")
-+ if (entry.path().extension() != ".pkg")
- continue;
-
- count++;
-@@ -164,9 +164,9 @@ const std::vector<std::string> &FreeBSDPackage::contents()
- if (m_isWorkdirPackage) {
- std::vector<std::string> ret;
-
-- for (const auto &entry : fs::directory_iterator(m_stageDir)) {
-+ for (const auto &entry : fs::recursive_directory_iterator(m_stageDir)) {
- auto relPath = fs::relative(entry.path(), m_stageDir);
-- ret.push_back(relPath);
-+ ret.push_back(fs::path("/") / relPath);
- }
-
- m_contentsL = ret;
-diff --git src/backends/freebsd/fbsdpkgindex.cpp src/backends/freebsd/fbsdpkgindex.cpp
-index ef879a2..f593021 100644
---- src/backends/freebsd/fbsdpkgindex.cpp
-+++ src/backends/freebsd/fbsdpkgindex.cpp
-@@ -154,7 +154,7 @@ std::shared_ptr<Package> FreeBSDPackageIndex::packageForFile(
- return nullptr;
- }
-
-- return nullptr;
-+ return std::shared_ptr<FreeBSDPackage>(FreeBSDPackage::CreateFromWorkdir(fname));
- }
-
- bool FreeBSDPackageIndex::hasChanges(
-From 130da611fe7d197cd13f5545060e7e3c5319fcb3 Mon Sep 17 00:00:00 2001
-From: Gleb Popov <6yearold@gmail.com>
-Date: Sun, 15 Feb 2026 19:12:44 +0300
-Subject: [PATCH] Engine::processFile: also pass custom prefix to the
- IconHandler constructor
-
----
- src/engine.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git src/engine.cpp src/engine.cpp
-index 78b1fef..f9fbf66 100644
---- src/engine.cpp
-+++ src/engine.cpp
-@@ -899,7 +899,8 @@ bool Engine::processFile(
- *m_cstore,
- m_dstore->mediaExportPoolDir(),
- getIconCandidatePackages(suite, sectionName, arch),
-- suite.iconTheme);
-+ suite.iconTheme,
-+ m_pkgIndex->dataPrefix());
- processPackages(pkgs, std::move(iconh), nullptr);
- }
-
-From 80ec49446c8d9dc5b48fcde94a73d64752335177 Mon Sep 17 00:00:00 2001
-From: Gleb Popov <6yearold@gmail.com>
-Date: Sun, 15 Feb 2026 19:14:04 +0300
-Subject: [PATCH] IconHandler: set the extra prefix when creating a builtin
- hicolor theme
-
----
- src/iconhandler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/iconhandler.cpp src/iconhandler.cpp
-index d3b1558..e5b68d3 100644
---- src/iconhandler.cpp
-+++ src/iconhandler.cpp
-@@ -370,7 +370,7 @@ IconHandler::IconHandler(
- indexData.resize(f.tellg());
- f.seekg(0, std::ios::beg);
- f.read(reinterpret_cast<char *>(indexData.data()), indexData.size());
-- tmpThemes["hicolor"] = std::make_unique<Theme>("hicolor", indexData);
-+ tmpThemes["hicolor"] = std::make_unique<Theme>("hicolor", indexData, m_extraPrefix);
- }
- }
- }
diff --git a/ports-mgmt/appstream-generator/files/patch-contrib_setup_build__js.sh b/ports-mgmt/appstream-generator/files/patch-contrib_setup_build__js.sh
deleted file mode 100644
index a5a9a63b7787..000000000000
--- a/ports-mgmt/appstream-generator/files/patch-contrib_setup_build__js.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- contrib/setup/build_js.sh.orig 2026-02-10 19:57:51 UTC
-+++ contrib/setup/build_js.sh
-@@ -17,10 +17,10 @@ JS_TARGET=../../data/templates/default/static/js
- [ ! -d "$JS_TARGET" ] && mkdir $JS_TARGET
-
- [ ! -d "$JS_TARGET/jquery" ] && mkdir $JS_TARGET/jquery
--install node_modules/jquery/dist/*.min.js -t $JS_TARGET/jquery
-+install node_modules/jquery/dist/*.min.js $JS_TARGET/jquery
-
- [ ! -d "$JS_TARGET/flot" ] && mkdir $JS_TARGET/flot
--install node_modules/jquery-flot/jquery.flot*.js -t $JS_TARGET/flot
-+install node_modules/jquery-flot/jquery.flot*.js $JS_TARGET/flot
-
- [ ! -d "$JS_TARGET/highlight" ] && mkdir $JS_TARGET/highlight
--install node_modules/highlightjs/*.js -t $JS_TARGET/highlight
-+install node_modules/highlightjs/*.js $JS_TARGET/highlight
diff --git a/ports-mgmt/appstream-generator/files/patch-contrib_setup_meson-install-templates.sh b/ports-mgmt/appstream-generator/files/patch-contrib_setup_meson-install-templates.sh
deleted file mode 100644
index a05bbcd76a2d..000000000000
--- a/ports-mgmt/appstream-generator/files/patch-contrib_setup_meson-install-templates.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- contrib/setup/meson-install-templates.sh.orig 2023-04-20 11:44:26 UTC
-+++ contrib/setup/meson-install-templates.sh
-@@ -3,6 +3,8 @@ cd "$MESON_SOURCE_ROOT"
-
- cd "$MESON_SOURCE_ROOT"
-
--echo "Installing templates..."
--install -d "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/appstream/templates"
--cp -dpru --no-preserve=ownership data/templates/* -t "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/appstream/templates"
-+# FreeBSD: We do this ourselves in the port
-+
-+#echo "Installing templates..."
-+#install -d "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/appstream/templates"
-+#cp -dpru --no-preserve=ownership data/templates/* -t "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/appstream/templates"
diff --git a/ports-mgmt/appstream-generator/pkg-plist b/ports-mgmt/appstream-generator/pkg-plist
index d18858dee07d..f536345b9c08 100644
--- a/ports-mgmt/appstream-generator/pkg-plist
+++ b/ports-mgmt/appstream-generator/pkg-plist
@@ -6,6 +6,7 @@ etc/poudriere.d/hooks/appstream-post-bulk.sh.sample
%%DATADIR%%/templates/debian/main.html
%%DATADIR%%/templates/debian/static/css/highlight.css
%%DATADIR%%/templates/debian/static/css/style.css
+%%DATADIR%%/templates/debian/static/css/theme.css
%%DATADIR%%/templates/debian/static/img
%%DATADIR%%/templates/debian/static/js
%%DATADIR%%/templates/default/base.html
@@ -18,29 +19,22 @@ etc/poudriere.d/hooks/appstream-post-bulk.sh.sample
%%DATADIR%%/templates/default/sections_index.html
%%DATADIR%%/templates/default/static/css/highlight.css
%%DATADIR%%/templates/default/static/css/style.css
+%%DATADIR%%/templates/default/static/css/theme.css
%%DATADIR%%/templates/default/static/img/asgen.png
%%DATADIR%%/templates/default/static/img/cpt-nogui.png
%%DATADIR%%/templates/default/static/img/favicon.png
%%DATADIR%%/templates/default/static/img/no-image.png
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.canvas.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.categories.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.crosshair.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.errorbars.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.fillbetween.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.image.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.navigate.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.pie.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.resize.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.selection.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.stack.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.symbol.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.threshold.js
-%%DATADIR%%/templates/default/static/js/flot/jquery.flot.time.js
-%%DATADIR%%/templates/default/static/js/highlight/highlight.pack.js
-%%DATADIR%%/templates/default/static/js/highlight/highlight.pack.min.js
-%%DATADIR%%/templates/default/static/js/jquery/jquery.min.js
-%%DATADIR%%/templates/default/static/js/jquery/jquery.slim.min.js
+%%DATADIR%%/templates/default/static/js/highlight/LICENSE
+%%DATADIR%%/templates/default/static/js/highlight/README.source.md
+%%DATADIR%%/templates/default/static/js/highlight/core.js
+%%DATADIR%%/templates/default/static/js/highlight/core.min.js
+%%DATADIR%%/templates/default/static/js/highlight/xml.js
+%%DATADIR%%/templates/default/static/js/highlight/yaml.js
+%%DATADIR%%/templates/default/static/js/uplot/LICENSE
+%%DATADIR%%/templates/default/static/js/uplot/README.source.md
+%%DATADIR%%/templates/default/static/js/uplot/uPlot.css
+%%DATADIR%%/templates/default/static/js/uplot/uPlot.iife.js
+%%DATADIR%%/templates/default/static/js/uplot/uPlot.iife.min.js
%%DATADIR%%/templates/ubuntu
%%MANPAGES%%share/man/man1/appstream-generator.1.gz
share/metainfo/org.freedesktop.appstream.generator.metainfo.xml