From nobody Sun Sep 29 06:29:52 2024 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 4XGZ7N5qrJz5XCPr; Sun, 29 Sep 2024 06:29:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XGZ7N5HyZz4ptZ; Sun, 29 Sep 2024 06:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727591392; 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=/xvmU+DCgEYCuaLX9ZUmrgUBopOM3NwOaHBvWSmbMT0=; b=R9UHskJ+NCtxMnmePEb+xdaaRMuPSVy+iqgJZx3YL19q9MFo4xY/tni87UijGxAyHCep69 U9+9rYwPQwhADtYP4M4bYwoSLoB30iwTVJBxjOauZjQ1lvV4nEA6everMLc0LfAFcVr9v2 oznTZxmzNr+2v9T9ENmH2PUzfAwvn6nUshq11eG1M2Affe4xrqnd2CjoAVZelSc4Tx9qW9 p/QxWLtfyyKAaGuKQpatdNTTb6ryINUGPpzPCZWT5Fw6/k+jJMMF+kF7XQ9/ZiH40Q1CEF vDkcCPlyj12haFF2HJUXw0gok2WB+ZqpEHqURsGsGAwxDlrrbcGVQGqOpd/veQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727591392; 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=/xvmU+DCgEYCuaLX9ZUmrgUBopOM3NwOaHBvWSmbMT0=; b=EdfsdBJY91GH26a9sXi1hQZXrDFmKBcjGUpwV07ZXXRpPP1Wq22wLqQekUv/52undRIvHY T46vrIu9tAVS2KZWtdoxNDM5s4x1klUtVlV7kWDYJIsL+eqiSSrPrddRdBkOHiZOl+Etbb VLg6Yso2C8/BHnhfZORVGRCscWOELXqSWXMCmDjADse5dcO3TyHoha0j/g0KfR6wXZulHA tQKH/ZRWSbU2yIivH/zRS1w+H+yZ/rDh7U7y8b4p3LKoN/FxANoz/djJJpgeYcUN8sXNg8 +XTXsMdPjO4MX1tHR/M0BqbY00yrBpVyLkCKakTY4f6oSl+A389Nuh0RWiy+DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727591392; a=rsa-sha256; cv=none; b=uJ6JHoQkO3XEc58NmNPlQkbFOTuOx1uZa1yKLMU2M8H1i+bxUI1/MkXNvp6Znq8nIZ6XH6 D51OmDyJUffAMkoEVEiwMiaezdU9MHaxW6OzlXFdVeezMQuynOTQTw69swv33IB8pVDxdl wwpzszBjRZAdz8+xzzsHnUxv9J+WXe4olxU6EdwVgNc8Q+QNzSMM05B3xkI5i6KAKnwqFi gQqN108iEKc10FVmnIZaP4sraqkO921BcGQennA0D1A0u2jviPf4GsB35r4N9+ziXmGUJH RpREMb+XeWXVrP1ed+uYmCpsF0hBlCDbA6Jmo8GJZ9BZMNQbQxgu4gqtZ/uaRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XGZ7N4v7szxf3; Sun, 29 Sep 2024 06:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48T6Tqle017843; Sun, 29 Sep 2024 06:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48T6Tqdc017840; Sun, 29 Sep 2024 06:29:52 GMT (envelope-from git) Date: Sun, 29 Sep 2024 06:29:52 GMT Message-Id: <202409290629.48T6Tqdc017840@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 64d69c9a42f2 - main - textproc/quarto: update 1.6.9 =?utf-8?Q?=E2=86=92?= 1.6.15 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64d69c9a42f245e7f8d90c1ef1dbcb6007dd9fe8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=64d69c9a42f245e7f8d90c1ef1dbcb6007dd9fe8 commit 64d69c9a42f245e7f8d90c1ef1dbcb6007dd9fe8 Author: Yuri Victorovich AuthorDate: 2024-09-29 05:51:45 +0000 Commit: Yuri Victorovich 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