IMO there is no need to package the updater. I'd recommend to disable it. That would also avoid problems with git-lfs
.
diff --git a/PKGBUILD b/PKGBUILD
index d15f950..607589c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86_64' 'i686')
url="https://github.com/zotero/zotero"
license=('AGPL-3.0-or-later')
depends=('dbus-glib' 'gtk3' 'nss' 'libxt')
-makedepends=('npm' 'git' 'git-lfs' 'zip' 'unzip' 'perl' 'python>=3' 'curl' 'wget' 'rsync' 'nodejs')
+makedepends=('npm' 'git' 'zip' 'unzip' 'perl' 'python>=3' 'curl' 'wget' 'rsync' 'nodejs' 'patch')
_tag=88ff06841605a2812394060ef4fd3194702d50e0 # git rev-parse $pkgver
source=("zotero.desktop"
"zotero-client::git+https://github.com/zotero/zotero.git#tag=${_tag}"
@@ -24,7 +24,8 @@ source=("zotero.desktop"
"zotero-csl::git+https://github.com/citation-style-language/locales.git"
"zotero-libreoffice-integration::git+https://github.com/zotero/zotero-libreoffice-integration.git"
"zotero-pdf-js::git+https://github.com/zotero/pdf.js.git"
- "zotero-epub-js::git+https://github.com/zotero/epub.js.git")
+ "zotero-epub-js::git+https://github.com/zotero/epub.js.git"
+ "disable_updater.patch")
sha256sums=('eab76db7a56a4d9aaa17baaf240b82fcf57944a4ddf8ef1b58cc64182426cedc'
'SKIP'
'SKIP'
@@ -39,7 +40,8 @@ sha256sums=('eab76db7a56a4d9aaa17baaf240b82fcf57944a4ddf8ef1b58cc64182426cedc'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+ '876ada619be5f1122437e105bb70cec20de1cf43fb533e7bb7b9bf6ff1f7deae')
pkgver() {
cd "$srcdir/zotero-client"
@@ -49,9 +51,7 @@ pkgver() {
prepare() {
cd "$srcdir/zotero-client"
- git lfs install --local
- git remote add network-origin https://github.com/zotero/zotero.git
- git lfs pull -I app/linux/updater.tar.xz network-origin
+ patch -p1 < ../disable_updater.patch
npm i --legacy-peer-deps
diff --git a/disable_updater.patch b/disable_updater.patch
new file mode 100644
index 0000000..5f86f07
--- /dev/null
+++ b/disable_updater.patch
@@ -0,0 +1,29 @@
+diff --git a/app/build.sh b/app/build.sh
+index d4046ac6b..b7f2b0b8b 100755
+--- a/app/build.sh
++++ b/app/build.sh
+@@ -886,9 +886,9 @@ if [ $BUILD_LINUX == 1 ]; then
+ cp "$CALLDIR/linux/set_launcher_icon" "$APPDIR"
+
+ # Use our own updater, because Mozilla's requires updates signed by Mozilla
+- check_lfs_file "$CALLDIR/linux/updater.tar.xz"
+- tar xf "$CALLDIR/linux/updater.tar.xz" --to-stdout updater-$arch > "$APPDIR/updater"
+- chmod 755 "$APPDIR/updater"
++ #check_lfs_file "$CALLDIR/linux/updater.tar.xz"
++ #tar xf "$CALLDIR/linux/updater.tar.xz" --to-stdout updater-$arch > "$APPDIR/updater"
++ #chmod 755 "$APPDIR/updater"
+
+ # Copy app files
+ rsync -a "$base_dir/" "$APPDIR/"
+diff --git a/app/linux/mozconfig b/app/linux/mozconfig
+index 8e7fa5cf8..5e2720318 100644
+--- a/app/linux/mozconfig
++++ b/app/linux/mozconfig
+@@ -11,6 +11,7 @@ ac_add_options MOZ_ENABLE_JS_DUMP=1
+ ac_add_options MOZ_ENABLE_FORKSERVER=
+ ac_add_options MOZ_TELEMETRY_REPORTING=
+ ac_add_options MOZ_DATA_REPORTING=
++ac_add_options --disable-updater
+ ac_add_options --disable-tests
+ ac_add_options --disable-debug
+ ac_add_options --disable-debug-symbols
Pinned Comments
agkphysics commented on 2023-06-14 11:31 (UTC)
@jeyes https://wiki.archlinux.org/title/DeveloperWiki:Building_in_a_clean_chroot
agkphysics commented on 2023-02-08 10:12 (UTC)
If people are having issues, try building with
extra-x86_64-build
in a clean chroot.