Fork as esr

1 files changed, 30 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2785fb2..b4bc327 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,9 +14,11 @@
 # Arch version enables debug symbols
 # Arch version lacks privacy and security by default
 
-pkgname=firefox
-pkgver=69.0
-pkgrel=1.2
+_pkgname=firefox
+pkgname=${_pkgname}-esr
+pkgver=68.1.0
+_pkgver=${pkgver}esr
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -35,8 +37,10 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_CA: Spell checking, Canadian English')
 options=(!emptydirs !makeflags)
-source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
-        $pkgname.desktop $pkgname-symbolic.svg
+conflicts=(firefox)
+provides=(firefox)
+source=("https://archive.mozilla.org/pub/$_pkgname/releases/$_pkgver/source/$_pkgname-$_pkgver.source.tar.xz"{,.asc}
+        $_pkgname.desktop $_pkgname-symbolic.svg
         distribution.ini
         mozconfig.in
         mozconfig.common.override
@@ -44,7 +48,7 @@ source=("https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgna
         pgo-1.patch
         moz.configure.diff
         package-manifest.diff)
-sha256sums=('413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5'
+sha256sums=('f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac'
             'SKIP'
             '54dcf5e1b91db3f586a7e27814552f96578b9d9495b7b10b268e36f64b49d4d1'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
@@ -59,30 +63,30 @@ validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353')  # Mozilla Software Re
 
 prepare() {
 #   mkdir mozbuild
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
   # Apply pgo patches
-  patch -p0 $srcdir/${pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
+  patch -p0 $srcdir/${_pkgname}-${pkgver}/security/sandbox/linux/moz.build $srcdir/pgo-1.patch
 
   # Add the custom mozconfig
-  cp $srcdir/mozconfig.in $srcdir/${pkgname}-${pkgver}/.mozconfig
+  cp $srcdir/mozconfig.in $srcdir/${_pkgname}-${pkgver}/.mozconfig
 
   # MOZ_TELEMETRY_REPORTING only applied correctly when set in this override file
-  cp $srcdir/mozconfig.common.override $srcdir/${pkgname}-${pkgver}/build/mozconfig.common.override
+  cp $srcdir/mozconfig.common.override $srcdir/${_pkgname}-${pkgver}/build/mozconfig.common.override
 
 
   # Disable various components at the source level
-  #sed -i 's|[;]1|;0|' $srcdir/${pkgname}-${pkgver}/toolkit/components/telemetry/TelemetryStartup.manifest
-  sed -i 's/;1/;0/' $srcdir/${pkgname}-${pkgver}/toolkit/components/telemetry/components.conf
+  #sed -i 's|[;]1|;0|' $srcdir/${_pkgname}-${pkgver}/toolkit/components/telemetry/TelemetryStartup.manifest
+  sed -i 's/;1/;0/' $srcdir/${_pkgname}-${pkgver}/toolkit/components/telemetry/components.conf
 
   # Patch out health reporting so that MOZ_DATA_REPORTING=0 can be applied.
-  patch -p0 $srcdir/${pkgname}-${pkgver}/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/${pkgname}-${pkgver}/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
@@ -93,7 +97,7 @@ prepare() {
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
@@ -101,7 +105,7 @@ build() {
   export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -fPIC"
   # LTO needs more open files
   ulimit -n 4096
-  msg2 "Building optimized browser..."
+  msg2 "Building browser..."
   xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
 
   msg2 "Building symbol archive..."
@@ -109,32 +113,32 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   DESTDIR="$pkgdir" ./mach install
 
 
   install -Dm644 $srcdir/distribution.ini \
-  "$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
+  "$pkgdir/usr/lib/$_pkgname/distribution/distribution.ini"
 
   # don't duplicate the binary, use a symlink instead
   rm "$pkgdir/usr/bin/firefox"
-  ln -s "/usr/lib/$pkgname/firefox" "$pkgdir/usr/bin/firefox"
+  ln -s "/usr/lib/$_pkgname/firefox" "$pkgdir/usr/bin/firefox"
 
 
   # icons
   for i in 16 22 24 32 48 64 128 256; do
     install -Dm644 browser/branding/official/default$i.png \
-      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png"
   done
   install -Dm644 browser/branding/official/content/about-logo.png \
-    "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
+    "$pkgdir/usr/share/icons/hicolor/192x192/apps/$_pkgname.png"
   install -Dm644 browser/branding/official/content/about-logo@2x.png \
-    "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
-  install -Dm644 ../$pkgname-symbolic.svg \
-    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
+    "$pkgdir/usr/share/icons/hicolor/384x384/apps/$_pkgname.png"
+  install -Dm644 ../$_pkgname-symbolic.svg \
+    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$_pkgname-symbolic.svg"
 
   # install desktop file
-  install -Dm644 ../$pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 ../$_pkgname.desktop \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
 
 }