summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandr Beliaev2023-05-27 12:53:42 +1200
committerAleksandr Beliaev2023-05-27 12:53:42 +1200
commita00cc041126a133f08b8c365b70ef85e596c86a6 (patch)
tree3a7fbd227a1100890c77c7c122a71a803b12678e
parent99951c9b8564b36fa6cdcaafd0769a0215d776d6 (diff)
downloadaur-a00cc041126a133f08b8c365b70ef85e596c86a6.tar.gz
v1.4.96.r1.gf23b0ad34
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD62
2 files changed, 44 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4984847bafd1..e98ec8218707 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = quarto-cli-git
- pkgdesc = Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org). This package tracks main branch of Quarto.
- pkgver = 1.3.34.r3.g8c4b66a2a
- pkgrel = 3
+ pkgdesc = Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org). This package tracks main git branch of Quarto.
+ pkgver = 1.4.96.r1.gf23b0ad34
+ pkgrel = 1
url = https://quarto.org/
arch = x86_64
arch = i686
@@ -10,7 +10,7 @@ pkgbase = quarto-cli-git
makedepends = npm
makedepends = rust
depends = nodejs
- depends = deno>=1.28
+ depends = deno
depends = dart-sass
depends = esbuild
depends = pandoc
@@ -21,8 +21,12 @@ pkgbase = quarto-cli-git
conflicts = quarto-cli-pre-release
options = !strip
source = git+https://github.com/quarto-dev/quarto-cli.git
- source = https://github.com/b-fuze/deno-dom/archive/refs/tags/v0.1.23-alpha-artifacts.tar.gz
+ source = https://github.com/b-fuze/deno-dom/archive/refs/tags/v0.1.35-alpha-artifacts.tar.gz
+ source = https://github.com/c4spar/deno-cliffy/archive/refs/tags/v0.25.7.tar.gz
+ source = https://github.com/denoland/deno_std/archive/refs/tags/0.170.0.tar.gz
sha256sums = SKIP
- sha256sums = 9eeb81df4e674bb5dea1a371b0e1731b42edd81f212c395e0a25071ac16c27cd
+ sha256sums = 14fb042a6912041b9fda91fd643cf278764d075bc9539aa1e107475915cd896c
+ sha256sums = 519709be1dfcf4743930b7f21a513d8fbf3663380020eac8ba629081395f6cc0
+ sha256sums = 369bc68b848532bedcb786a8fce5e52000624b9262f05ceeeb16bc851b6cf752
pkgname = quarto-cli-git
diff --git a/PKGBUILD b/PKGBUILD
index 7cb0f815e6e6..5888321e7ba4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,18 @@
# Maintainer: Aleksandr Beliaev <trap000d at gmail dot com>
pkgname=quarto-cli-git
-pkgver=1.3.34.r3.g8c4b66a2a
-pkgrel=3
+pkgver=1.4.96.r1.gf23b0ad34
+pkgrel=1
+
_pkgbasename=quarto-cli
-_denodomver="0.1.23-alpha-artifacts"
+_denodomver="0.1.35-alpha-artifacts"
_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). This package tracks main branch of Quarto."
+_denocliffyver="0.25.7"
+_denostdver="0.170.0"
+
+pkgdesc="Quarto is an open-source scientific and technical publishing system built on [Pandoc](https://pandoc.org). This package tracks main git branch of Quarto."
arch=('x86_64' 'i686')
-depends=('nodejs' 'deno>=1.28' 'dart-sass' 'esbuild' 'pandoc' 'lua-lpeg')
+depends=('nodejs' 'deno' 'dart-sass' 'esbuild' 'pandoc' 'lua-lpeg')
makedepends=('git' 'npm' 'rust')
url="https://quarto.org/"
license=('MIT')
@@ -18,11 +22,14 @@ options=(!strip)
source=("git+https://github.com/quarto-dev/quarto-cli.git"
"https://github.com/b-fuze/deno-dom/archive/refs/tags/v${_denodomver}.tar.gz"
+ "https://github.com/c4spar/deno-cliffy/archive/refs/tags/v${_denocliffyver}.tar.gz"
+ "https://github.com/denoland/deno_std/archive/refs/tags/${_denostdver}.tar.gz"
)
sha256sums=('SKIP'
- '9eeb81df4e674bb5dea1a371b0e1731b42edd81f212c395e0a25071ac16c27cd')
-
+ '14fb042a6912041b9fda91fd643cf278764d075bc9539aa1e107475915cd896c'
+ '519709be1dfcf4743930b7f21a513d8fbf3663380020eac8ba629081395f6cc0'
+ '369bc68b848532bedcb786a8fce5e52000624b9262f05ceeeb16bc851b6cf752')
pkgver() {
cd ${_pkgbasename}
@@ -33,47 +40,46 @@ build() {
cd "${srcdir}/${_pkgbasename}"
source configuration
source "${srcdir}/${_pkgbasename}/package/src/set_package_paths.sh"
- export QUARTO_VERSION=${pkgver%.*.*.*}
+ export QUARTO_VERSION=${pkgver}
+ export QUARTO_VENDOR_BINARIES='false'
+ export DENO_DOM_PLUGIN="${srcdir}/deno-dom-${_denodomver}/target/release/libplugin.so"
if [ -z "$QUARTO_DENO" ]; then
export QUARTO_DENO=$SCRIPT_PATH/../dist/bin/tools/deno
fi
#mkdir -p package/dist/bin/tools/${_deno_arch}/{deno_dom,dart-sass}
mkdir -p package/dist/bin/tools/${_deno_arch}
- #mkdir -p package/dist/bin/tools/dart-sass
+ mkdir -p package/dist/bin/tools/dart-sass
+ mkdir -p package/dist/bin/tools/deno_dom
cp /usr/bin/deno package/dist/bin/tools
-
- 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
+ ln -sfT /usr/bin/pandoc package/dist/bin/tools/pandoc
+ ln -sfT /usr/bin/sass package/dist/bin/tools/dart-sass/sass
+ ln -sfT /usr/bin/esbuild package/dist/bin/tools/esbuild
msg "Building Deno Stdlib..."
cd "${srcdir}/deno-dom-${_denodomver}"
cargo build --release
+ cd "${srcdir}/${_pkgbasename}/package/src"
+ ../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() {
cd "${srcdir}/${_pkgbasename}"
-
- msg "Tidying up..."
- ## 1. We have got pandoc already installed in /usr/bin
- rm package/dist/bin/tools/pandoc
- ln -sfT /usr/bin/pandoc package/dist/bin/tools/pandoc
- ## And deno
- rm package/dist/bin/tools/deno
- ln -sfT /usr/bin/deno package/dist/bin/tools/${_deno_arch}/deno
- ## And dart-sass
- rm -rf package/dist/bin/tools/dart-sass/*
- ln -sfT /usr/bin/sass package/dist/bin/tools/dart-sass/sass
- ## as well as esbuild
- rm package/dist/bin/tools/esbuild
- ln -sfT /usr/bin/esbuild package/dist/bin/tools/esbuild
+ mkdir -p package/pkg-working/bin/tools/${_deno_arch}
+ mkdir -p package/pkg-working/bin/tools/dart-sass
+ mkdir -p package/pkg-working/bin/tools/deno_dom
+ cp "${srcdir}/deno-dom-${_denodomver}/target/release/libplugin.so" "${srcdir}/${_pkgbasename}/package/pkg-working/bin/tools/deno_dom"
+ ln -sfT /usr/bin/pandoc package/pkg-working/bin/tools/pandoc
+ ln -sfT /usr/bin/deno package/pkg-working/bin/tools/${_deno_arch}/deno
+ ln -sfT /usr/bin/sass package/pkg-working/bin/tools/dart-sass/sass
+ ln -sfT /usr/bin/esbuild package/pkg-working/bin/tools/esbuild
## 2. Remove symlinks created by build script in ~/bin and ~/.local/bin directories
rm -f "$HOME/.local/bin/quarto"
rm -f "$HOME/bin/quarto"
install -d ${pkgdir}/usr/{bin,lib/${_pkgbasename}/{bin,share}}
- cp -R package/dist/* "${pkgdir}/usr/lib/${_pkgbasename}"
+ cp -R package/pkg-working/* "${pkgdir}/usr/lib/${_pkgbasename}"
ln -sf "/usr/lib/${_pkgbasename}/bin/quarto" "$pkgdir/usr/bin/quarto"
}