bgme/lilac
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

quarto-cli: auto updated to 1.6.39-1

Browse source
This commit is contained in:
Lilac 2024-12-20 16:11:08 +00:00
parent d2872a1ae8
commit 5321a509c0
4 changed files with 100 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
repo/quarto-cli/000_deno_1.41.diff
View file

@ -1,12 +0,0 @@
diff -ur quarto-cli-1.4.551.orig/src/project/types/website/website-search.ts quarto-cli-1.4.551/src/project/types/website/website-search.ts
--- quarto-cli-1.4.551.orig/src/project/types/website/website-search.ts 2024-03-06 11:25:25.000000000 +1300
+++ quarto-cli-1.4.551/src/project/types/website/website-search.ts 2024-03-06 22:04:38.498170207 +1300
@@ -8,7 +8,7 @@
import { basename, join, relative } from "path/mod.ts";
// currently not building the index here so not using fuse
-// @deno-types="fuse/dist/fuse.d.ts"
+//
// import Fuse from "fuse/dist/fuse.esm.min.js";
import { DOMParser, Element, initDenoDom } from "../../../core/deno-dom.ts";

19
repo/quarto-cli/000_pandoc_lua.diff Normal file
View file

@ -0,0 +1,19 @@
--- quarto-cli-1.5.55/src/command/render/pandoc.ts.original 2024-07-27 22:49:08.770086319 +1200
+++ quarto-cli-1.5.55/src/command/render/pandoc.ts 2024-07-27 22:49:23.266719276 +1200
@@ -235,16 +235,6 @@
pandocEnv["QUARTO_TRACE_FILTERS"] = traceFilters + traceCountSuffix;
}
}
-
- // https://github.com/quarto-dev/quarto-cli/issues/8274
- // do not use the default LUA_CPATH, as it will cause pandoc to
- // load the system lua libraries, which may not be compatible with
- // the lua version we are using
- if (Deno.env.get("QUARTO_LUA_CPATH") !== undefined) {
- pandocEnv["LUA_CPATH"] = getEnv("QUARTO_LUA_CPATH");
- } else {
- pandocEnv["LUA_CPATH"] = "";
- }
};
// compute cwd for render

18
repo/quarto-cli/001_deno_1.44.diff Normal file
View file

@ -0,0 +1,18 @@
--- quarto-cli-1.4.556.original/src/core/deno-dom.ts 2024-06-27 08:15:10.000000000 +1200
+++ quarto-cli-1.4.556/src/core/deno-dom.ts 2024-06-27 10:02:37.434536479 +1200
@@ -98,13 +98,13 @@
const genericParse = (
parser: (
srcBuf: Uint8Array,
- srcLength: number,
+ srcLength: bigint,
returnBuf: Uint8Array,
) => void,
srcHtml: string,
): string => {
const encodedHtml = utf8Encoder.encode(srcHtml);
- parser(encodedHtml, encodedHtml.length, returnBufSizeLen);
+ parser(encodedHtml, BigInt(encodedHtml.length), returnBufSizeLen);
const outBufSize = Number(
new DataView(returnBufSizeLenRaw).getBigUint64(0, !isBigEndian),

122
repo/quarto-cli/PKGBUILD
View file

@ -1,85 +1,89 @@
# Maintainer: Aleksandr Beliaev <trap000d at gmail dot com> # Maintainer: Harriet O'Brien <harrietobrien at protonmail dot com>
# Contributor: Aleksandr Beliaev <trap000d at gmail dot com>
pkgname=quarto-cli pkgname=quarto-cli
pkgver=1.4.555 pkgver=1.6.39
pkgrel=1 pkgrel=1
_pkgbasename=quarto-cli #_pkgbasename=quarto-cli
_denodomver="0.1.35-alpha-artifacts" _denodomver="0.1.41-alpha-artifacts"
_denover="2.0.4-1"
_deno_commit=b7c282d
_deno_arch="deno-x86_64-unknown-linux-gnu" _deno_arch="deno-x86_64-unknown-linux-gnu"
pkgdesc="Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org)." pkgdesc="Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org)"
arch=('x86_64' 'i686') arch=('x86_64')
depends=('nodejs' 'deno' 'dart-sass' 'esbuild' 'pandoc' 'lua-lpeg' 'typst') depends=("nodejs"
makedepends=('git' 'npm' 'rust') "deno"
"dart-sass"
"esbuild"
"pandoc"
"lua-lpeg"
"typst")
makedepends=("git"
"npm"
"rust")
url="https://quarto.org/" url="https://quarto.org/"
license=('MIT') license=("MIT")
provides=("quarto") provides=("quarto")
conflicts=('quarto-cli-bin' 'quarto-cli-pre-release' 'quarto-cli-bin-pre-release' 'quarto-cli-git') conflicts=("quarto-cli-bin"
"quarto-cli-pre-release"
"quarto-cli-bin-pre-release"
"quarto-cli-git")
options=(!strip) options=(!strip)
source=("https://github.com/quarto-dev/$pkgname/releases/download/v$pkgver/$provides-$pkgver-linux-amd64.tar.gz"
source=("${_pkgbasename}-${pkgver}.tar.gz::https://github.com/quarto-dev/quarto-cli/archive/refs/tags/v${pkgver}.tar.gz" "https://archive.archlinux.org/packages/d/deno/deno-$_denover-x86_64.pkg.tar.zst"
"https://github.com/b-fuze/deno-dom/archive/refs/tags/v${_denodomver}.tar.gz" "https://github.com/b-fuze/deno-dom/archive/refs/tags/v$_denodomver.tar.gz"
"000_deno_1.41.diff" "000_pandoc_lua.diff")
) sha256sums=("d797c796713a57c14d8115f49a45d626a16478697096a0421f2d2d980e5f9d4a"
"897c81da3ca3cb1c236f111d237abfcc973cc0e7a4089ca3f21997e17cb0a9a2"
sha256sums=('0e8ca6e1d5578011a74339890f0b6a2a7cbb0f822f24e0fbdfd4285ab04fab4d' "5ab1a73e73b9edf9d2c81e655658d970e6212497a5368d8f0bc8613bbdf8d91d"
'14fb042a6912041b9fda91fd643cf278764d075bc9539aa1e107475915cd896c' "0f27dff1e1b16e4f2f21c43b838aaae18bf9f82339eb65878b24de128f89450f")
'd09e82634e6b64359c54d3a99b8abb4503cea3c62ef30b46d02ffcfde718d36c')
prepare() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
patch -p1 < ../000_deno_1.41.diff
}
build() { build() {
cd "${srcdir}/${_pkgbasename}-${pkgver}" cd "$srcdir/$provides-$pkgver/"
source configuration # source configuration
source "${srcdir}/${_pkgbasename}-${pkgver}/package/src/set_package_paths.sh" # source "$srcdir/$provides-$pkgver/pkg/src/set_package_paths.sh"
export QUARTO_VERSION=${pkgver} export QUARTO_VERSION=$pkgver
export QUARTO_VENDOR_BINARIES='false' export QUARTO_VENDOR_BINARIES="false"
export QUARTO_NO_SYMLINK='true' export QUARTO_NO_SYMLINK="true"
export DENO_DOM_PLUGIN="${srcdir}/deno-dom-${_denodomver}/target/release/libplugin.so" export DENO_DOM_PLUGIN="$srcdir/deno-dom-$_denodomver/target/release/libplugin.so"
if [ -z "$QUARTO_DENO" ]; then if [ -z "$QUARTO_DENO" ]; then
export QUARTO_DENO=$SCRIPT_PATH/../dist/bin/tools/deno export QUARTO_DENO=$SCRIPT_PATH/../dist/bin/tools/deno
fi fi
# keep deno cache directory out of default $home/.cache/deno # Keep deno cache directory out of default $home/.cache/deno
export DENO_DIR="${srcdir}/${_pkgbasename}-${pkgver}/package/cache" export DENO_DIR="$srcdir/$provides-$pkgver/package/cache"
# Rust optimizations # Rust optimizations
export CARGO_HOME="${srcdir}/${_pkgbasename}-${pkgver}/.cargo" export CARGO_HOME="$srcdir/$provides-$pkgver/.cargo"
export RUSTFLAGS="-C strip=symbols" export RUSTFLAGS="-C strip=symbols"
mkdir -p package/dist/bin/tools/${arch}/dart-sass mkdir -p package/dist/bin/tools/$arch/dart-sass
mkdir -p package/dist/bin/tools/${arch}/deno_dom mkdir -p package/dist/bin/tools/$arch/deno_dom
cp /usr/bin/deno package/dist/bin/tools cp $srcdir/usr/bin/deno package/dist/bin/tools
ln -sfT /usr/bin/pandoc package/dist/bin/tools/${arch}/pandoc ln -sfT /usr/bin/pandoc package/dist/bin/tools/$arch/pandoc
ln -sfT /usr/bin/sass package/dist/bin/tools/${arch}/dart-sass/sass ln -sfT /usr/bin/sass package/dist/bin/tools/$arch/dart-sass/sass
ln -sfT /usr/bin/esbuild package/dist/bin/tools/${arch}/esbuild ln -sfT /usr/bin/esbuild package/dist/bin/tools/$arch/esbuild
msg "Building Deno Stdlib..." msg "Building Deno Stdlib..."
cd "${srcdir}/deno-dom-${_denodomver}" cd "$srcdir/deno-dom-$_denodomver"
cargo build --release cargo build --release
cd "${srcdir}/${_pkgbasename}-${pkgver}" cd "$srcdir/$provides-$pkgver/package/dist/bin/tools"
# unsure if it's needed at all deno run --unstable --allow-env --allow-read --allow-write --allow-run --allow-net --allow-ffi --importmap=../../../../share/conf/jsx-import-map.json ../../../../share/conf/jsx-runtime.ts prepare-dist --log-level info
# package/dist/bin/tools/deno run --allow-all package/src/common/create-deno-config.ts > deno.jsonc
cd package/src
#../dist/bin/tools/deno run --unstable --allow-env --allow-read --allow-write --allow-run --allow-net --allow-ffi --importmap=../../src/dev_import_map.json bld.ts configure --log-level info
../dist/bin/tools/deno run --unstable --allow-env --allow-read --allow-write --allow-run --allow-net --allow-ffi --importmap=../../src/import_map.json bld.ts prepare-dist --log-level info
} }
package() { package() {
cd "${srcdir}/${_pkgbasename}-${pkgver}" cd "$srcdir/$provides-$pkgver"
mkdir -p package/pkg-working/bin/tools/${arch}/dart-sass mkdir -p package/pkg-working/bin/tools/$arch/dart-sass
mkdir -p package/pkg-working/bin/tools/${arch}/deno_dom mkdir -p package/pkg-working/bin/tools/$arch/deno_dom
cp "${srcdir}/deno-dom-${_denodomver}/target/release/libplugin.so" "${srcdir}/${_pkgbasename}-${pkgver}/package/pkg-working/bin/tools/${arch}/deno_dom" cp "$srcdir/deno-dom-$_denodomver/target/release/libplugin.so" "$srcdir/$provides-$pkgver/package/pkg-working/bin/tools/$arch/deno_dom"
# keep legacy pandoc location, see https://github.com/quarto-dev/quarto/issues/237 # keep legacy pandoc location, see https://github.com/quarto-dev/quarto/issues/237
ln -sfT /usr/bin/pandoc package/pkg-working/bin/tools/pandoc ln -sfT /usr/bin/pandoc package/pkg-working/bin/tools/pandoc
ln -sfT /usr/bin/pandoc package/pkg-working/bin/tools/${arch}/pandoc ln -sfT /usr/bin/pandoc package/pkg-working/bin/tools/$arch/pandoc
ln -sfT /usr/bin/deno package/pkg-working/bin/tools/${arch}/deno ln -sfT /usr/bin/deno package/pkg-working/bin/tools/$arch/deno
ln -sfT /usr/bin/sass package/pkg-working/bin/tools/${arch}/dart-sass/sass ln -sfT /usr/bin/sass package/pkg-working/bin/tools/$arch/dart-sass/sass
ln -sfT /usr/bin/esbuild package/pkg-working/bin/tools/${arch}/esbuild ln -sfT /usr/bin/esbuild package/pkg-working/bin/tools/$arch/esbuild
ln -sfT /usr/bin/typst package/pkg-working/bin/tools/${arch}/typst ln -sfT /usr/bin/typst package/pkg-working/bin/tools/$arch/typst
install -d ${pkgdir}/usr/{bin,lib/${_pkgbasename}/{bin,share}} install -d $pkgdir/usr/{bin,lib/$pkgname/{bin,share}}
cp -R package/pkg-working/* "${pkgdir}/usr/lib/${_pkgbasename}" cp -R package/pkg-working/* "$pkgdir/usr/lib/$pkgname"
ln -sf "/usr/lib/${_pkgbasename}/bin/quarto" "$pkgdir/usr/bin/quarto" ln -sf "/usr/lib/$pkgname/bin/quarto" "$pkgdir/usr/bin/quarto"
} }