Compare commits

..

No commits in common. "7e43ec2139cedab74bc65c82f6099059381334cd" and "1d6685992fb676a549062c3f440800ff8dbd3d9e" have entirely different histories.

8 changed files with 171 additions and 209 deletions

View file

@ -1,22 +1,25 @@
# Maintainer: Owen Trigueros <owentrigueros@gmail.com> # Maintainer: Owen Trigueros <owentrigueros@gmail.com>
pkgname=httpdirfs pkgname=httpdirfs
pkgver=1.2.7 pkgver=1.2.5
pkgrel=1 pkgrel=2
pkgdesc="A filesystem which allows you to mount HTTP directory listings" pkgdesc="A filesystem which allows you to mount HTTP directory listings"
arch=('x86_64') arch=('x86_64')
url="https://github.com/fangfufu/httpdirfs" url="https://github.com/fangfufu/httpdirfs"
license=('GPL') license=('GPL')
depends=('gumbo-parser' 'fuse3' 'curl' 'expat' 'util-linux-libs' 'openssl') depends=('gumbo-parser' 'fuse2' 'curl' 'expat')
makedepends=('meson' 'help2man' 'doxygen' 'graphviz') makedepends=('help2man' 'doxygen' 'graphviz')
source=("$pkgname-$pkgver.tar.gz::https://github.com/fangfufu/$pkgname/archive/$pkgver.tar.gz") source=("$pkgname-$pkgver.tar.gz::https://github.com/fangfufu/$pkgname/archive/$pkgver.tar.gz")
md5sums=("1e7d3ed7850d7a629e31b635e5954046") md5sums=("77910de057b196ed7b3714f7a0698203")
build() { build() {
arch-meson "$pkgname-$pkgver" build cd "$pkgname-$pkgver"
meson compile -C build make man
make doc
make
} }
package() { package() {
meson install -C build --destdir "$pkgdir" cd "$pkgname-$pkgver"
make prefix=/usr DESTDIR="$pkgdir" install
} }

View file

@ -0,0 +1,12 @@
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";

View file

@ -1,19 +0,0 @@
--- 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

View file

@ -1,18 +0,0 @@
--- 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),

View file

@ -1,89 +1,85 @@
# Maintainer: Harriet O'Brien <harrietobrien at protonmail dot com> # Maintainer: Aleksandr Beliaev <trap000d at gmail dot com>
# Contributor: Aleksandr Beliaev <trap000d at gmail dot com>
pkgname=quarto-cli pkgname=quarto-cli
pkgver=1.6.39 pkgver=1.4.555
pkgrel=1 pkgrel=1
#_pkgbasename=quarto-cli _pkgbasename=quarto-cli
_denodomver="0.1.41-alpha-artifacts" _denodomver="0.1.35-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') arch=('x86_64' 'i686')
depends=("nodejs" depends=('nodejs' 'deno' 'dart-sass' 'esbuild' 'pandoc' 'lua-lpeg' 'typst')
"deno" makedepends=('git' 'npm' 'rust')
"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" conflicts=('quarto-cli-bin' 'quarto-cli-pre-release' 'quarto-cli-bin-pre-release' 'quarto-cli-git')
"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"
"https://archive.archlinux.org/packages/d/deno/deno-$_denover-x86_64.pkg.tar.zst" source=("${_pkgbasename}-${pkgver}.tar.gz::https://github.com/quarto-dev/quarto-cli/archive/refs/tags/v${pkgver}.tar.gz"
"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_pandoc_lua.diff") "000_deno_1.41.diff"
sha256sums=("d797c796713a57c14d8115f49a45d626a16478697096a0421f2d2d980e5f9d4a" )
"897c81da3ca3cb1c236f111d237abfcc973cc0e7a4089ca3f21997e17cb0a9a2"
"5ab1a73e73b9edf9d2c81e655658d970e6212497a5368d8f0bc8613bbdf8d91d" sha256sums=('0e8ca6e1d5578011a74339890f0b6a2a7cbb0f822f24e0fbdfd4285ab04fab4d'
"0f27dff1e1b16e4f2f21c43b838aaae18bf9f82339eb65878b24de128f89450f") '14fb042a6912041b9fda91fd643cf278764d075bc9539aa1e107475915cd896c'
'd09e82634e6b64359c54d3a99b8abb4503cea3c62ef30b46d02ffcfde718d36c')
prepare() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
patch -p1 < ../000_deno_1.41.diff
}
build() { build() {
cd "$srcdir/$provides-$pkgver/" cd "${srcdir}/${_pkgbasename}-${pkgver}"
# source configuration source configuration
# source "$srcdir/$provides-$pkgver/pkg/src/set_package_paths.sh" source "${srcdir}/${_pkgbasename}-${pkgver}/package/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/$provides-$pkgver/package/cache" export DENO_DIR="${srcdir}/${_pkgbasename}-${pkgver}/package/cache"
# Rust optimizations # Rust optimizations
export CARGO_HOME="$srcdir/$provides-$pkgver/.cargo" export CARGO_HOME="${srcdir}/${_pkgbasename}-${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 $srcdir/usr/bin/deno package/dist/bin/tools cp /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/$provides-$pkgver/package/dist/bin/tools" cd "${srcdir}/${_pkgbasename}-${pkgver}"
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 # unsure if it's needed at all
# 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/$provides-$pkgver" cd "${srcdir}/${_pkgbasename}-${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/$provides-$pkgver/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"
# 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/$pkgname/{bin,share}} install -d ${pkgdir}/usr/{bin,lib/${_pkgbasename}/{bin,share}}
cp -R package/pkg-working/* "$pkgdir/usr/lib/$pkgname" cp -R package/pkg-working/* "${pkgdir}/usr/lib/${_pkgbasename}"
ln -sf "/usr/lib/$pkgname/bin/quarto" "$pkgdir/usr/bin/quarto" ln -sf "/usr/lib/${_pkgbasename}/bin/quarto" "$pkgdir/usr/bin/quarto"
} }

View file

@ -1,7 +1,7 @@
# Maintainer: kyndair <kyndair at gmail dot com> # Maintainer: kyndair <kyndair at gmail dot com>
pkgname=sacd-extract-git pkgname=sacd-extract-git
_pkgname=sacd-ripper _pkgname=sacd-ripper
pkgver=0.3.9.3.r117.g96084ff pkgver=0.3.9.3.r107.g01c90dd
pkgrel=1 pkgrel=1
pkgdesc="Extract DSDIFF files, DSF files or RAW ISO from SACD" pkgdesc="Extract DSDIFF files, DSF files or RAW ISO from SACD"
arch=('i686' 'pentium4' 'x86_64') arch=('i686' 'pentium4' 'x86_64')

View file

@ -1,23 +1,21 @@
# Maintainer: # Maintainer:
: ${CARGO_HOME:=$SRCDEST/cargo-home}
: ${_nodeversion:=18}
_pkgname="vdhcoapp" _pkgname="vdhcoapp"
pkgname="$_pkgname-git" pkgname="$_pkgname-git"
pkgver=2.0.20.r4.gf8cc614 pkgver=2.0.19.r4.g0b40d3e
pkgrel=1 pkgrel=4
pkgdesc="Companion application for Video DownloadHelper browser add-on" pkgdesc="Companion application for Video DownloadHelper browser add-on"
url="https://github.com/aclap-dev/vdhcoapp" url="https://github.com/aclap-dev/vdhcoapp"
license=('GPL-2.0-or-later') license=('GPL-2.0-or-later')
arch=('x86_64') arch=('x86_64')
_source_vdhcoapp() {
makedepends=( makedepends=(
'esbuild' 'esbuild'
'jq' 'jq'
'nvm' # AUR
'yq' 'yq'
# AUR
'nvm'
) )
options=('emptydirs' '!strip' '!debug') options=('emptydirs' '!strip' '!debug')
@ -29,11 +27,18 @@ _source_vdhcoapp() {
_pkgsrc="$_pkgname" _pkgsrc="$_pkgname"
source=("$_pkgsrc"::"git+$url.git") source=("$_pkgsrc"::"git+$url.git")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() {
cd "$_pkgsrc"
git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
} }
_source_filepicker() { # filepicker
depends+=( depends+=(
'at-spi2-core'
'gdk-pixbuf2'
'gtk3' 'gtk3'
'pango'
) )
makedepends+=( makedepends+=(
'cargo' 'cargo'
@ -44,9 +49,44 @@ _source_filepicker() {
_filepicker_pkgsrc="vdhcoapp-filepicker" _filepicker_pkgsrc="vdhcoapp-filepicker"
source+=("$_filepicker_pkgsrc"::"git+$_filepicker_url.git") source+=("$_filepicker_pkgsrc"::"git+$_filepicker_url.git")
sha256sums+=('SKIP') sha256sums+=('SKIP')
_cargo_env() {
export CARGO_HOME="$SRCDEST/cargo-home"
export RUSTUP_TOOLCHAIN=stable
export CARGO_TARGET_DIR=target
} }
_prepare_vdhcoapp() ( _nvm_env() {
: ${_nodeversion:=18}
export HOME="$SRCDEST/node-home"
export NVM_DIR="$SRCDEST/node-nvm"
# set up nvm
source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
nvm install $_nodeversion
nvm use $_nodeversion
}
_filepicker_prepare() {
_cargo_env
cd "$srcdir/$_filepicker_pkgsrc"
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
}
_filepicker_build() {
_cargo_env
cd "$srcdir/$_filepicker_pkgsrc"
cargo build --frozen --release --all-features
}
_filepicker_package() {
install -Dm755 "$srcdir/$_filepicker_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/"
}
prepare() {
cd "$_pkgsrc" cd "$_pkgsrc"
mv -f app/* . mv -f app/* .
@ -54,24 +94,19 @@ _prepare_vdhcoapp() (
tomlq . ./config.toml \ tomlq . ./config.toml \
| jq '.target.os = "linux"' \ | jq '.target.os = "linux"' \
| jq '.target.arch = "amd64"' \ | jq '.target.arch = "amd64"' \
| jq ".meta.version = \"${pkgver%%.r*}\"" \
> src/config.json > src/config.json
# fix path to config.json # fix path to config.json
sed -E -i src/main.js src/native-autoinstall.js \ sed -E -i src/main.js src/native-autoinstall.js \
-e 's&^(const config = require\('\'')(config.json'\''\);)$&\1./\2&' -e 's&^(const config = require\('\'')(config.json'\''\);)$&\1./\2&'
)
_prepare_filepicker() ( _filepicker_prepare
_cargo_env }
cd "$_filepicker_pkgsrc" build() {
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
)
_build_vdhcoapp() (
_nvm_env _nvm_env
# build
cd "$_pkgsrc" cd "$_pkgsrc"
npm install --no-package-lock --no-audit --no-fund --prefer-offline npm install --no-package-lock --no-audit --no-fund --prefer-offline
@ -99,68 +134,21 @@ _build_vdhcoapp() (
) )
./node_modules/.bin/pkg "${_pkg_options[@]}" ./node_modules/.bin/pkg "${_pkg_options[@]}"
)
_build_filepicker() ( _filepicker_build
_cargo_env }
cd "$_filepicker_pkgsrc" package() {
cargo build --frozen --release --all-features depends+=('ffmpeg')
)
_package_vdhcoapp() (
cd "$_pkgsrc" cd "$_pkgsrc"
install -Dm755 vdhcoapp -t "$pkgdir/usr/bin/" install -Dm755 vdhcoapp -t "$pkgdir/usr/bin/"
install -dm755 "$pkgdir/usr/lib/mozilla/native-messaging-hosts/" install -dm755 "$pkgdir/usr/lib/mozilla/native-messaging-hosts/"
install -dm755 "$pkgdir/etc/opt/chrome/native-messaging-hosts/" install -dm755 "$pkgdir/etc/opt/chrome/native-messaging-hosts/"
install -dm755 "$pkgdir/etc/chromium/native-messaging-hosts/" install -dm755 "$pkgdir/etc/chromium/native-messaging-hosts/"
install -dm755 "$pkgdir/etc/opt/edge/native-messaging-hosts/" install -dm755 "$pkgdir/etc/opt/edge/native-messaging-hosts/"
)
_package_filepicker() ( _filepicker_package
_cargo_env
install -Dm755 "$_filepicker_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/"
)
_cargo_env() {
export CARGO_HOME
export RUSTUP_TOOLCHAIN=stable
export CARGO_TARGET_DIR=target
}
_nvm_env() {
export HOME="$SRCDEST/node-home"
export NVM_DIR="$SRCDEST/node-nvm"
# set up nvm
source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
nvm install $_nodeversion
nvm use $_nodeversion
}
_source_vdhcoapp
_source_filepicker
prepare() {
_prepare_vdhcoapp
_prepare_filepicker
}
pkgver() {
cd "$_pkgsrc"
git describe --long --tags --abbrev=7 --exclude='*[a-zA-Z][a-zA-Z]*' \
| sed -E 's/^[^0-9]*//;s/([^-]*-g)/r\1/;s/-/./g'
}
build() {
_build_vdhcoapp
_build_filepicker
}
package() {
depends+=('ffmpeg')
_package_vdhcoapp
_package_filepicker
} }

View file

@ -1,8 +1,6 @@
# Maintainer: # Maintainer:
: ${CARGO_HOME:=$SRCDEST/cargo-home} _pkgname=vdhcoapp-filepicker
_pkgname="vdhcoapp-filepicker"
pkgname="$_pkgname" pkgname="$_pkgname"
pkgver=1.0.1 pkgver=1.0.1
pkgrel=1 pkgrel=1
@ -12,7 +10,10 @@ license=('GPL-2.0-or-later')
arch=('x86_64') arch=('x86_64')
depends=( depends=(
'at-spi2-core'
'gdk-pixbuf2'
'gtk3' 'gtk3'
'pango'
) )
makedepends=( makedepends=(
'cargo' 'cargo'
@ -24,8 +25,8 @@ source=("$_pkgsrc"::"git+$url.git#tag=v$pkgver")
sha256sums=('SKIP') sha256sums=('SKIP')
_cargo_env() { _cargo_env() {
export CARGO_HOME export CARGO_HOME="${CARGO_HOME:-$SRCDEST/cargo-home}"
export RUSTUP_TOOLCHAIN=stable export RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN:-stable}
export CARGO_TARGET_DIR=target export CARGO_TARGET_DIR=target
} }
@ -44,6 +45,5 @@ build() {
} }
package() { package() {
_cargo_env
install -Dm755 "$_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/" install -Dm755 "$_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/"
} }