git: 64d69c9a42f2 - main - textproc/quarto: update 1.6.9 → 1.6.15

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 29 Sep 2024 06:29:52 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=64d69c9a42f245e7f8d90c1ef1dbcb6007dd9fe8

commit 64d69c9a42f245e7f8d90c1ef1dbcb6007dd9fe8
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-09-29 05:51:45 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-09-29 06:29:46 +0000

    textproc/quarto: update 1.6.9 → 1.6.15
---
 textproc/quarto/Makefile                  |  9 ++++-----
 textproc/quarto/distinfo                  | 10 +++++-----
 textproc/quarto/files/patch-bin_quarto.js | 13 +++++++++++++
 textproc/quarto/pkg-plist                 | 11 +++++++----
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/textproc/quarto/Makefile b/textproc/quarto/Makefile
index d96650489dc6..fb390652172d 100644
--- a/textproc/quarto/Makefile
+++ b/textproc/quarto/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	quarto
-DISTVERSION=	1.6.9
-PORTREVISION=	5
+DISTVERSION=	1.6.15
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/quarto-dev/quarto-cli/releases/download/v${DISTVERSION}/
 DISTFILES=	quarto-${DISTVERSION}-linux-amd64.tar.gz # same for all architectures
@@ -29,10 +28,10 @@ GH_TUPLE=	quarto-dev:quarto-cli:v${DISTVERSION}:repo/repo # only for tests
 
 XARCH!=		uname -m
 
-PLIST_SUB+=	XARCH=${XARCH}
-
 NO_BUILD=	yes
 
+PLIST_SUB+=	XARCH=${XARCH}
+
 OPTIONS_DEFINE=	R
 
 R_DESC=		Install R dependency
@@ -49,7 +48,7 @@ post-patch:
 		-e 's|%%SCRIPT_PATH%%|${STAGEDIR}${DATADIR}/bin|; s|%%ARCH_DIR%%|${XARCH}|; s|%%REPO%%|${WRKSRC}/repo|; s|$$DENO_DIR|${LOCALBASE}/bin|' \
 		${WRKSRC}/repo/tests/run-tests.sh
 	# replace python3 with the real python executable path
-	${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_CMD}"|' ${WRKSRC}/bin/quarto.js
+	${REINPLACE_CMD} -i '' -e 's|"python3"|"${PYTHON_CMD}"|' ${WRKSRC}/bin/quarto.js
 
 do-install:
 	# copy files from the tarball
diff --git a/textproc/quarto/distinfo b/textproc/quarto/distinfo
index fb8bb5d30f11..2e542c36e702 100644
--- a/textproc/quarto/distinfo
+++ b/textproc/quarto/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1725235576
-SHA256 (quarto-1.6.9-linux-amd64.tar.gz) = 36cdc32d0f15d206b1109812b4c2456adda4ca746e007d72b0dca9c4d4530ec9
-SIZE (quarto-1.6.9-linux-amd64.tar.gz) = 126270170
-SHA256 (quarto-dev-quarto-cli-v1.6.9_GH0.tar.gz) = 77508e19a27ea4e7e8a73e72083823cbfa4ff68529d5ea8f8d0a153f178d98f3
-SIZE (quarto-dev-quarto-cli-v1.6.9_GH0.tar.gz) = 103678731
+TIMESTAMP = 1727584794
+SHA256 (quarto-1.6.15-linux-amd64.tar.gz) = a9241cf10c366a1d0a6eb71bd2436e15349007777b76754f45156203bfff9a01
+SIZE (quarto-1.6.15-linux-amd64.tar.gz) = 126440793
+SHA256 (quarto-dev-quarto-cli-v1.6.15_GH0.tar.gz) = 5f927fff543a6e5236dcb7a7e143fe1ffcc1d35699394014354f8776ffea3958
+SIZE (quarto-dev-quarto-cli-v1.6.15_GH0.tar.gz) = 104984832
diff --git a/textproc/quarto/files/patch-bin_quarto.js b/textproc/quarto/files/patch-bin_quarto.js
new file mode 100644
index 000000000000..c8efb731abea
--- /dev/null
+++ b/textproc/quarto/files/patch-bin_quarto.js
@@ -0,0 +1,13 @@
+- workaround for https://github.com/quarto-dev/quarto-cli/issues/10916
+
+--- bin/quarto.js.orig	2024-08-29 14:15:21 UTC
++++ bin/quarto.js
+@@ -82618,7 +82618,7 @@ async function initYamlIntelligenceResourcesFromFilesy
+ }
+ async function initYamlIntelligenceResourcesFromFilesystem() {
+     const resourceModule = (await import(toFileUrl2(resourcePath("editor/tools/yaml/yaml-intelligence-resources.json")).href, {
+-        assert: {
++        with: {
+             type: "json"
+         }
+     })).default;
diff --git a/textproc/quarto/pkg-plist b/textproc/quarto/pkg-plist
index b948ebbd3c05..ce45527d436c 100644
--- a/textproc/quarto/pkg-plist
+++ b/textproc/quarto/pkg-plist
@@ -59,6 +59,7 @@ bin/quarto
 %%DATADIR%%/bin/vendor/deno-land/x/cache@0-2-12/directories.ts
 %%DATADIR%%/bin/vendor/deno-land/x/puppeteer@9-0-2/mod.ts
 %%DATADIR%%/bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/BrowserFetcher.ts
+%%DATADIR%%/bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/BrowserFetcher.ts.orig
 %%DATADIR%%/bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/BrowserRunner.ts
 %%DATADIR%%/bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/LaunchOptions.ts
 %%DATADIR%%/bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/Launcher.ts
@@ -369,8 +370,8 @@ bin/quarto
 %%DATADIR%%/share/deno_std/cache/deps/https/deno.land/09977ff606053ea2763c50f037f946f6c1b085c44d467315211086451113a899.metadata.json
 %%DATADIR%%/share/deno_std/cache/deps/https/deno.land/09d520bcd080cd973515098a4097e278cd3a76501f1683853f0580b68581567c
 %%DATADIR%%/share/deno_std/cache/deps/https/deno.land/09d520bcd080cd973515098a4097e278cd3a76501f1683853f0580b68581567c.metadata.json
-%%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591311a644c81
-%%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591311a644c81.metadata.json
+%%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591%%PYTHON_SUFFIX%%a644c81
+%%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591%%PYTHON_SUFFIX%%a644c81.metadata.json
 %%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0aaac2d3cda1e7c8eb827f67f91b0a27b8660a33a938460d4da024ea6d5c9a10
 %%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0aaac2d3cda1e7c8eb827f67f91b0a27b8660a33a938460d4da024ea6d5c9a10.metadata.json
 %%DATADIR%%/share/deno_std/cache/deps/https/deno.land/0ce8d5cc096353f89b27eafa713cee13334f3b1947242436538da087789ccc7b
@@ -1151,8 +1152,8 @@ bin/quarto
 %%DATADIR%%/share/deno_std/cache/gen/https/deno.land/09977ff606053ea2763c50f037f946f6c1b085c44d467315211086451113a899.meta
 %%DATADIR%%/share/deno_std/cache/gen/https/deno.land/09d520bcd080cd973515098a4097e278cd3a76501f1683853f0580b68581567c.js
 %%DATADIR%%/share/deno_std/cache/gen/https/deno.land/09d520bcd080cd973515098a4097e278cd3a76501f1683853f0580b68581567c.meta
-%%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591311a644c81.js
-%%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591311a644c81.meta
+%%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591%%PYTHON_SUFFIX%%a644c81.js
+%%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0a15c236cad4497db954ed598706023d4007e93fe77925b97cc591%%PYTHON_SUFFIX%%a644c81.meta
 %%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0aaac2d3cda1e7c8eb827f67f91b0a27b8660a33a938460d4da024ea6d5c9a10.js
 %%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0aaac2d3cda1e7c8eb827f67f91b0a27b8660a33a938460d4da024ea6d5c9a10.meta
 %%DATADIR%%/share/deno_std/cache/gen/https/deno.land/0ce8d5cc096353f89b27eafa713cee13334f3b1947242436538da087789ccc7b.js
@@ -2972,6 +2973,7 @@ bin/quarto
 %%DATADIR%%/share/lua-types/pandoc/global.lua
 %%DATADIR%%/share/lua-types/pandoc/inlines.lua
 %%DATADIR%%/share/lua-types/pandoc/layout.lua
+%%DATADIR%%/share/lua-types/pandoc/log.lua
 %%DATADIR%%/share/lua-types/pandoc/mediabag.lua
 %%DATADIR%%/share/lua-types/pandoc/meta.lua
 %%DATADIR%%/share/lua-types/pandoc/options.lua
@@ -3208,6 +3210,7 @@ bin/quarto
 %%DATADIR%%/share/schema/extension.yml
 %%DATADIR%%/share/schema/format-aliases.yml
 %%DATADIR%%/share/schema/groups.yml
+%%DATADIR%%/share/schema/json-schemas.json
 %%DATADIR%%/share/schema/project.yml
 %%DATADIR%%/share/schema/schema.yml
 %%DATADIR%%/share/scripts/check-usage.sh