From cae02747c7f838d02bd1e51023d72a1ab95ac077 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 4 Mar 2019 21:07:47 +0100 Subject: updating branding patches to 2.49 --- src/patches/iceape-branding/Branding.patch | 133 ----------------------------- src/patches/iceape-branding/branding.patch | 133 +++++++++++++++++++++++++++++ src/patches/series | 2 +- 3 files changed, 134 insertions(+), 134 deletions(-) delete mode 100644 src/patches/iceape-branding/Branding.patch create mode 100644 src/patches/iceape-branding/branding.patch (limited to 'src/patches') diff --git a/src/patches/iceape-branding/Branding.patch b/src/patches/iceape-branding/Branding.patch deleted file mode 100644 index 53944e6..0000000 --- a/src/patches/iceape-branding/Branding.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff --git a/suite/branding/nightly/moz.build b/suite/branding/nightly/moz.build -index ccd2e60..dfad066 100644 ---- a/suite/branding/nightly/moz.build -+++ b/suite/branding/nightly/moz.build -@@ -53,7 +53,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): - - if icon_dir == 'gtk': - FINAL_TARGET_FILES.chrome.icons.default += [ -- 'icons/gtk/seamonkey.png' -+ 'icons/gtk/iceape.png' - ] - - desktop_icons += [ -diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js -index ee2803b..f87dff8 100644 ---- a/suite/browser/browser-prefs.js -+++ b/suite/browser/browser-prefs.js -@@ -92,7 +92,7 @@ pref("browser.findbar.enabled", true); - pref("browser.doorhanger.enabled", true); - - // search engines URL --pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search/?atype=4"); -+pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat"); - - // pointer to the default engine name - pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); -@@ -639,13 +639,13 @@ pref("extensions.autoDisableScopes", 15); - // Preferences for AMO integration - pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); -+pref("extensions.getAddons.get.url", "https://directory.fsf.org/wiki/GNU_IceCat"); - pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/"); -+pref("extensions.getAddons.link.url", "https://directory.fsf.org/wiki/GNU_IceCat"); - pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.search.browseURL", "https://directory.fsf.org/wiki/GNU_IceCat"); -+pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); -+pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); - - // getMoreThemes is used by our UI under our switch theme menu - pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); -diff --git a/suite/confvars.sh b/suite/confvars.sh -index c44cc95..988131d 100755 ---- a/suite/confvars.sh -+++ b/suite/confvars.sh -@@ -3,10 +3,10 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --MOZ_APP_BASENAME=SeaMonkey --MOZ_APP_VENDOR=Mozilla --MOZ_APP_NAME=seamonkey --MOZ_APP_DISPLAYNAME=SeaMonkey -+MOZ_APP_BASENAME=Iceape -+MOZ_APP_VENDOR=SeaMonkey Council -+MOZ_APP_NAME=iceape -+MOZ_APP_DISPLAYNAME=Iceape - MOZ_LDAP_XPCOM=1 - MOZ_CHROME_FILE_FORMAT=omni - MOZ_COMPOSER=1 -diff --git a/suite/locales/en-US/chrome/branding/brand.dtd b/suite/locales/en-US/chrome/branding/brand.dtd -index f9cd0b1..061e3f4 100644 ---- a/suite/locales/en-US/chrome/branding/brand.dtd -+++ b/suite/locales/en-US/chrome/branding/brand.dtd -@@ -2,8 +2,8 @@ - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - -- -- -- -- -+ -+ -+ -+ - -diff --git a/suite/locales/en-US/chrome/branding/brand.properties b/suite/locales/en-US/chrome/branding/brand.properties -index 3263135..71904cc 100644 ---- a/suite/locales/en-US/chrome/branding/brand.properties -+++ b/suite/locales/en-US/chrome/branding/brand.properties -@@ -2,13 +2,12 @@ - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - --brandFullName=SeaMonkey --brandShortName=SeaMonkey --brandShorterName=SeaMonkey --vendorShortName=SeaMonkey -+brandFullName=Iceape -+brandShortName=Iceape -+brandShorterName=Iceape -+vendorShortName=SeaMonkey Council - sidebarName=Sidebar --extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/complete-themes/ --extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes/?sort=up-and-coming --spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries --app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ --app.vendorURL=http://www.seamonkey-project.org/ -+extensions.getMoreThemesURL=https://directory.fsf.org/wiki/GNU_IceCat -+extensions.getPersonasURL= -+app.releaseNotesURL= -+app.vendorURL= -diff --git a/suite/themes/classic/install.rdf b/suite/themes/classic/install.rdf -index 58d0ecc..95f4c86 100644 ---- a/suite/themes/classic/install.rdf -+++ b/suite/themes/classic/install.rdf -@@ -25,7 +25,7 @@ - - - -- SeaMonkey Default Theme -+ Iceape Default Theme - This theme uses styles and colors from the system to fit in with other applications. - - -- SeaMonkey Modern -+ Iceape Modern - A contemporary theme for all components. - - + +- +- +- +- ++ ++ ++ ++ + +diff --git a/suite/locales/en-US/chrome/branding/brand.properties b/suite/locales/en-US/chrome/branding/brand.properties +index 3263135..71904cc 100644 +--- a/suite/locales/en-US/chrome/branding/brand.properties ++++ b/suite/locales/en-US/chrome/branding/brand.properties +@@ -2,13 +2,12 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-brandFullName=SeaMonkey +-brandShortName=SeaMonkey +-brandShorterName=SeaMonkey +-vendorShortName=SeaMonkey ++brandFullName=Iceape ++brandShortName=Iceape ++brandShorterName=Iceape ++vendorShortName=SeaMonkey Council + sidebarName=Sidebar +-extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/complete-themes/ +-extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes/?sort=up-and-coming +-spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries +-app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ +-app.vendorURL=http://www.seamonkey-project.org/ ++extensions.getMoreThemesURL=https://directory.fsf.org/wiki/GNU_IceCat ++extensions.getPersonasURL= ++app.releaseNotesURL= ++app.vendorURL= +diff --git a/suite/themes/classic/install.rdf b/suite/themes/classic/install.rdf +index 58d0ecc..95f4c86 100644 +--- a/suite/themes/classic/install.rdf ++++ b/suite/themes/classic/install.rdf +@@ -25,7 +25,7 @@ + + + +- SeaMonkey Default Theme ++ Iceape Default Theme + This theme uses styles and colors from the system to fit in with other applications. + + +- SeaMonkey Modern ++ Iceape Modern + A contemporary theme for all components. + +