diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2018-07-09 17:09:14 +0200 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2018-07-09 17:09:14 +0200 |
commit | aa41d6d1f7d406803047023bc6446e3907a7d25c (patch) | |
tree | 7dee871d7d7a2e884c8d367fc92c55f588ef755c | |
parent | a973131882cad8b1f5baba5d32512d1973f07bd4 (diff) |
updated to 61.0 branding61.0-1
5 files changed, 8 insertions, 8 deletions
@@ -3,7 +3,7 @@ set -eu pkgname=iceweasel -brandingver=60.0 +brandingver=61.0 brandingrel=1 srcdir=src diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch index b376add..9f09d63 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 -@@ -128,9 +128,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png +@@ -124,9 +124,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 d675f43..d5cfd7f 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 -@@ -5508,9 +5508,7 @@ pref("dom.mapped_arraybuffer.enabled", t +@@ -5315,9 +5315,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 -@@ -44,3 +44,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] +@@ -49,3 +49,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] 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 7464e28..f15e90c 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 -@@ -4602,7 +4602,7 @@ XREMain::XRE_mainRun() +@@ -4607,7 +4607,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/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch index fbbbf7a..69734c3 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 -@@ -601,13 +601,6 @@ +@@ -407,13 +407,6 @@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest @RESPATH@/chrome/recording/* @@ -16,8 +16,8 @@ index cffcff1..85d28cc 100644 @RESPATH@/browser/features/* ; [Webide Files] -@@ -612,15 +605,10 @@ - @RESPATH@/browser/@PREF_DIR@/devtools.js +@@ -432,15 +425,10 @@ + @RESPATH@/browser/@PREF_DIR@/devtools-client.js @RESPATH@/browser/@PREF_DIR@/debugger.js -; shell icons |