From 7b6d9cd0a705601c6b37d323df326004024438a7 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Thu, 25 Jan 2018 13:49:07 +0100 Subject: updated to 58.0 branding --- release.sh | 2 +- src/branding/drm-free.png | Bin 0 -> 3213 bytes src/branding/gnu_headshadow.png | Bin 0 -> 6785 bytes src/branding/parabola-banner.png | Bin 0 -> 7768 bytes src/branding/watermark.svg | 4095 ++++++++++++++++++++ ...hich-phishing-shavar-to-use-depending-on-.patch | 12 +- ...-instead-of-MOZ_APP_NAME-for-profile-rese.patch | 2 +- .../enable-object-directory-paths.patch | 13 + ...ult-and-shell-icons-in-packaging-manifest.patch | 34 + src/patches/series | 2 + 10 files changed, 4152 insertions(+), 8 deletions(-) create mode 100644 src/branding/drm-free.png create mode 100644 src/branding/gnu_headshadow.png create mode 100644 src/branding/parabola-banner.png create mode 100644 src/branding/watermark.svg create mode 100644 src/patches/iceweasel-branding/enable-object-directory-paths.patch create mode 100644 src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch diff --git a/release.sh b/release.sh index a8bb513..48440eb 100755 --- a/release.sh +++ b/release.sh @@ -3,7 +3,7 @@ set -eu pkgname=iceweasel -brandingver=57.0 +brandingver=58.0 brandingrel=1 srcdir=src diff --git a/src/branding/drm-free.png b/src/branding/drm-free.png new file mode 100644 index 0000000..e30994e Binary files /dev/null and b/src/branding/drm-free.png differ diff --git a/src/branding/gnu_headshadow.png b/src/branding/gnu_headshadow.png new file mode 100644 index 0000000..e0f73a3 Binary files /dev/null and b/src/branding/gnu_headshadow.png differ diff --git a/src/branding/parabola-banner.png b/src/branding/parabola-banner.png new file mode 100644 index 0000000..621ee4e Binary files /dev/null and b/src/branding/parabola-banner.png differ diff --git a/src/branding/watermark.svg b/src/branding/watermark.svg new file mode 100644 index 0000000..78898e1 --- /dev/null +++ b/src/branding/watermark.svg @@ -0,0 +1,4095 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + Ricardo Fernández Fuentes + + + + + Ricardo Fernández Fuentes + + + iceweasel icon + + + + iceweasel + ico + icon + + + + + inkscape + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 115f579..0a2b25f 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 @@ -15,19 +15,19 @@ index 11bfba3..ed817aa 100644 @@ -5377,9 +5377,7 @@ pref("dom.mapped_arraybuffer.enabled", t // The tables used for Safebrowsing phishing and malware checks - pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-harmful-simple,test-malware-simple,test-unwanted-simple"); + pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-harmful-simple,test-malware-simple,test-unwanted-simple"); -#ifdef MOZILLA_OFFICIAL --// In the official build, we are allowed to use google's private --// phishing list "goog-phish-shavar". See Bug 1288840. +-// In official builds, we are allowed to use Google's private phishing +-// list (see bug 1288840). +#ifdef MOZ_OFFICIAL_BRANDING - pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple"); + pref("urlclassifier.phishTable", "goog-phish-proto,test-phish-simple"); #else - pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple"); + pref("urlclassifier.phishTable", "googpub-phish-proto,test-phish-simple"); 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 -@@ -48,3 +48,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] +@@ -44,3 +44,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 7510261..13cd7e0 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 -@@ -4482,7 +4482,7 @@ XREMain::XRE_mainRun() +@@ -4460,7 +4460,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 new file mode 100644 index 0000000..4c7b035 --- /dev/null +++ b/src/patches/iceweasel-branding/enable-object-directory-paths.patch @@ -0,0 +1,13 @@ +diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py +index 41ae8ae..dcc3263 100644 +--- a/python/mozbuild/mozbuild/frontend/context.py ++++ b/python/mozbuild/mozbuild/frontend/context.py +@@ -617,8 +617,6 @@ class Path(ContextDerivedValue, unicode): + class SourcePath(Path): + """Like Path, but limited to paths in the source directory.""" + def __init__(self, context, value): +- if value.startswith('!'): +- raise ValueError('Object directory paths are not allowed') + if value.startswith('%'): + raise ValueError('Filesystem absolute paths are not allowed') + super(SourcePath, self).__init__(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 new file mode 100644 index 0000000..266b7e5 --- /dev/null +++ b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch @@ -0,0 +1,34 @@ +diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in +index cffcff1..85d28cc 100644 +--- a/browser/installer/package-manifest.in ++++ b/browser/installer/package-manifest.in +@@ -612,11 +612,6 @@ + @RESPATH@/chrome/toolkit.manifest + @RESPATH@/chrome/recording.manifest + @RESPATH@/chrome/recording/* +-#ifdef MOZ_GTK +-@RESPATH@/browser/chrome/icons/default/default16.png +-@RESPATH@/browser/chrome/icons/default/default32.png +-@RESPATH@/browser/chrome/icons/default/default48.png +-#endif + @RESPATH@/browser/features/* + + ; [Webide Files] +@@ -635,17 +630,10 @@ + @RESPATH@/browser/@PREF_DIR@/devtools.js + @RESPATH@/browser/@PREF_DIR@/debugger.js + +-; shell icons +-#ifdef XP_UNIX +-#ifndef XP_MACOSX +-; shell icons +-@RESPATH@/browser/icons/*.png + #ifdef MOZ_UPDATER + ; updater icon + @RESPATH@/icons/updater.png + #endif +-#endif +-#endif + + ; [Default Preferences] + ; All the pref files must be part of base to prevent migration bugs diff --git a/src/patches/series b/src/patches/series index 77874b0..08a5de2 100644 --- a/src/patches/series +++ b/src/patches/series @@ -2,3 +2,5 @@ iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch iceweasel-branding/Allowed-dupes_for_Iceweasel.patch +iceweasel-branding/enable-object-directory-paths.patch +iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch -- cgit v1.2.2