From 9e116183392947017ee4e761b500c7beeaba0f02 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Fri, 10 Apr 2020 19:35:55 +0200
Subject: Revert "libre/iceweasel 75.0-1: Bump version and refresh patch
 accordingly"

This reverts commit 87e2c81901db00a49ddc3faa967fefd2932141e4.
---
 libre/iceweasel/PKGBUILD    |  6 +++---
 libre/iceweasel/libre.patch | 21 +++++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 21c12c4d1..ddd047158 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -47,10 +47,10 @@
 pkgname=iceweasel
 replaces=('firefox')
 epoch=1
-pkgver=75.0
+pkgver=74.0.1
 pkgrel=1
 pkgrel+=.parabola1
-_brandingver=75.0
+_brandingver=73.0
 _brandingrel=1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
 arch=(x86_64)
@@ -82,7 +82,7 @@ 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=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f'
+sha256sums=('62e4297b682fad1ea50d8e32fc51c811169f8edec8d12d2aab0ea60b3197f011'
             'SKIP'
             '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
             'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 6ac39f8b1..0870d45cb 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -25,14 +25,14 @@ index 7d37d26..4ebbc06 100644
      </hbox>
 -    <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo">
 -      <html:img
--        src="chrome://browser/skin/logo-android.svg"
+-        src="chrome://browser/skin/preferences/in-content/logo-android.svg"
 -        data-l10n-name="android-icon"
 -        class="androidIcon"/>
 -      <html:a
 -        data-l10n-name="android-link"
 -        class="fxaMobilePromo-android text-link" target="_blank"/>
 -      <html:img
--        src="chrome://browser/skin/logo-ios.svg"
+-        src="chrome://browser/skin/preferences/in-content/logo-ios.svg"
 -        data-l10n-name="ios-icon"
 -        class="iOSIcon"/>
 -      <html:a
@@ -166,19 +166,19 @@ index 2d3c7b4..00221d3 100644
 -#endif
  </dl>
 diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js
-index 26061a604f..a9016f6bda 100644
+index 1573c23a39..eed066db72 100644
 --- a/devtools/client/whats-new/src/main.js
 +++ b/devtools/client/whats-new/src/main.js
 @@ -29,7 +29,7 @@ const aside = {
  };
  
  const release = {
--  title: "What’s New in DevTools (Firefox 75)",
-+  title: "What’s New in DevTools (Iceweasel 75)",
+-  title: "What’s New in DevTools (Firefox 74 & 73)",
++  title: "What’s New in DevTools (Iceweasel 74 & 73)",
    linkText: "Read more",
-   linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/75?${utmParams}`,
+   linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/74?${utmParams}`,
    features: [
-@@ -66,24 +66,6 @@ const release = {
+@@ -71,29 +71,6 @@ const release = {
    ],
  };
  
@@ -197,13 +197,18 @@ index 26061a604f..a9016f6bda 100644
 -      description: `Start, pause and debug your Service Workers and inspect your Web App Manifests within the long-awaited Application panel.`,
 -      href: `https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers?${utmParams}`,
 -    },
+-    {
+-      header: `Instantly evaluated Console previews`,
+-      description: `Peek into the results of your current Console expression and autocomplete values as you type.`,
+-      href: `https://developer.mozilla.org/en-US/docs/Tools/Web_Console/The_command_line_interpreter?${utmParams}`,
+-    },
 -  ],
 -};
 -
  function openLink(href, e) {
    return openDocLink(href, {
      relatedToCurrent: true,
-@@ -177,11 +159,6 @@ class App extends Component {
+@@ -187,11 +164,6 @@ class App extends Component {
            ...release.features
              .filter(feature => !feature.hidden)
              .map(feature => createFactory(Feature)(feature))
-- 
cgit v1.2.3