From 2aefa8c31a800986069c198bcc45c25094be7e7f Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Fri, 2 Nov 2018 16:01:58 -0500
Subject: iceweasel-1:61.0.2-1.parabola4: rebuild against icu 63.1

---
 .../iceweasel/0001-branding-Fix-for-v60-v61.patch  | 72 ++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 libre-testing/iceweasel/0001-branding-Fix-for-v60-v61.patch

(limited to 'libre-testing/iceweasel/0001-branding-Fix-for-v60-v61.patch')

diff --git a/libre-testing/iceweasel/0001-branding-Fix-for-v60-v61.patch b/libre-testing/iceweasel/0001-branding-Fix-for-v60-v61.patch
new file mode 100644
index 000000000..2651473ad
--- /dev/null
+++ b/libre-testing/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
+
-- 
cgit v1.2.3