diff --git a/user/zotero/APKBUILD b/user/zotero/APKBUILD index 3d06de1..3b4d87a 100644 --- a/user/zotero/APKBUILD +++ b/user/zotero/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=zotero pkgver=7.0.0_git20240131 -pkgrel=1 +pkgrel=2 _fxver=102.15.1 # Date of release, YY-MM-DD for metainfo file (see package()) _releasedate=2024-02-02 @@ -94,12 +94,8 @@ source=" " builddir="$srcdir"/firefox-$_fxver -_mozappdir=/usr/lib/zotero _zoterodir="$srcdir"/zotero-client-$_gittag -# help our shared-object scanner to find the libs -ldpath="$_mozappdir" - # we need this because cargo verifies checksums of all files in vendor # crates when it builds and gives us no way to override or update the # file sanely... so just clear out the file list @@ -124,9 +120,6 @@ export RUST_TARGET="$CTARGET" export CC="clang" export CXX="clang++" -# set rpath so linker finds the libs -export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir" - # let firefox do this itself. unset CARGO_PROFILE_RELEASE_OPT_LEVEL unset CARGO_PROFILE_RELEASE_LTO @@ -298,7 +291,10 @@ build() { ./mach build + # install to where zotero expects it DESTDIR="$_zoterodir"/app/xulrunner/firefox-$CARCH ./mach install + mv "$_zoterodir"/app/xulrunner/firefox-$CARCH/usr/lib/firefox-esr/* "$_zoterodir"/app/xulrunner/firefox-$CARCH/. + rm -R "$_zoterodir"/app/xulrunner/firefox-$CARCH/usr # zotero build (