From 5f8b1eeed6a06267c8572ba6de735b0ba601e7fa Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Mon, 18 Nov 2019 01:04:04 +0100 Subject: updated branding patches for icedove 68.2 --- src/patches/debian-hacks/Icedove-branding.patch | 37 ---------------------- src/patches/icedove/Icedove-branding.patch | 15 +++++++++ ...g-in-migration-wizard-and-the-addon-manag.patch | 25 ++++++--------- src/patches/icedove/fix-installdir.patch | 2 +- .../iceowl/Change-extension-s-name-to-Iceowl.patch | 26 +++++++-------- src/patches/series | 2 +- 6 files changed, 40 insertions(+), 67 deletions(-) delete mode 100644 src/patches/debian-hacks/Icedove-branding.patch create mode 100644 src/patches/icedove/Icedove-branding.patch (limited to 'src') diff --git a/src/patches/debian-hacks/Icedove-branding.patch b/src/patches/debian-hacks/Icedove-branding.patch deleted file mode 100644 index 2535c7c..0000000 --- a/src/patches/debian-hacks/Icedove-branding.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: =?utf-8?q?Guido_G=C3=BCnther?= -Date: Sat, 24 Nov 2012 11:36:16 +0100 -Subject: Icedove branding - ---- - im/app/application.ini | 2 +- - mail/confvars.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/comm/im/app/application.ini b/comm/im/app/application.ini -index 856b900..9ffa5d8 100644 ---- a/comm/im/app/application.ini -+++ b/comm/im/app/application.ini -@@ -4,7 +4,7 @@ - - #filter substitution - [App] --Name=Instantbird -+Name=Icedove - Version=@APP_VERSION@ - BuildID=@MOZ_BUILDID@ - #ifdef MOZ_SOURCE_REPO -diff --git a/comm/mail/confvars.sh b/comm/mail/confvars.sh -index bbf6f2d..57d0097 100644 ---- a/comm/mail/confvars.sh -+++ b/comm/mail/confvars.sh -@@ -5,8 +5,8 @@ - - . ${_topsrcdir}/$MOZ_BUILD_APP/../comm-confvars.sh - --MOZ_APP_BASENAME=Thunderbird --MOZ_APP_NAME=thunderbird -+MOZ_APP_BASENAME=Icedove -+MOZ_APP_NAME=icedove - MOZ_UPDATER=1 - - if test "$OS_ARCH" = "WINNT" -o \ diff --git a/src/patches/icedove/Icedove-branding.patch b/src/patches/icedove/Icedove-branding.patch new file mode 100644 index 0000000..ea7f564 --- /dev/null +++ b/src/patches/icedove/Icedove-branding.patch @@ -0,0 +1,15 @@ +diff --git a/comm/mail/confvars.sh b/comm/mail/confvars.sh +index bbf6f2d..57d0097 100644 +--- a/comm/mail/confvars.sh ++++ b/comm/mail/confvars.sh +@@ -3,8 +3,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/. + +-MOZ_APP_BASENAME=Thunderbird +-MOZ_APP_NAME=thunderbird ++MOZ_APP_BASENAME=Icedove ++MOZ_APP_NAME=icedove + MOZ_UPDATER=1 + + if test "$OS_ARCH" = "WINNT"; then diff --git a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch index 9fa8507..d9062b7 100644 --- a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch +++ b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch @@ -16,7 +16,7 @@ diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/al index db3b25d..ac240c6 100644 --- a/comm/mail/app/profile/all-thunderbird.js +++ b/comm/mail/app/profile/all-thunderbird.js -@@ -98,7 +98,7 @@ pref("app.update.url", "https://aus5.moz +@@ -73,7 +73,7 @@ pref("app.update.url", "https://aus.thun pref("app.update.url.manual", "https://www.thunderbird.net"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. @@ -25,7 +25,7 @@ index db3b25d..ac240c6 100644 // app.update.promptWaitTime is in branding section -@@ -111,14 +111,14 @@ pref("app.update.service.enabled", true) +@@ -93,17 +93,17 @@ pref("app.update.BITS.inTrialGroup", fal #endif // Release notes URL @@ -40,9 +40,13 @@ index db3b25d..ac240c6 100644 -pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/%APP%/%APPBUILDID%/"); +pref("app.support.baseURL", "https://support.thunderbird.net/%LOCALE%/thunderbird/%APPBUILDID%/"); + // Base url for web-based feedback pages. +-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/"); ++pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/thunderbird/%VERSION%/"); + // Show error messages in error console. pref("javascript.options.showInConsole", true); -@@ -165,11 +165,11 @@ pref("extensions.getAddons.cache.enabled +@@ -152,11 +152,11 @@ pref("extensions.getAddons.cache.enabled pref("extensions.getAddons.maxResults", 15); pref("extensions.getAddons.get.url", "https://services.addons.thunderbird.net/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%"); @@ -56,10 +60,10 @@ index db3b25d..ac240c6 100644 +pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/search/?q=%TERMS%"); +pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); - pref("extensions.getAddons.themes.browseURL", "https://addons.thunderbird.net/%LOCALE%/thunderbird/themes/?src=thunderbird"); pref("extensions.getAddons.siteRegExp", "^https://.*addons\\.thunderbird\\.net"); + pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%"); -@@ -426,7 +426,7 @@ pref("browser.helperApps.deleteTempFileO +@@ -403,7 +403,7 @@ pref("browser.helperApps.deleteTempFileO pref("spellchecker.dictionary", ""); // Dictionary download preference @@ -68,20 +72,11 @@ index db3b25d..ac240c6 100644 // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular // mail application without any user intervention. Possible values are: -@@ -747,7 +747,7 @@ pref("plugins.hide_infobar_for_carbon_fa - - pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/"); - pref("plugins.update.notifyUser", false); --pref("plugins.crash.supportUrl", "https://live.thunderbird.net/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("plugins.crash.supportUrl", "https://live.thunderbird.net/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // Click-to-play has not been ported for TB yet, see bug 814168. - // The default plugin state should be changed to "ask to activate" when this diff --git a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd index 3a9c30c..65e6203 100644 --- a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd +++ b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd -@@ -80,7 +80,7 @@ +@@ -91,7 +91,7 @@ diff --git a/src/patches/icedove/fix-installdir.patch b/src/patches/icedove/fix-installdir.patch index 73654be..cb45bba 100644 --- a/src/patches/icedove/fix-installdir.patch +++ b/src/patches/icedove/fix-installdir.patch @@ -10,7 +10,7 @@ diff --git a/comm/mail/app/Makefile.in b/comm/mail/app/Makefile.in index 74c164b..1c9ea15 100644 --- a/comm/mail/app/Makefile.in +++ b/comm/mail/app/Makefile.in -@@ -100,6 +100,13 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TO +@@ -104,6 +104,13 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TO libs:: $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/messengerWindow.ico $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default diff --git a/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch b/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch index cac8e7b..2d80812 100644 --- a/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch +++ b/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch @@ -3,24 +3,24 @@ Date: Thu, 3 Nov 2011 22:35:44 +0100 Subject: Change extension's name to Iceowl --- - calendar/lightning/install.rdf | 2 +- + calendar/lightning/manifest.json | 2 +- calendar/locales/en-US/chrome/calendar/timezones.properties | 2 +- calendar/locales/en-US/chrome/lightning/lightning.properties | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/comm/calendar/lightning/install.rdf b/comm/calendar/lightning/install.rdf +diff --git a/comm/calendar/lightning/manifest.json b/comm/calendar/lightning/manifest.json index ae6dbd2..f71d848 100644 ---- a/comm/calendar/lightning/install.rdf -+++ b/comm/calendar/lightning/install.rdf -@@ -30,7 +30,7 @@ - - - @XPI_EM_ID@ -- Lightning -+ Iceowl - @LIGHTNING_VERSION@ - Integrated Calendaring & Scheduling for your Email client - #ifdef LIGHTNING_PRERELEASE_VERSION +--- a/comm/calendar/lightning/manifest.json ++++ b/comm/calendar/lightning/manifest.json +@@ -5,7 +5,7 @@ + #filter substitution + { + "manifest_version": 2, +- "name": "Lightning", ++ "name": "Iceowl", + "description": "Integrated Calendaring & Scheduling for your Email client", + "version": "@LIGHTNING_VERSION@", + "author": "Mozilla Calendar Project", diff --git a/comm/calendar/locales/en-US/chrome/calendar/timezones.properties b/comm/calendar/locales/en-US/chrome/calendar/timezones.properties index f15d3ab..ee96858 100644 --- a/comm/calendar/locales/en-US/chrome/calendar/timezones.properties diff --git a/src/patches/series b/src/patches/series index 19b3d86..11bb16d 100644 --- a/src/patches/series +++ b/src/patches/series @@ -1,4 +1,4 @@ -debian-hacks/Icedove-branding.patch +icedove/Icedove-branding.patch icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch icedove/fix-installdir.patch iceowl/Change-extension-s-name-to-Iceowl.patch -- cgit v1.2.2