libre/iceweasel: sync with upstreams 78.0.1

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

2 files changed, 22 insertions, 49 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 73b742ba9..a3b1f39cf 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -44,7 +44,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=77.0.1
+pkgver=78.0.1
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=77.0
@@ -55,9 +55,9 @@ arch+=(i686 armv7h)
 license=(MPL GPL LGPL)
 url="https://wiki.parabola.nu/Iceweasel"
 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)
+makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm
+             python-setuptools python-psutil)
 # FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare())
 makedepends+=(quilt libxslt imagemagick)
 optdepends=('networkmanager: Location detection via available WiFi networks'
@@ -78,17 +78,17 @@ 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=('54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640'
+sha256sums=('494d277b120028e036e2aee3f658d79afc895457dc6aadb1c02f0547ef1d66ca'
             'SKIP'
             '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
-            '7525978203aa967ef9e57b5dc745f526e6fb4e077fc91e38f852e77fabc13978'
+            '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc'
             '57ea7663a8bf3d9326cf17798db0846b987bd26f4a20670d9aa3a02a58a29471'
             'SKIP'
-            'fae245fdfede4be29d305bcf9368ef060c1dba7e2e1402c0fc00c199523d0b36'
-            'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
+            'f9d0a6b4ecd82d28b130a9c08dc3b060b50f1f34fc47d2a4675f9d982d15b3b3'
+            '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'
             'cc3d71eb493a3d53b1662567cae872f81ff99e0845d59ac402a890461c356183')
-sha256sums_i686=('26ed6fd73b14209e9bb7e8fd0998a8ef02ae9eb390e692e639badd69d702f518'
-                 '3ae2b45f6231d0f78a52771e110b75284b649aa72571ced7e2e062ec25163ee5')
+sha256sums_i686=('125000a8d4eec602d51eebcb9c94fb48c3ec1f5162ea28116bfdfe14d1a34cf9'
+                 '6395b7e349963c9a689929b44525159328954af156ef0b9a42182e7e16baa8ba')
 sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
                    '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index bde8de32d..4464fe5fe 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -240,7 +240,7 @@ index edd871b..77870fe 100644
 
  search-header-shortcut =
 @@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
- extension-heading-search-label = Find more extensions
+
  default-heading-search-label = Find more add-ons
  addons-heading-search-input =
 -    .placeholder = Search addons.mozilla.org
@@ -292,12 +292,12 @@ index 4c4ea76..e0f2880 100644
 -gecko.handlerService.schemes.ircs.0.name=Mibbit
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 8d055e583f..00837e77a3 100644
+index cd9bc92969..e35c951e67 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -1599,10 +1599,6 @@ pref("browser.contentblocking.report.monitor.how_it_works.url", "https://monitor
- pref("browser.contentblocking.report.monitor.sign_in_url", "https://monitor.firefox.com/oauth/init?entrypoint=protection_report_monitor&utm_source=about-protections&email=");
+@@ -1639,10 +1639,6 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
  pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients");
+ pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true");
  pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections");
 -pref("browser.contentblocking.report.lockwise.mobile-ios.url", "https://apps.apple.com/app/id1314000270");
 -pref("browser.contentblocking.report.lockwise.mobile-android.url", "https://play.google.com/store/apps/details?id=mozilla.lockbox&referrer=utm_source%3Dprotection_report%26utm_content%3Dmobile_promotion");
@@ -306,7 +306,7 @@ index 8d055e583f..00837e77a3 100644
  
  // Protection Report's SUMO urls
  pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report");
-@@ -1733,11 +1729,6 @@ pref("signon.management.page.os-auth.enabled", false);
+@@ -1774,11 +1770,6 @@ pref("signon.management.page.os-auth.enabled", false);
  pref("signon.management.page.breach-alerts.enabled", true);
  pref("signon.management.page.vulnerable-passwords.enabled", true);
  pref("signon.management.page.sort", "name");
@@ -414,10 +414,10 @@ index 33c380a898..fdc1ccb38c 100644
      </template>
  
 diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
-index 5f2087bbe4..ca93a4fcda 100644
+index e7aac37ed6..164a07988d 100644
 --- a/browser/components/protections/content/protections.html
 +++ b/browser/components/protections/content/protections.html
-@@ -114,24 +114,6 @@
+@@ -115,24 +115,6 @@
              <div id="graph-total-summary"></div>
            </div>
          </div>
@@ -442,12 +442,10 @@ index 5f2087bbe4..ca93a4fcda 100644
        </div>
       <!-- Markup for Monitor card. -->
        <section class="card card-no-hover monitor-card hidden">
-@@ -219,47 +201,6 @@
-             <button id="open-about-logins-button" class="primary" data-l10n-id="protection-report-view-logins-button"></button>
-           </div>
+@@ -256,20 +238,6 @@
          </div>
--        <div class="card-body hidden">
--          <div id="lockwise-body-content" class="body-wrapper">
+         <div class="card-body hidden">
+           <div id="lockwise-body-content" class="body-wrapper">
 -            <div class="no-logins hidden">
 -              <button class="exit-icon" data-l10n-id="protections-close-button2"></button>
 -              <img class="mobile-app-icon" src="chrome://browser/content/logos/lockwise-mobile.svg"/>
@@ -462,34 +460,9 @@ index 5f2087bbe4..ca93a4fcda 100644
 -                </p>
 -              </span>
 -            </div>
--            <div class="has-logins hidden">
--              <span class="number-of-logins block">
--                <!-- Display number of stored logins here. -->
--              </span>
--              <span class="passwords-stored-text">
--                <img class="icon-small" src= "chrome://browser/skin/login.svg"/>
--                <span id="lockwise-passwords-stored">
--                  <!-- Display message for stored logins here. -->
--                  <a target="_blank" id="lockwise-how-it-works" data-l10n-name="lockwise-how-it-works" href=""></a>
--                </span>
--              </span>
--              <span class="number-of-synced-devices block">
--                <!-- Display number of synced devices here. -->
--              </span>
--              <span class="synced-devices-text">
--                <img class="icon-small" src="chrome://browser/skin/sync.svg"/>
--                <span>
--                  <!-- Display message for status of synced devices here. -->
--                </span>
--                <a id="turn-on-sync" tabindex="0" class="hidden" href="" data-l10n-id="turn-on-sync"></a>
--                <a id="manage-devices" target="_blank" class="hidden" href="" data-l10n-id="manage-connected-devices"></a>
--              </span>
--            </div>
--          </div>
--        </div>
+           </div>
+         </div>
        </section>
-       <!-- Markup for Proxy card -->
-       <section class="card card-no-hover proxy-card hidden">
 diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl
 index 03feeef059..f9580d0f8f 100644
 --- a/browser/locales/en-US/browser/aboutLogins.ftl