updated to 67.0 branding67.0-1

5 files changed, 9 insertions, 9 deletions

diff --git a/release.sh b/release.sh
index 4f6bebf..3c22b98 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
 set -eu
 
 pkgname=iceweasel
-brandingver=66.0
+brandingver=67.0
 brandingrel=1
 
 srcdir=src
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 174a425..2ff6677 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
-@@ -5537,9 +5537,7 @@ pref("dom.mapped_arraybuffer.enabled", t
+@@ -5630,9 +5630,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
-@@ -52,3 +52,6 @@ if CONFIG['NIGHTLY_BUILD']:
+@@ -52,3 +52,6 @@ if CONFIG['MOZ_ENABLE_WEBRENDER']:
  FINAL_TARGET_PP_FILES += [
      'greprefs.js',
  ]
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 c1f9c19..dad8a5c 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
@@ -12,8 +12,8 @@ index 52c35c7..af2c0cf 100644
 --- a/toolkit/modules/ResetProfile.jsm
 +++ b/toolkit/modules/ResetProfile.jsm
 @@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["ResetProfile"];
- ChromeUtils.import("resource://gre/modules/Services.jsm");
- ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+ const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
  
 -const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME;
 +const MOZ_APP_NAME = "firefox";
@@ -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
-@@ -4163,7 +4163,7 @@ nsresult XREMain::XRE_mainRun() {
+@@ -4377,7 +4377,7 @@ nsresult 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 02f6071..2a5733f 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
-@@ -643,8 +643,6 @@ class Path(ContextDerivedValue, unicode):
+@@ -637,8 +637,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 6dd41f2..9e73b5e 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
-@@ -406,13 +406,6 @@
+@@ -240,13 +240,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]
-@@ -431,15 +424,10 @@
+@@ -265,15 +258,10 @@
  @RESPATH@/browser/@PREF_DIR@/devtools-client.js
  @RESPATH@/browser/@PREF_DIR@/debugger.js