libre/iceweasel: Fix the branding in a patch

2 files changed, 79 insertions, 3 deletions

diff --git a/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch b/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch
new file mode 100644
index 000000000..2651473ad
--- /dev/null
+++ b/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch
@@ -0,0 +1,72 @@
+From 1e6b9c496d27014f988d83f6b20625a9eb4c624a Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@parabola.nu>
+Date: Sat, 25 Aug 2018 17:29:32 -0400
+Subject: [PATCH] branding: Fix for v60/v61
+
+ - Makefile.in doesn't respect VPATH
+ - firefox-branding.js uses lockPref(), which no longer exists
+ - brand.dtd sets trademarkInfo.part2, which no longer exists
+ - brand.properties doesn't set syncBrandShortName
+ - brand.ftl doesn't exist, but it needs to
+
+---
+ branding/Makefile.in                    | 2 +-
+ branding/firefox-branding.js            | 1 -
+ branding/locales/en-US/brand.dtd        | 1 -
+ branding/locales/en-US/brand.ftl        | 2 ++
+ branding/locales/en-US/brand.properties | 2 ++
+ 5 files changed, 5 insertions(+), 3 deletions(-)
+ create mode 100644 branding/locales/en-US/brand.ftl
+
+diff --git a/branding/Makefile.in b/branding/Makefile.in
+index b395c62..deed5a6 100644
+--- a/branding/Makefile.in
++++ b/branding/Makefile.in
+@@ -20,7 +20,7 @@ GARBAGE += $(BROWSER_APP_FILES)
+ 
+ export:: $(BROWSER_APP_FILES)
+ 	$(NSINSTALL) -D $(DIST)/branding
+-	cp $(BROWSER_APP_FILES) $(DIST)/branding/
++	cp $^ $(DIST)/branding/
+ 
+ GARBAGE += iceweasel.png
+ 
+diff --git a/branding/firefox-branding.js b/branding/firefox-branding.js
+index 17cf43e..e92356e 100644
+--- a/branding/firefox-branding.js
++++ b/branding/firefox-branding.js
+@@ -1,4 +1,3 @@
+-lockPref("browser.startup.homepage_override.mstone", "ignore");
+ pref("browser.aboutHomeSnippets.updateUrl", "data:text/html,");
+ pref("startup.homepage_override_url","");
+ pref("startup.homepage_welcome_url","");
+diff --git a/branding/locales/en-US/brand.dtd b/branding/locales/en-US/brand.dtd
+index 50c20d6..c83e6d0 100644
+--- a/branding/locales/en-US/brand.dtd
++++ b/branding/locales/en-US/brand.dtd
+@@ -3,4 +3,3 @@
+ <!ENTITY  brandFullName         "Iceweasel">
+ <!ENTITY  vendorShortName       "Mozilla">
+ <!ENTITY  trademarkInfo.part1   " ">
+-<!ENTITY  trademarkInfo.part2   " ">
+diff --git a/branding/locales/en-US/brand.ftl b/branding/locales/en-US/brand.ftl
+new file mode 100644
+index 0000000..ca180e0
+--- /dev/null
++++ b/branding/locales/en-US/brand.ftl
+@@ -0,0 +1,2 @@
++-brand-short-name = Iceweasel
++-vendor-short-name = Mozilla
+diff --git a/branding/locales/en-US/brand.properties b/branding/locales/en-US/brand.properties
+index b69ae8d..ea073d6 100644
+--- a/branding/locales/en-US/brand.properties
++++ b/branding/locales/en-US/brand.properties
+@@ -2,3 +2,5 @@ brandShorterName=Iceweasel
+ brandShortName=Iceweasel
+ brandFullName=Iceweasel
+ vendorShortName=Mozilla
++
++syncBrandShortName=Sync
+-- 
+2.18.0
+
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index abf995707..5ad29d5bf 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -64,6 +64,7 @@ sha256sums=('SKIP'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
             'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
             'SKIP'
+            'f2ebd5054b81a0f0f642b523a545145bdd5939e70b79c8129415cd1646cc6d74'
             'b695926b8a1f9560f0e11e0bad2ef42df6152d4f16f95af1027bc12c487c1ede')
 
 # Branding
@@ -71,6 +72,7 @@ _brandingver=$(cut -d. -f1,2<<<"$pkgver")
 _brandingrel=1
 makedepends+=(mozilla-searchplugins quilt libxslt imagemagick)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
+         0001-branding-Fix-for-v60-v61.patch
          libre.patch)
 validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
@@ -122,8 +124,9 @@ END
 
   ## Rebranding
   local brandingdir="$srcdir/$pkgname-$_brandingver"
-  sed -i '/lockPref("browser.startup.homepage_override.mstone"/d' \
-      "$brandingdir/branding/firefox-branding.js"
+  pushd "$brandingdir"
+  patch -Np1 -i "$srcdir/0001-branding-Fix-for-v60-v61.patch"
+  popd
   # file dump
   rm -rf -- browser/branding/$pkgname
   cp -aT -- $brandingdir/branding browser/branding/$pkgname
@@ -143,7 +146,8 @@ END
     rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \
       -o "browser/branding/iceweasel/default$i.png"
   done
-  # Patch and remove anything that's left
+
+  # Remove remaining non-free bits
   patch -Np1 -i "$srcdir/libre.patch"
   sed -i 's/Adobe Flash/SWF Player/g' -- \
     browser/base/content/pageinfo/permissions.js \