From 521f420b2162787f4fd2a024e8c1ab1d4b848b49 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 3 Feb 2024 14:54:15 -0500 Subject: [PATCH] user/zotero: upgrade to 7.0.0_beta57 l --- user/zotero/APKBUILD | 22 +++++++++++++++------ user/zotero/zotero_build-modifications.diff | 3 ++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/user/zotero/APKBUILD b/user/zotero/APKBUILD index 3b4d87a..f5f2d99 100644 --- a/user/zotero/APKBUILD +++ b/user/zotero/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=zotero -pkgver=7.0.0_git20240131 -pkgrel=2 +pkgver=7.0.0_beta57 +pkgrel=0 _fxver=102.15.1 # Date of release, YY-MM-DD for metainfo file (see package()) -_releasedate=2024-02-02 +_releasedate=2024-02-03 pkgdesc="A free, easy-to-use tool to help you collect, organize, cite, and share your research sources." arch="x86_64" url="https://github.com/zotero/zotero" -_gittag=7.0.0._20240131 +_gittag=7.0.0-beta.57 license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0" options="!check" # No test suite depends=" @@ -95,6 +95,11 @@ source=" builddir="$srcdir"/firefox-$_fxver _zoterodir="$srcdir"/zotero-client-$_gittag +_mozappdir=/usr/lib/zotero + +# help our shared-object scanner to find the libs +ldpath="$_mozappdir" +sonameprefix="$pkgname:" # 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 @@ -289,6 +294,9 @@ build() { EOF esac + # set rpath so linker finds the libs + export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir" + ./mach build # install to where zotero expects it @@ -314,6 +322,8 @@ package() { install -Dm644 "$srcdir/zotero.desktop" "$pkgdir/usr/share/applications/zotero.desktop" # Copy zotero icons to a standard location + install -Dm644 "$pkgdir/usr/lib/zotero/icons/icon32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/zotero.png" + install -Dm644 "$pkgdir/usr/lib/zotero/icons/icon64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/zotero.png" install -Dm644 "$pkgdir/usr/lib/zotero/icons/icon128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/zotero.png" # Close shell when launching @@ -344,6 +354,6 @@ d354f48a29bfc16719f3b230b1395063239d4420f9e47522de4662392d9697b15f931ca3bf6055d1 382510375b1a2fa79be0ab79e3391a021ae2c022429ffbaa7e7a69166f99bb56d01e59a1b10688592a29238f21c9d6977672bd77f9fae439b66bdfe0c55ddb15 mozilla-location.keys fc45bc3ffb9404e5338ea26a9f04807b40f6f516324972cddd48bedb91b8bd7c6b8d4e03a0209020f5e67b703bc4ff89389985791b9bd544a0fc3951e2dc338e vendor-prefs.js e1a0a4ff5cc1b53f13776ca11927d671426b0691e78e74a4adf2166d57bb2ae8ac409cc11a37ce5e2f680fdf05d5bc3849c33a9717aca1bb62d03ae5231a67fb zotero.desktop -27ca570df108cb9ffa48254f7cc5ef133371dcab652a12b2f636b87a2378d51afa6c118533d8b1779071441fa2b26663d2275db9d441f17dc7431dfdc90996ea zotero-client-7.0.0._20240131.tar.gz -dca620aa9a96c83d7a81cf11a2a1cf84ef94a1c06688cf00e2b03fd3fd671b6bd08094b7f76ef0f92cbfc2a9a97317855e5b39d17d51054ea3c539d2b3ee0ab2 zotero_build-modifications.diff +55d3a4e4d3d647e21343689e1c9b105efc05eb3f2edf5017eebe50ecac6c5bd7d8ad5b5fa701abfbe7beec0b064eec88584b6b17cab0a8fc689500ed72a5eb23 zotero-client-7.0.0-beta.57.tar.gz +089370d86388b34003179ebf95894fb68069fe7ee1624f88e6c411bbbb4f7bc846287cf593034487967cf2bdf807c761212bdb6356bd604d1d04de35aeb3e646 zotero_build-modifications.diff " diff --git a/user/zotero/zotero_build-modifications.diff b/user/zotero/zotero_build-modifications.diff index 687459d..d8ff0c6 100644 --- a/user/zotero/zotero_build-modifications.diff +++ b/user/zotero/zotero_build-modifications.diff @@ -39,8 +39,9 @@ index 649d629..7d078b8 100755 # Copy icons + mkdir -p "$APPDIR"/icons + cp "$CALLDIR/linux/icons/icon32.png" "$APPDIR/icons/" + cp "$CALLDIR/linux/icons/icon64.png" "$APPDIR/icons/" cp "$CALLDIR/linux/icons/icon128.png" "$APPDIR/icons/" - cp "$CALLDIR/linux/icons/symbolic.svg" "$APPDIR/icons/" diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner index 8b3d918..120b085 100755