diff options
Diffstat (limited to 'textproc/quarto/files')
3 files changed, 24 insertions, 23 deletions
diff --git a/textproc/quarto/files/patch-bin_quarto b/textproc/quarto/files/patch-bin_quarto index 1ccff059d483..3b233b3cfe72 100644 --- a/textproc/quarto/files/patch-bin_quarto +++ b/textproc/quarto/files/patch-bin_quarto @@ -1,4 +1,4 @@ ---- bin/quarto.orig 2024-08-01 13:18:09 UTC +--- bin/quarto.orig 2025-11-06 10:21:37 UTC +++ bin/quarto @@ -1,23 +1,7 @@ #!/usr/bin/env bash @@ -21,12 +21,12 @@ -else - SCRIPT_PATH="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" -fi -+SCRIPT_PATH="%%SCRIPT_PATH%%" -+ARCH_DIR="%%ARCH_DIR%%" ++SCRIPT_PATH="/usr/local/share/quarto/bin" ++ARCH_DIR="amd64" # Check if we are running 'Dev Mode' and if so, override values for devs SCRIPT_BASENAME=$(basename "$SCRIPT_PATH") -@@ -141,14 +125,6 @@ else +@@ -153,14 +137,6 @@ else else NIXARCH=$(uname -m) diff --git a/textproc/quarto/files/patch-bin_vendor_deno-land_x_puppeteer_9-0-2_src_deno_BrowserFetcher.ts b/textproc/quarto/files/patch-bin_vendor_deno-land_x_puppeteer_9-0-2_src_deno_BrowserFetcher.ts deleted file mode 100644 index 7035e319e365..000000000000 --- a/textproc/quarto/files/patch-bin_vendor_deno-land_x_puppeteer_9-0-2_src_deno_BrowserFetcher.ts +++ /dev/null @@ -1,19 +0,0 @@ ---- bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/BrowserFetcher.ts.orig 2024-09-07 16:50:53 UTC -+++ bin/vendor/deno-land/x/puppeteer@9-0-2/src/deno/BrowserFetcher.ts -@@ -197,6 +197,7 @@ export class BrowserFetcher { - const platform = Deno.build.os; - if (platform === "darwin") this._platform = "mac"; - else if (platform === "linux") this._platform = "linux"; -+ else if (platform === "freebsd") this._platform = "linux"; // use _platform=linux for now - else if (platform === "windows") { - this._platform = Deno.build.arch === "x86_64" ? "win64" : "win32"; - } else assert(this._platform, "Unsupported platform: " + Deno.build.os); -@@ -370,6 +371,8 @@ export class BrowserFetcher { - "firefox" - ); - } else if (this._platform === "linux") { -+ executablePath = pathJoin(folderPath, "firefox", "firefox"); -+ } else if (this._platform === "freebsd") { - executablePath = pathJoin(folderPath, "firefox", "firefox"); - } else if (this._platform === "win32" || this._platform === "win64") { - executablePath = pathJoin(folderPath, "firefox", "firefox.exe"); diff --git a/textproc/quarto/files/patch-repo_package_scripts_common_quarto b/textproc/quarto/files/patch-repo_package_scripts_common_quarto new file mode 100644 index 000000000000..fafd744ef844 --- /dev/null +++ b/textproc/quarto/files/patch-repo_package_scripts_common_quarto @@ -0,0 +1,20 @@ +--- repo/package/scripts/common/quarto.orig 2025-11-09 18:33:45 UTC ++++ repo/package/scripts/common/quarto +@@ -143,6 +143,8 @@ if [[ $OSTYPE == 'darwin'* ]]; then + UNAME_ARCH=$(uname -m) + if [[ $UNAME_ARCH == "x86_64" ]]; then + ARCH_DIR=x86_64 ++ elif [[ $UNAME_ARCH == "amd64" ]]; then ++ ARCH_DIR=amd64 + elif [[ $UNAME_ARCH == "arm64" ]]; then + ARCH_DIR=aarch64 + else +@@ -155,6 +157,8 @@ else + NIXARCH=$(uname -m) + if [[ $NIXARCH == "x86_64" ]]; then + ARCH_DIR=x86_64 ++ elif [[ $NIXARCH == "amd64" ]]; then ++ ARCH_DIR=amd64 + elif [[ $NIXARCH == "aarch64" ]]; then + ARCH_DIR=aarch64 + else |