user/zotero: fix pdf reader
All checks were successful
/ lint (pull_request) Successful in 29s
/ deploy-x86_64 (pull_request) Successful in 34s
/ build-x86_64 (pull_request) Successful in 50m15s
/ build-aarch64 (pull_request) Successful in 2h27m21s
/ deploy-aarch64 (pull_request) Successful in 1m6s

This commit is contained in:
Antoine Martin 2024-10-15 13:22:51 -04:00
parent 623d98575e
commit f9d865c6e5
Signed by: forge
GPG key ID: D62A472A4AA7D541
2 changed files with 26 additions and 14 deletions

View file

@ -2,14 +2,11 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=zotero pkgname=zotero
pkgver=7.0.7 pkgver=7.0.7
pkgrel=0 pkgrel=1
_fxver=115.14.0 _fxver=115.14.0
_gittag=$pkgver _gittag=$pkgver
# Date of release, YY-MM-DD for metainfo file (see package())
# https://www.mozilla.org/firefox/organizations/notes/
_releasedate=2024-08-09
pkgdesc="A free, easy-to-use tool to help you collect, organize, cite, and share your research sources." pkgdesc="A free, easy-to-use tool to help you collect, organize, cite, and share your research sources."
url="https://www.mozilla.org/en-US/firefox/organizations/" url="https://www.zotero.org/"
# s390x and riscv64: blocked by rust and cargo # s390x and riscv64: blocked by rust and cargo
# armhf: build failure on armhf due to wasm # armhf: build failure on armhf due to wasm
# ppc64le: test suite stalls # ppc64le: test suite stalls
@ -18,6 +15,7 @@ license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
depends=" depends="
ffmpeg-libavcodec ffmpeg-libavcodec
" "
_llvmver=18
makedepends=" makedepends="
alsa-lib-dev alsa-lib-dev
automake automake
@ -25,8 +23,8 @@ makedepends="
bsd-compat-headers bsd-compat-headers
cargo cargo
cbindgen cbindgen
clang clang$_llvmver
clang-libclang clang$_llvmver-libclang
curl curl
dbus-glib-dev dbus-glib-dev
gettext gettext
@ -46,8 +44,8 @@ makedepends="
libwebp-dev libwebp-dev
libxcomposite-dev libxcomposite-dev
libxt-dev libxt-dev
lld lld$_llvmver
llvm-dev llvm$_llvmver-dev
m4 m4
mesa-dev mesa-dev
nasm nasm
@ -62,7 +60,6 @@ makedepends="
rsync rsync
sed sed
unzip unzip
wasi-sdk
wireless-tools-dev wireless-tools-dev
xvfb-run xvfb-run
zip zip
@ -131,8 +128,8 @@ export MOZ_NOSPAM=1
export RUST_TARGET="$CTARGET" export RUST_TARGET="$CTARGET"
# Build with Clang, takes less RAM # Build with Clang, takes less RAM
export CC="clang" export CC="clang-$_llvmver"
export CXX="clang++" export CXX="clang++-$_llvmver"
# set rpath so linker finds the libs # set rpath so linker finds the libs
export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir" export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir"
@ -248,6 +245,10 @@ prepare() {
ac_add_options --with-system-webp ac_add_options --with-system-webp
ac_add_options --with-system-zlib ac_add_options --with-system-zlib
# disable wasm due to wasi-sdk and wasi-compiler-rt built against clang19
# ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
ac_add_options --without-wasm-sandboxed-libraries
# misc # misc
ac_add_options --allow-addon-sideload ac_add_options --allow-addon-sideload
ac_add_options --prefix=/usr ac_add_options --prefix=/usr
@ -255,7 +256,6 @@ prepare() {
ac_add_options --with-distribution-id=org.alpinelinux ac_add_options --with-distribution-id=org.alpinelinux
ac_add_options --with-libclang-path=/usr/lib ac_add_options --with-libclang-path=/usr/lib
ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --with-unsigned-addon-scopes=app,system
ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
ac_add_options --host=$CHOST ac_add_options --host=$CHOST
ac_add_options --target=$CTARGET ac_add_options --target=$CTARGET
@ -394,5 +394,5 @@ ba04ec60afd2e9f9500046128b60f1c68b0ac7e47f5fbbc4f4fbfde01df982eb1561d65fb0aef9be
337070ee4c44ccb35c6b6290c18327740bb9fccfd1a6ad1045782e83daa290b6ced7d53955d3a889f661d588738a64f2e7f383639f4c46be9fdf891168abc9ff zotero_test-drop-build.patch 337070ee4c44ccb35c6b6290c18327740bb9fccfd1a6ad1045782e83daa290b6ced7d53955d3a889f661d588738a64f2e7f383639f4c46be9fdf891168abc9ff zotero_test-drop-build.patch
f0e4f09496531222e8400959f9ef12852bca269eb3bf4c3b87ccaf92f28a12b9374461a1c79ad294a4393dbe30800aa1c85497033d0bc304fa8c198dfab3efd2 zotero_test-fix-chars.patch f0e4f09496531222e8400959f9ef12852bca269eb3bf4c3b87ccaf92f28a12b9374461a1c79ad294a4393dbe30800aa1c85497033d0bc304fa8c198dfab3efd2 zotero_test-fix-chars.patch
9dc390d8bae42e645cae45fe5551751d8f38d5c1b8b2cc0eec1c2191f4bde293ffb2c67cfc4de765f2d48b1da4d5fcd4f1c03711e5da3180cd1b63710ccf5599 zotero_test-push-timeout-to-30sec.patch 9dc390d8bae42e645cae45fe5551751d8f38d5c1b8b2cc0eec1c2191f4bde293ffb2c67cfc4de765f2d48b1da4d5fcd4f1c03711e5da3180cd1b63710ccf5599 zotero_test-push-timeout-to-30sec.patch
7fb791a386d30594a11ae3856295d5081000de7525036eb0b5836505bd4f0b13a4fe706400ad7efe00b75c2112cf3d59ea3542b6179ccd80f7ee1889349f441d zotero_drop-jazzer.patch 3730281d9dc7f6b08c8ac31f057fd2baf6e1263835012959bd3c7118c3cd8b4e672513eb9cb7df0d97904207505a98c57465e307649d2ee6ff900b45401bce31 zotero_drop-jazzer.patch
" "

View file

@ -10,3 +10,15 @@ index 3025926..13f8b7a 100644
"@metalsmith/layouts": "^2.7.0", "@metalsmith/layouts": "^2.7.0",
"@metalsmith/markdown": "^1.10.0", "@metalsmith/markdown": "^1.10.0",
"autoprefixer": "^10.4.19", "autoprefixer": "^10.4.19",
diff --git a/zotero/reader/pdfjs/pdf.js/package.json.orig b/zotero/reader/pdfjs/pdf.js/package.json
index 3025926aa44..13f8b7aca93 100644
--- a/zotero/reader/pdfjs/pdf.js/package.json.orig
+++ b/zotero/reader/pdfjs/pdf.js/package.json
@@ -7,7 +7,6 @@
"@babel/runtime": "^7.24.8",
"@fluent/bundle": "^0.18.0",
"@fluent/dom": "^0.10.0",
- "@jazzer.js/core": "^2.1.0",
"@metalsmith/layouts": "^2.7.0",
"@metalsmith/markdown": "^1.10.0",
"autoprefixer": "^10.4.19",