From nobody Thu Apr 9 16:10:06 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fs4dp1zBTz6Y8xZ for ; Thu, 09 Apr 2026 16:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fs4dp1NwVz4F34 for ; Thu, 09 Apr 2026 16:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775751006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cYhz1HOLNkd5chfZ51dsTSza61UO4nshYpflRkF8GA=; b=Hjl7tlmuVvA2C/6LrXGDY53hq5rzmqDjWFpcabA2WwlZpza5r9gQHKeShu0UhDljHlwCzs 1596RRfNG+dpFABQ4/QYgW2XkFqqRnDh1k60PBRSRSi7ZKz0LNl2J2X4j2XoR6ob0D5T5O U1PNbz7SZia3PdY/dFawhcJFj0RqPQv9oEyFpRFrC5zW75weDW70y3oeNSnmp07vZWNax4 hCEVHDW+By3C8cRfLouGgsIXniV6SVqXI6ST81RiO85UEoRArQ4nIEFepUEGxM5rVMtuGr 5E31bgUC3PZS8nIKz+t+KunxKfkHrEhynkmdIjIzoIiW0XlJrZPf4hzvVk/rog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775751006; a=rsa-sha256; cv=none; b=CT0n3WFzo/qEbu5SfaE5D9WrOBEgIhz89LpWlKVQbaaf8xyxogeZLqqi6s0iDhftRUkG05 z8qQl9xd9uVcYWNNYPnLQOQZNwpG3Vhw39LyqK69uaVwzrBmPCz3jBOhCGkPT1xbmVIhXH nKOyqhRV4osUAkijaUjstkJYhOAoN2C6sl6kifE0x9czQ8yxlQr1tVMSlQYhqBqY531Sp9 Bh3PJFBFmO4cLPq+8iF0ok9CJsrxBpFEnDx9HJvZ5lBuXEPvDNNtxw0A5B/+5ZAiy/rf15 4liOl/nO2jJIhvIrnON1l+xJrzDYP96UukHxach0qryzkpNLXBE+Iq8EeR3Hmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775751006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7cYhz1HOLNkd5chfZ51dsTSza61UO4nshYpflRkF8GA=; b=fmtxGemBFLW30rd3YSJL5hC1cPi/Hylhz4X6TqPMJq7GfwYRc1KV2QbG47mSTvMataFDDC Mu63ZYKRrApO7YrjoqPgERX4a7pv7sUFmFD0JfMl6nUkkvyXI/RATPm8wX6qXbsVTyKqd6 HDMnMoCyYdTfqNlveW85hl1abfoVwyg7mhdzCHdBiWPiO2rtovz1hC/0uqKfZD4w+VoP9N 6uJCEeiaT/U6fh0rWYqge4ZM4DdkiM3jTpUptPMzFCgohSTp5ubMxAJJiJuWtU2MulvHoy 7cG6eqKUOoJSIiYZIc8k6/Z0KxjbmjWYu5a2ekWIgRyP+8fQGNTrNgV7Pa9uDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fs4dp0BhXz1Jxd for ; Thu, 09 Apr 2026 16:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 16:10:06 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 65b43c614d6c - main - ports-mgmt/appstream-generator: Install JavaScript assets List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65b43c614d6c04b84987b0015f40229a40096df4 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 16:10:06 +0000 Message-Id: <69d7cf5e.210bf.75f6f2a7@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=65b43c614d6c04b84987b0015f40229a40096df4 commit 65b43c614d6c04b84987b0015f40229a40096df4 Author: Gleb Popov AuthorDate: 2026-04-09 16:09:46 +0000 Commit: Gleb Popov CommitDate: 2026-04-09 16:10:02 +0000 ports-mgmt/appstream-generator: Install JavaScript assets --- ports-mgmt/appstream-generator/Makefile | 20 ++++++++++++++++++-- ports-mgmt/appstream-generator/distinfo | 4 +++- .../files/patch-contrib_setup_build__js.sh | 16 ++++++++++++++++ ports-mgmt/appstream-generator/pkg-plist | 19 +++++++++++++++++++ 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/ports-mgmt/appstream-generator/Makefile b/ports-mgmt/appstream-generator/Makefile index 30af516c742d..10a455c7e34f 100644 --- a/ports-mgmt/appstream-generator/Makefile +++ b/ports-mgmt/appstream-generator/Makefile @@ -1,8 +1,10 @@ PORTNAME= appstream-generator DISTVERSIONPREFIX= v DISTVERSION= 0.10.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt +MASTER_SITES= LOCAL/arrowd/:assets +DISTFILES= ${_ASSETS_DISTNAME}${EXTRACT_SUFX}:assets MAINTAINER= arrowd@FreeBSD.org COMMENT= Fast AppStream metadata generator @@ -36,12 +38,17 @@ GH_ACCOUNT= ximion OPTIONS_DEFINE= MANPAGES MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt -MESON_ARGS= -Ddownload-js=false -Dbackward=false +MESON_ARGS= -Dbackward=false 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 @@ -56,4 +63,13 @@ post-install: ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${PATCHDIR}/poudriere-hook-bulk.sh ${STAGEDIR}${DATADIR} +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 diff --git a/ports-mgmt/appstream-generator/distinfo b/ports-mgmt/appstream-generator/distinfo index af96c572670d..da39fd9e1659 100644 --- a/ports-mgmt/appstream-generator/distinfo +++ b/ports-mgmt/appstream-generator/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1770817726 +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 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 new file mode 100644 index 000000000000..a5a9a63b7787 --- /dev/null +++ b/ports-mgmt/appstream-generator/files/patch-contrib_setup_build__js.sh @@ -0,0 +1,16 @@ +--- 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/pkg-plist b/ports-mgmt/appstream-generator/pkg-plist index bc5426035f66..3a3c23ae6832 100644 --- a/ports-mgmt/appstream-generator/pkg-plist +++ b/ports-mgmt/appstream-generator/pkg-plist @@ -22,6 +22,25 @@ bin/appstream-generator %%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/ubuntu %%MANPAGES%%share/man/man1/appstream-generator.1.gz share/metainfo/org.freedesktop.appstream.generator.metainfo.xml