libre/iceweasel: Sync with 77.0.1 in Arch Linux

3 files changed, 59 insertions, 44 deletions

diff --git a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
index 165a532f4..73ae042cc 100644
--- a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,18 +1,18 @@
-From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001
+From 5025aab61517c8608b555ba929c61eb0706bd6bd Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 25 Mar 2019 20:30:11 +0100
 Subject: [PATCH] Use remoting name for GDK application names
 
 ---
- toolkit/xre/nsAppRunner.cpp | 6 +-----
- widget/gtk/nsAppShell.cpp   | 7 +++----
- 2 files changed, 4 insertions(+), 9 deletions(-)
+ toolkit/xre/nsAppRunner.cpp |  6 +-----
+ widget/gtk/nsAppShell.cpp   | 11 ++++-------
+ 2 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 984b998133bd..b6c9f013940c 100644
+index da8289200e72..452195b146f3 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -3785,11 +3785,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
@@ -26,7 +26,7 @@ index 984b998133bd..b6c9f013940c 100644
    // Initialize GTK here for splash.
  
 diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0daa78fdbbad..49038d0bb1c8 100644
+index 163a93e2d1a4..4b6d45217671 100644
 --- a/widget/gtk/nsAppShell.cpp
 +++ b/widget/gtk/nsAppShell.cpp
 @@ -24,6 +24,7 @@
@@ -37,19 +37,23 @@ index 0daa78fdbbad..49038d0bb1c8 100644
  #include "ScreenHelperGTK.h"
  #include "HeadlessScreenHelper.h"
  #include "mozilla/widget/ScreenManager.h"
-@@ -175,10 +176,8 @@ nsresult nsAppShell::Init() {
-     // option when program uses gdk_set_program_class().
-     //
-     // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
--    nsAutoString brandName;
--    mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
--    if (!brandName.IsEmpty()) {
--      gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
-+    if (gAppData) {
-+      gdk_set_program_class(gAppData->remotingName);
+@@ -175,13 +176,9 @@ nsresult nsAppShell::Init() {
+       // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
+       //
+       // Only bother doing this for the parent process, since it's the one
+-      // creating top-level windows. (At this point, a child process hasn't
+-      // received the list of registered chrome packages, so the
+-      // GetBrandShortName call would fail anyway.)
+-      nsAutoString brandName;
+-      mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
+-      if (!brandName.IsEmpty()) {
+-        gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
++      // creating top-level windows.
++      if (gAppData) {
++        gdk_set_program_class(gAppData->remotingName);
+       }
      }
    }
- 
 -- 
-2.24.0
+2.26.1
 
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 30e1fb042..be6007716 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -23,42 +23,38 @@
 
 
 # Rational for inclusion in [libre]:
+# FSDG:
 #  - Modify the addons pages to use GNU IceCat plugins sources, rather
-#    than addons.mozilla.org, which hosts non-free addons.
+#    than addons.mozilla.org, which hosts non-free addons
 #  - Disable EME, which is implemented via the non-free libWideVine
-#    CDM.
-#
-# The above changes cause us to run afoul of the Firefox trademark
-# policy[1], so making those changes also requires us to:
-#  - Rebrand to Iceweasel
+#    CDM
+#  - Rebrand to Iceweasel, per the mozilla trademark policy,
+#    due to these FSDG changes
 #
 # technical:
 #  - build i686 with GCC instead of clang
 #  - disable rust-SIMD, LTO, PGO, and skip profiling build for armv7h and i686
+#  - prefer as many system libs as possible, over their vendored couterparts
 # 
 # privacy:
 #  - Remove Google API keys and usage
 #  - Disable Mozilla telemetry and crash reporting (good manners
 #    because of all of the other patching we're doing)
-#
-# [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/
 
 
 pkgname=iceweasel
-replaces=('firefox')
 epoch=1
-pkgver=76.0
-pkgrel=2
-pkgrel+=.parabola2
-_brandingver=76.0
+pkgver=77.0.1
+pkgrel=1
+pkgrel+=.parabola1
+_brandingver=77.0
 _brandingrel=1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(MPL GPL LGPL)
 url="https://wiki.parabola.nu/Iceweasel"
-depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg nss
-         ttf-font libpulse)
+depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
 makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
              xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
              nodejs python2-psutil cbindgen nasm)
@@ -69,6 +65,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_US: Spell checking, American English')
+replaces=('firefox')
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
@@ -81,21 +78,23 @@ source_armv7h=(arm.patch
                build-arm-libopus.patch)
 source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
              'avoid-libxul-OOM-python-check.patch')
-sha256sums=('3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8'
+sha256sums=('54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640'
             'SKIP'
-            '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
-            'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
-            'b49be4fa3d223a22f183f0b6dd0c6b4ab77bd59a8284bafac6c274336eb595a9'
+            '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
+            '7525978203aa967ef9e57b5dc745f526e6fb4e077fc91e38f852e77fabc13978'
+            '57ea7663a8bf3d9326cf17798db0846b987bd26f4a20670d9aa3a02a58a29471'
             'SKIP'
-            '443025f7ef7e1b5b506eaf4f468da7ce827696298b8b79e46151039834f5836a'
+            'fae245fdfede4be29d305bcf9368ef060c1dba7e2e1402c0fc00c199523d0b36'
             'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
             'cc3d71eb493a3d53b1662567cae872f81ff99e0845d59ac402a890461c356183')
-sha256sums_i686=('c4110c8851c9076c6344666cd8ead6b50ca12ce7e25acf8e90849ccece045a44'
+sha256sums_i686=('26ed6fd73b14209e9bb7e8fd0998a8ef02ae9eb390e692e639badd69d702f518'
                  '3ae2b45f6231d0f78a52771e110b75284b649aa72571ced7e2e062ec25163ee5')
 sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
                    '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
+validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
+
 
 prepare() {
   mkdir mozbuild
@@ -130,18 +129,22 @@ export MOZ_APP_REMOTINGNAME=${pkgname//-/}
 export MOZ_TELEMETRY_REPORTING=
 export MOZ_REQUIRE_SIGNING=
 
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
 # Features
 ac_add_options --enable-alsa
 ac_add_options --enable-jack
-ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
-ac_add_options --disable-gconf
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-eme
 END
 
+
   ## [ARCH-SPECIFIC CONFIG] ##
+
   case ${CARCH} in
     armv7h)
       sed -i '
@@ -284,7 +287,9 @@ build() {
   # LTO needs more open files
   ulimit -n 4096
 
+
   ## [ARCH-SPECIFIC BUILD ENV] ##
+
   if [[ $CARCH != armv7h ]]; then
     # -fno-plt with cross-LTO causes obscure LLVM errors
     # LLVM ERROR: Function Import: link error
@@ -318,7 +323,9 @@ build() {
     ;;
   esac
 
+
   ## [ARCH-SPECIFIC BUILD CONFIG] ##
+
   case ${CARCH} in
     armv7h)
       # skipping PGO "instrumented browser"; so we have the final .mozconfig now
@@ -382,7 +389,9 @@ END
     ;;
   esac
 
-  # sanity checks
+
+  ## sanity checks ##
+
   # each of the [ARCH-SPECIFIC BUILD CONFIG] branches above should have created .mozconfig
   [[ ! -f .mozconfig ]] && echo ".mozconfig file not found in source root" && return 1
 
@@ -447,7 +456,9 @@ END
 exec /usr/lib/$pkgname/$pkgname "\$@"
 END
 
+
   ## [ARCH-SPECIFIC INSTALL] ##
+
   case ${CARCH} in
     armv7h)
     ;;
@@ -473,4 +484,3 @@ END
   fi
 }
 
-# vim:set sw=2 et:
diff --git a/libre/iceweasel/iceweasel.desktop b/libre/iceweasel/iceweasel.desktop
index 1e9917e79..ed47c283d 100644
--- a/libre/iceweasel/iceweasel.desktop
+++ b/libre/iceweasel/iceweasel.desktop
@@ -338,3 +338,4 @@ Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
 Exec=/usr/lib/iceweasel/iceweasel --private-window %u
+