update for v102102-1wip-v102

8 files changed, 152 insertions, 106 deletions

diff --git a/release.sh b/release.sh
index 1e4deb3..7b82418 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
 set -eu
 
 pkgname=icedove
-brandingver=78.9
+brandingver=102
 brandingrel=1
 
 srcdir=src
diff --git a/src/icedove-branding/moz.build b/src/icedove-branding/moz.build
index 626c0d2..2ab549f 100644
--- a/src/icedove-branding/moz.build
+++ b/src/icedove-branding/moz.build
@@ -8,7 +8,7 @@ DIRS += ['locales']
 JAR_MANIFESTS += ['jar.mn']
 
 @template
-def ThunderbirdBranding():
+def IcedoveBranding():
     JS_PREFERENCE_FILES += [
         'thunderbird-branding.js',
     ]
@@ -31,6 +31,7 @@ def ThunderbirdBranding():
             'default32.png',
             'default48.png',
             'default64.png',
+            #'icedove-symbolic.svg', # TODO:
         ]
 
-ThunderbirdBranding()
+IcedoveBranding()
diff --git a/src/icedove.appdata.xml b/src/icedove.appdata.xml
new file mode 100644
index 0000000..277b4ed
--- /dev/null
+++ b/src/icedove.appdata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>icedove.desktop</id>
+  <launchable type="desktop-id">icedove.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+    <name>Icedove</name>
+  <summary>Icedove is an e-mail, news-feed, chat, and calendar client</summary>
+  <description>
+    <p>
+      Icedove is an e-mail, news-feed, chat, and calendar client. 'Nuff said :)
+    </p>
+  </description>
+  <categories>
+    <category>Calendar</category>
+    <category>Email</category>
+    <category>Office</category>
+  </categories>
+
+  <url type="homepage">https://wiki.parabola.nu/Icedove</url>
+  <url type="bugtracker">https://labs.parabola.nu/</url>
+  <url type="help">http://forum.parabola.nu/</url>
+
+  <project_group>Parabola</project_group>
+  <project_license>MPL-2.0</project_license>
+  <developer_name>Parabola GNU/Linux-libre</developer_name>
+
+  <icon type="remote" width="256" height="256">https://wiki.parabola.nu/images/e/ea/Icedove_icon.png</icon>
+
+  <mimetypes>
+    <mimetype>message/rfc822</mimetype>
+    <mimetype>x-scheme-handler/mailto</mimetype>
+    <mimetype>text/calendar</mimetype>
+    <mimetype>text/vcard</mimetype>
+    <mimetype>text/x-vcard</mimetype>
+  </mimetypes>
+
+  <!-- distributors: yes, this is a real person -->
+  <update_contact>dev@lists.parabola.nu</update_contact>
+</component>
diff --git a/src/patches/icedove/Icedove-branding.patch b/src/patches/icedove/Icedove-branding.patch
deleted file mode 100644
index ea7f564..0000000
--- a/src/patches/icedove/Icedove-branding.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/branding_migration-wizard_addon-manager.patch b/src/patches/icedove/branding_migration-wizard_addon-manager.patch
new file mode 100644
index 0000000..883af34
--- /dev/null
+++ b/src/patches/icedove/branding_migration-wizard_addon-manager.patch
@@ -0,0 +1,78 @@
+diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/all-thunderbird.js
+index b95a999797..5ca66d8270 100644
+--- a/comm/mail/app/profile/all-thunderbird.js
++++ b/comm/mail/app/profile/all-thunderbird.js
+@@ -75,7 +75,7 @@ pref("app.update.BITS.enabled", false);
+ #endif
+ 
+ // Release notes URL
+-pref("app.releaseNotesURL", "https://live.thunderbird.net/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
++pref("app.releaseNotesURL", "https://live.thunderbird.net/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
+ 
+ #ifdef XP_MACOSX
+   // If set to true, Thunderbird will automatically restart if it is left
+@@ -106,7 +106,7 @@ pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/thunderbird/le
+ #endif
+ 
+ // Base URL for web-based support pages.
+-pref("app.support.baseURL", "https://support.thunderbird.net/%APP%/%VERSION%/%OS%/%LOCALE%/");
++pref("app.support.baseURL", "https://support.thunderbird.net/thunderbird/%VERSION%/%OS%/%LOCALE%/");
+ 
+ // Base url for web-based feedback pages.
+ pref("app.feedback.baseURL", "https://connect.mozilla.org/");
+@@ -163,16 +163,16 @@ pref("extensions.legacy.enabled", true);
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ 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.get.url", "https://www.parabola.nu/packages/?q=icedove-");
+ pref("extensions.getAddons.compatOverides.url", "https://services.addons.thunderbird.net/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE%");
+-pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/");
+-pref("browser.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/language-tools/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
+-pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/search/?q=%TERMS%&appver=%VERSION%&platform=%OS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
+-pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.link.url", "https://www.parabola.nu/packages/?q=icedove-");
++pref("browser.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/language-tools/");
++pref("extensions.getAddons.recommended.url", "https://www.parabola.nu/packages/?q=icedove-");
++pref("extensions.getAddons.search.browseURL", "https://www.parabola.nu/packages/?q=icedove-");
++pref("extensions.getAddons.search.url", "https://www.parabola.nu/packages/?q=icedove-");
++pref("extensions.webservice.discoverURL", "");
+ pref("extensions.getAddons.langpacks.url", "https://services.addons.thunderbird.net/api/v3/addons/language-tools/?app=thunderbird&type=language&appversion=%VERSION%");
+-pref("extensions.getAddons.discovery.api_url", "https://services.addons.thunderbird.net/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
++pref("extensions.getAddons.discovery.api_url", "");
+ 
+ // Blocklist preferences
+ pref("extensions.blocklist.detailsURL", "https://blocked.cdn.mozilla.net/");
+@@ -491,7 +491,7 @@ pref("browser.privatebrowsing.autostart", false);
+ 
+ pref("spellchecker.dictionary", "");
+ // Dictionary download preference
+-pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/dictionaries/");
++pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/dictionaries/");
+ 
+ // 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:
+diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
+index 3316df4c71..55d0b440e0 100644
+--- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
++++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
+@@ -5,7 +5,7 @@
+ addons-page-title = Add-ons Manager
+ 
+ search-header =
+-    .placeholder = Search addons.mozilla.org
++    .placeholder = Search www.parabola.nu/packages
+     .searchbuttonlabel = Search
+ 
+ search-header-shortcut =
+@@ -478,7 +478,7 @@ shortcuts-heading = Manage Extension Shortcuts
+ 
+ default-heading-search-label = Find more add-ons
+ addons-heading-search-input =
+-    .placeholder = Search addons.mozilla.org
++    .placeholder = Search www.parabola.nu/packages
+ 
+ addon-page-options-button =
+     .title = Tools for all add-ons
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
deleted file mode 100644
index 27dd7a8..0000000
--- a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: "Edward J. Shornock" <ed.shornock@gmail.com>
-Date: Mon, 1 Feb 2010 19:16:08 +0100
-Subject: fix branding in migration wizard and the addon manager
-
-Replace /Thunderbird/ with /Icedove/
-Update %APP% with the respective Mozilla names so
-addon-checking/installing/updating will work
-
-Closes: #565559
----
- mail/app/profile/all-thunderbird.js                | 33 +++++++++++-----------
- .../en-US/chrome/messenger/accountCreation.dtd     |  2 +-
- 2 files changed, 18 insertions(+), 17 deletions(-)
-
-diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/all-thunderbird.js
---- a/comm/mail/app/profile/all-thunderbird.js
-+++ b/comm/mail/app/profile/all-thunderbird.js
-@@ -67,7 +67,7 @@ pref("app.update.url", "https://aus.thunderbird.net/update/6/%PRODUCT%/%VERSION%
- 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.
--pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/%APP%/releases/");
-+pref("app.update.url.details", "https://www.thunderbird.net/%LOCALE%/thunderbird/releases/");
- 
- // app.update.promptWaitTime is in branding section
- 
-@@ -82,7 +82,7 @@ pref("app.update.BITS.enabled", false);
- #endif
- 
- // Release notes URL
--pref("app.releaseNotesURL", "https://live.thunderbird.net/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
-+pref("app.releaseNotesURL", "https://live.thunderbird.net/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&channel=%CHANNEL%&os=%OS%&buildid=%APPBUILDID%");
- 
- // URL for "Learn More" for DataCollection
- pref("toolkit.datacollection.infoURL",
-@@ -104,10 +104,10 @@ pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/thunderbird/le
- #endif
- 
- // Base URL for web-based support pages.
--pref("app.support.baseURL", "https://support.thunderbird.net/%APP%/%VERSION%/%OS%/%LOCALE%/");
-+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);
-@@ -158,11 +158,11 @@ pref("extensions.getAddons.cache.enabled", true);
- 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%");
--pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
--pref("extensions.getAddons.search.browseURL", "https://addons.thunderbird.net/%LOCALE%/%APP%/search/?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
--pref("extensions.webservice.discoverURL", "https://services.addons.thunderbird.net/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.link.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/");
-+pref("extensions.getAddons.recommended.url", "https://services.addons.thunderbird.net/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
-+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.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%");
- pref("extensions.getAddons.discovery.api_url", "https://services.addons.thunderbird.net/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
-@@ -415,7 +415,7 @@ pref("browser.privatebrowsing.autostart", false);
- 
- pref("spellchecker.dictionary", "");
- // Dictionary download preference
--pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/%APP%/dictionaries/");
-+pref("spellchecker.dictionaries.download.url", "https://addons.thunderbird.net/%LOCALE%/thunderbird/dictionaries/");
- 
- // 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:
-diff --git a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd
---- a/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd
-+++ b/comm/mail/locales/en-US/chrome/messenger/accountCreation.dtd
-@@ -100,7 +100,7 @@
- <!ENTITY changeSettings.label            "Change Settings">
- <!ENTITY changeSettings.accesskey        "S">
- 
--<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Thunderbird FAQ for more information.">
-+<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Icedove FAQ for more information.">
- 
- <!ENTITY insecureServer.tooltip.title    "Warning! This is an insecure server.">
- <!ENTITY insecureServer.tooltip.details  "Click circle for more details.">
diff --git a/src/patches/icedove/icedove-branding.patch b/src/patches/icedove/icedove-branding.patch
new file mode 100644
index 0000000..63ebc5d
--- /dev/null
+++ b/src/patches/icedove/icedove-branding.patch
@@ -0,0 +1,29 @@
+diff --git a/comm/mail/confvars.sh b/comm/mail/confvars.sh
+index 885654d703..c6871b3b5f 100755
+--- a/comm/mail/confvars.sh
++++ b/comm/mail/confvars.sh
+@@ -3,7 +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_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
++MOZ_APP_NAME=icedove
+ 
+ if test "$OS_ARCH" = "WINNT"; then
+   if ! test "$HAVE_64BIT_BUILD"; then
+diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure
+index 53e923a64e..39b015db72 100644
+--- a/comm/mail/moz.configure
++++ b/comm/mail/moz.configure
+@@ -7,8 +7,8 @@
+ set_config("MOZ_THUNDERBIRD", True)
+ set_define("MOZ_THUNDERBIRD", True)
+ 
+-imply_option("MOZ_APP_BASENAME", "Thunderbird")
+-set_config("MOZ_APPUPDATE_HOST", "aus.thunderbird.net")
++imply_option("MOZ_APP_BASENAME", "Icedove")
++set_config("MOZ_APPUPDATE_HOST", "")
+ 
+ imply_option("--enable-default-browser-agent", False)
+ imply_option("MOZ_REQUIRE_SIGNING", False)
diff --git a/src/patches/series b/src/patches/series
index 43187fe..f324a75 100644
--- a/src/patches/series
+++ b/src/patches/series
@@ -1,3 +1,3 @@
-icedove/Icedove-branding.patch
-icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
+icedove/icedove-branding.patch
+icedove/branding_migration-wizard_addon-manager.patch
 icedove/fix-installdir.patch