summaryrefslogtreecommitdiff
path: root/PKGBUILD
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2019-04-10 20:17:11 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2019-04-10 20:17:11 -0700
commit6df300bf5dd155d4b98cbe0132f1b03486aec9b5 (patch)
treed0e5ee5590307769903ef0a7deab349b3570a4f9 /PKGBUILD
parentUpdated to 66.0.3 (diff)
downloadfirefox-6df300bf5dd155d4b98cbe0132f1b03486aec9b5.tar.xz
Use signed archives
Remove leftover clutter from PKGBUILD
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD50
1 files changed, 17 insertions, 33 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 5e62eb1..ebccd54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,6 @@
pkgname=firefox
pkgver=66.0.3
-gzver=$(echo $pkgver | sed 's/\./_/g')
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org"
arch=(x86_64)
@@ -33,7 +32,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'speech-dispatcher: Text-to-Speech'
'hunspell-en_CA: Spell checking, Canadian English')
options=(!emptydirs !makeflags)
-source=($pkgname-$pkgver.tar.gz::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${gzver}_RELEASE.tar.gz
+source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
$pkgname.desktop $pkgname-symbolic.svg
0001-bz-1468911.patch
vendor.js
@@ -41,7 +40,8 @@ source=($pkgname-$pkgver.tar.gz::https://hg.mozilla.org/releases/mozilla-release
pgo-2.patch
moz.configure.diff
package-manifest.diff)
-sha256sums=('53743f3488dcde2207f74e0d06ee5b697e85800d6c3439692fc130d7a210ea45'
+sha256sums=('1fe4cfe4f4afce8d5532da8f36a48c333750c90a6ee67167309357edf514c22a'
+ 'SKIP'
'677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
'9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
'821f858bac2e13ce02b8c20d5387d4ecc8ab2d0e4ebe0a517cbf935da6aeb31b'
@@ -50,25 +50,26 @@ sha256sums=('53743f3488dcde2207f74e0d06ee5b697e85800d6c3439692fc130d7a210ea45'
'33a91a7e8ca702ee493f483abe93bf6917881dc4192566587bdfb103da3a2422'
'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
'927e400d6920b98d2fe7db2b6498f195135909a76e0da49441223956364d8227')
+validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases
prepare() {
# mkdir mozbuild
- cd mozilla-release-FIREFOX_${gzver}_RELEASE
+ cd ${pkgname}-${pkgver}
# https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
patch -Np1 -i ../0001-bz-1468911.patch
# Apply pgo patches
- patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
- patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/extensions/spellcheck/src/moz.build $srcdir/pgo-2.patch
+ patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
+ patch -p0 $srcdir/${pkgname}-${pkgver}/extensions/spellcheck/src/moz.build $srcdir/pgo-2.patch
- cat >$srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/.mozconfig <<END
+ cat >$srcdir/${pkgname}-${pkgver}/.mozconfig <<END
ac_add_options --enable-application=browser
ac_add_options --prefix=/usr
ac_add_options --enable-release
ac_add_options --enable-hardening
-ac_add_options --enable-optimize=-O3
+ac_add_options --enable-optimize
ac_add_options --enable-rust-simd
ac_add_options --enable-lto
ac_add_options --enable-linker=gold
@@ -117,34 +118,20 @@ export MOZ_REQUIRE_SIGNING=0
END
# MOZ_TELEMETRY_REPORTING only applied correctly when set in this override file
- cat >$srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/build/mozconfig.common.override <<END
+ cat >$srcdir/${pkgname}-${pkgver}/build/mozconfig.common.override <<END
export MOZ_TELEMETRY_REPORTING=0
export MOZ_DATA_REPORTING=0
END
# Disable various components at the source level
- sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/toolkit/components/telemetry/TelemetryStartup.manifest
-# sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/experiments/Experiments.manifest
-# sed -i '/pocket/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/activity-stream/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/aushelper/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/followonsearch/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/formautofill/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/onboarding/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/screenshots/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/webcompat/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-# sed -i '/webcompat-reporter/d' $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/extensions/moz.build
-
-# patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/config/mozconfigs/whitelist $srcdir/whitelist.diff
-# patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/config/mozconfigs/linux64/common-opt $srcdir/common-opt.diff
-# patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/build/mozconfig.common.override $srcdir/mozconfig.common.override.diff
+ sed -i 's|[;]1|;0|' $srcdir/${pkgname}-${pkgver}/toolkit/components/telemetry/TelemetryStartup.manifest
# Patch out health reporting so that MOZ_DATA_REPORTING=0 can be applied.
- patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/moz.configure $srcdir/moz.configure.diff
+ patch -p0 $srcdir/${pkgname}-${pkgver}/browser/moz.configure $srcdir/moz.configure.diff
# Remove @RESPATH@/browser/features/* to prevent system addons from being part of the output package.
- patch -p0 $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff
+ patch -p0 $srcdir/${pkgname}-${pkgver}/browser/installer/package-manifest.in $srcdir/package-manifest.diff
# Hide mobile promo
echo ".fxaMobilePromo { display: none !important; }" >> browser/themes/shared/incontentprefs/preferences.inc.css
@@ -157,10 +144,7 @@ END
}
build() {
- cd mozilla-release-FIREFOX_${gzver}_RELEASE
-# mkdir --parents $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
-# mkdir --parents $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/extensions/webcompat-reporter/locales
-# mkdir --parents $srcdir/mozilla-release-FIREFOX_${gzver}_RELEASE/obj-x86_64-pc-linux-gnu/services/sync/locales
+ cd ${pkgname}-${pkgver}
export MOZ_NOSPAM=1
export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
@@ -172,7 +156,7 @@ build() {
}
package() {
- cd mozilla-release-FIREFOX_${gzver}_RELEASE
+ cd ${pkgname}-${pkgver}
DESTDIR="$pkgdir" ./mach install
install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
@@ -208,11 +192,11 @@ END
# Install a wrapper to avoid confusion about binary path
install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
#!/bin/sh
-exec /usr/lib/$pkgname/firefox "\$@"
+exec /usr/lib/$pkgname/$pkgname "\$@"
END
# Replace duplicate binary with wrapper
# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -srf "$pkgdir/usr/bin/$pkgname" \
- "$pkgdir/usr/lib/$pkgname/firefox-bin"
+ "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
}