forge/ayaports
1
0
Fork 0
Code Issues 43 Pull requests 11 Projects Releases Packages Wiki Activity Actions

[3.18] user/zotero: remove conflict with firefox-esr #386

Merged
ayakael merged 1 commit from zotero/remove-esr-conflict-318 into v3.18 2024-02-03 15:40:57 +00:00
Conversation 2 Commits 1 Files changed 1 +4 -8
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
user/zotero/APKBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=zotero pkgname=zotero
pkgver=7.0.0_git20240131 pkgver=7.0.0_git20240131
pkgrel=1 pkgrel=2
_fxver=102.15.1 _fxver=102.15.1
# Date of release, YY-MM-DD for metainfo file (see package()) # Date of release, YY-MM-DD for metainfo file (see package())
_releasedate=2024-02-02 _releasedate=2024-02-02
@ -94,12 +94,8 @@ source="
" "
builddir="$srcdir"/firefox-$_fxver builddir="$srcdir"/firefox-$_fxver
_mozappdir=/usr/lib/zotero
_zoterodir="$srcdir"/zotero-client-$_gittag _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 # 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 # crates when it builds and gives us no way to override or update the
# file sanely... so just clear out the file list # file sanely... so just clear out the file list
@ -124,9 +120,6 @@ export RUST_TARGET="$CTARGET"
export CC="clang" export CC="clang"
export CXX="clang++" export CXX="clang++"
# set rpath so linker finds the libs
export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir"
# let firefox do this itself. # let firefox do this itself.
unset CARGO_PROFILE_RELEASE_OPT_LEVEL unset CARGO_PROFILE_RELEASE_OPT_LEVEL
unset CARGO_PROFILE_RELEASE_LTO unset CARGO_PROFILE_RELEASE_LTO
@ -298,7 +291,10 @@ build() {
./mach build ./mach build
# install to where zotero expects it
DESTDIR="$_zoterodir"/app/xulrunner/firefox-$CARCH ./mach install 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 # zotero build
( (