From 2e87bd712cfb0ea64f14e0e6a7a3dcdd96b08098 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Wed, 12 Feb 2020 11:44:31 +0200
Subject: Sync with changes from Arch Linux Firefox 73.0-1

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
---
 libre/iceweasel/PKGBUILD | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 3b7833ca3..f285904dd 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,7 +47,7 @@
 pkgname=iceweasel
 replaces=('firefox')
 epoch=1
-pkgver=72.0.1
+pkgver=73.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=70.0
@@ -103,7 +103,7 @@ prepare() {
   cd firefox-$pkgver
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
-  msg2 "applying 0001-Use-remoting-name-for-GDK-application-names.patch"
+  echo "applying 0001-Use-remoting-name-for-GDK-application-names.patch"
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
   cat >../mozconfig <<END
@@ -164,9 +164,9 @@ END
       # mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration
       sed -i 's|ac_add_options --disable-eme||' ../mozconfig
 
-      msg2 "applying arm.patch"
+      echo "applying arm.patch"
       patch -p1 -i ../arm.patch
-      msg2 "applying build-arm-libopus.patch"
+      echo "applying build-arm-libopus.patch"
       patch -p1 -i ../build-arm-libopus.patch
     ;;
     i686)
@@ -184,23 +184,23 @@ END
 
       # test failure in rust code (complaining about network functions) when PGO is used,
       # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757
-      msg2 "applying rust-static-disable-network-test-on-static-libraries.patch"
+      echo "applying rust-static-disable-network-test-on-static-libraries.patch"
       patch -p1 -i "$srcdir"/rust-static-disable-network-test-on-static-libraries.patch
 
       # readelf: Error: Unable to seek to 0x801db328 for section headers
-      msg2 "applying avoid-libxul-OOM-python-check.patch"
+      echo "applying avoid-libxul-OOM-python-check.patch"
       patch -p1 -i "$srcdir"/avoid-libxul-OOM-python-check.patch
     ;;
     x86_64)
     ;;
-    *) error "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
+    *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
     ;;
   esac
 
 
   ## branding ##
 
-  msg2 "applying parabola branding"
+  echo "applying parabola branding"
   local brandingsrcdir="${srcdir}/${pkgname}-${_brandingver}"
   local brandingdestdir=browser/branding/${pkgname}
   rm -rf -- ${brandingdestdir}
@@ -242,7 +242,7 @@ END
   ## libre patching ##
 
   # Remove remaining non-free bits
-  msg2 "applying libre.patch"
+  echo "applying libre.patch"
   patch -Np1 -i "$srcdir/libre.patch"
 
   # Disable various components at the source level
@@ -263,7 +263,7 @@ END
 #   local _remove_engines_sed='s|.*oogle.*|          "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy"|g'
   local _remove_engines_sed='s|.*oogle.*|          "ddg", "wikipedia"|g'
   local _search_config_file=browser/components/search/extensions/list.json
-  msg2 "applying libre-searchengines.patch"
+  echo "applying libre-searchengines.patch"
   patch -Np1 -i "$srcdir/libre-searchengines.patch"
   sed -i "${_remove_engines_sed}" ${_search_config_file}
 
@@ -322,13 +322,13 @@ build() {
     ;;
     x86_64)
       # Do 3-tier PGO
-      msg2 "Building instrumented browser..."
+      echo "Building instrumented browser..."
       cat >.mozconfig ../mozconfig - <<END
 ac_add_options --enable-profile-generate=cross
 END
       ./mach build
 
-      msg2 "Profiling instrumented browser..."
+      echo "Profiling instrumented browser..."
       ./mach package
       LLVM_PROFDATA=llvm-profdata \
         JARLOG_FILE="$PWD/jarlog" \
@@ -336,16 +336,16 @@ END
         ./mach python build/pgo/profileserver.py
 
       if [[ ! -s merged.profdata ]]; then
-        error "No profile data produced."
+        echo "No profile data produced."
         return 1
       fi
 
       if [[ ! -s jarlog ]]; then
-        error "No jar log produced."
+        echo "No jar log produced."
         return 1
       fi
 
-      msg2 "Removing instrumented browser..."
+      echo "Removing instrumented browser..."
       ./mach clobber
 
       cat >.mozconfig ../mozconfig - <<END
@@ -355,18 +355,18 @@ ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata
 ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
 END
     ;;
-    *) error "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
+    *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
     ;;
   esac
 
   # sanity checks
   # each of the [ARCH-SPECIFIC CONFIG] branches above should have created .mozconfig
-  [[ ! -f .mozconfig ]] && error ".mozconfig file not found in source root" && return 1
+  [[ ! -f .mozconfig ]] && echo ".mozconfig file not found in source root" && return 1
 
-  msg2 "Building optimized browser..."
+  echo "Building optimized browser..."
   ./mach build
 
-  msg2 "Building symbol archive..."
+  echo "Building symbol archive..."
   ./mach buildsymbols
 }
 
@@ -440,7 +440,7 @@ END
     ;;
     x86_64)
     ;;
-    *) error "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;
+    *) echo "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;
     ;;
   esac
 
@@ -455,3 +455,4 @@ END
   fi
 }
 
+# vim:set sw=2 et:
-- 
cgit v1.2.3