updated to 65.0 branding65.0-1

7 files changed, 12 insertions, 10 deletions

diff --git a/release.sh b/release.sh
index 507f124..357e506 100755
--- a/release.sh
+++ b/release.sh
@@ -3,8 +3,8 @@
 set -eu
 
 pkgname=iceweasel
-brandingver=61.0.2
-brandingrel=1.parabola1
+brandingver=65.0
+brandingrel=1
 
 srcdir=src
 distdir=${pkgname}-${brandingver}
diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
index 9f09d63..bafb02f 100644
--- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -10,7 +10,7 @@ diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupe
 index c5ab86b65..c402ab76f 100644
 --- a/browser/installer/allowed-dupes.mn
 +++ b/browser/installer/allowed-dupes.mn
-@@ -124,9 +124,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
+@@ -120,9 +120,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
  components/FxAccountsPush.js
  crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
  crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
index d5cfd7f..5be6fe9 100644
--- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
+++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
@@ -12,7 +12,7 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 index 11bfba3..ed817aa 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -5315,9 +5315,7 @@ pref("dom.mapped_arraybuffer.enabled", t
+@@ -5540,9 +5540,7 @@ pref("dom.mapped_arraybuffer.enabled", t
  
  // The tables used for Safebrowsing phishing and malware checks
  pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-harmful-simple,test-malware-simple,test-unwanted-simple");
@@ -27,7 +27,7 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 index 1c2c13e..7783e9d 100644
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -49,3 +49,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
+@@ -51,3 +51,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
  FINAL_TARGET_PP_FILES += [
      'greprefs.js',
  ]
diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
index 6e2427c..b2ef791 100644
--- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
+++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
@@ -50,7 +50,7 @@ index 05cf816..5301b0b 100644
  contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
  unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
  externalProtocolTitle=External Protocol Request
-@@ -36,8 +36,8 @@ unwantedBlocked=The site at %S has been
+@@ -36,9 +36,9 @@ unwantedBlocked=The site at %S has been
  deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
  cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
  corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
@@ -61,3 +61,5 @@ index 05cf816..5301b0b 100644
 +#expand sslv3Used=__MOZ_APP_DISPLAYNAME__ cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
  inadequateSecurityError=The website tried to negotiate an inadequate level of security.
  blockedByPolicy=Your organization has blocked access to this page or website.
+-networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
++#expand networkProtocolError=__MOZ_APP_DISPLAYNAME__ has experienced a network protocol violation that cannot be repaired.
diff --git a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
index f15e90c..3f4a9fd 100644
--- a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
+++ b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
@@ -24,7 +24,7 @@ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
 index fe63faa..66ca008 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4607,7 +4607,7 @@ XREMain::XRE_mainRun()
+@@ -4389,7 +4389,7 @@ XREMain::XRE_mainRun()
          if (gDoProfileReset) {
            // Automatically migrate from the current application if we just
            // reset the profile.
diff --git a/src/patches/iceweasel-branding/enable-object-directory-paths.patch b/src/patches/iceweasel-branding/enable-object-directory-paths.patch
index 2fe5d6f..02f6071 100644
--- a/src/patches/iceweasel-branding/enable-object-directory-paths.patch
+++ b/src/patches/iceweasel-branding/enable-object-directory-paths.patch
@@ -2,7 +2,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
 index 41ae8ae..dcc3263 100644
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -651,8 +651,6 @@ class Path(ContextDerivedValue, unicode):
+@@ -643,8 +643,6 @@ class Path(ContextDerivedValue, unicode):
  class SourcePath(Path):
      """Like Path, but limited to paths in the source directory."""
      def __init__(self, context, value):
diff --git a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
index 69734c3..6b93b51 100644
--- a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
+++ b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch
@@ -2,7 +2,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
 index cffcff1..85d28cc 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -407,13 +407,6 @@
+@@ -405,13 +405,6 @@
  @RESPATH@/chrome/toolkit.manifest
  @RESPATH@/chrome/recording.manifest
  @RESPATH@/chrome/recording/*
@@ -16,7 +16,7 @@ index cffcff1..85d28cc 100644
  @RESPATH@/browser/features/*
  
  ; [Webide Files]
-@@ -432,15 +425,10 @@
+@@ -430,15 +423,10 @@
  @RESPATH@/browser/@PREF_DIR@/devtools-client.js
  @RESPATH@/browser/@PREF_DIR@/debugger.js