From a586361961a0696e5a16e98673ca309c57ac3319 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 23 Aug 2018 16:54:55 -0400
Subject: libre/iceweasel: Fixup libre.patch

 - There is no Iceweasel OS, that is over-zealous
 - "Iceweasel's" instead of "Iceweasel'"
---
 libre/iceweasel/PKGBUILD    |  8 ++++----
 libre/iceweasel/libre.patch | 15 +--------------
 2 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'libre/iceweasel')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 5b0fc5d70..46a8e85bc 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -62,7 +62,10 @@ _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         $pkgname.desktop)
 sha256sums=('SKIP'
-            'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa')
+            'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
+            'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
+            'SKIP'
+            'b695926b8a1f9560f0e11e0bad2ef42df6152d4f16f95af1027bc12c487c1ede')
 
 # Branding
 _brandingver=$(cut -d. -f1,2<<<"$pkgver")
@@ -70,9 +73,6 @@ _brandingrel=1
 makedepends+=(mozilla-searchplugins quilt libxslt imagemagick)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
          libre.patch)
-sha256sums+=('dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
-             'SKIP'
-             'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2')
 validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 prepare() {
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index d8b9f7171..ef89d0853 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -332,19 +332,6 @@ index 842d549f0..31dcb82e5 100644
  # Scratchpad and the Style Editor tools.
  
  # LOCALIZATION NOTE The correct localization of this file might be to keep it
-diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
-index 6097fa82a..3dfe372db 100644
---- a/devtools/client/locales/en-US/toolbox.dtd
-+++ b/devtools/client/locales/en-US/toolbox.dtd
-@@ -81,7 +81,7 @@
-   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
-   -  boolean preference in about:config, in the options panel. -->
- <!ENTITY options.enableRemote.label3    "Enable remote debugging">
--<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
-+<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
- 
- <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
-   -  options.disableJavaScript.tooltip): This is the options panel label and
 diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
 index 5e1a80ccd..8f375da2e 100644
 --- a/devtools/client/locales/en-US/webide.dtd
@@ -363,7 +350,7 @@ index 5e1a80ccd..8f375da2e 100644
  <!ENTITY runtimeButton_label "Select Runtime">
  
 -<!-- We try to repicate Firefox' bindings: -->
-+<!-- We try to repicate Iceweasel' bindings: -->
++<!-- We try to repicate Iceweasel's bindings: -->
  <!-- quit app -->
  <!ENTITY key_quit "W">
  <!-- open menu -->
-- 
cgit v1.2.2