[notify] thunderbird: updated to 60.0. Now depends on rust

4 files changed, 18 insertions, 140 deletions

diff --git a/thunderbird/.footprint b/thunderbird/.footprint
index 252b751a9..22f084f9f 100644
--- a/thunderbird/.footprint
+++ b/thunderbird/.footprint
@@ -9,12 +9,13 @@ drwxr-xr-x	root/root	usr/lib/thunderbird/
 drwxr-xr-x	root/root	usr/lib/thunderbird/chrome/
 drwxr-xr-x	root/root	usr/lib/thunderbird/chrome/icons/
 drwxr-xr-x	root/root	usr/lib/thunderbird/chrome/icons/default/
+-rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default128.png
 -rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default16.png
 -rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default22.png
 -rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default24.png
--rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default256.png
 -rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default32.png
 -rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default48.png
+-rw-r--r--	root/root	usr/lib/thunderbird/chrome/icons/default/default64.png
 drwxr-xr-x	root/root	usr/lib/thunderbird/defaults/
 drwxr-xr-x	root/root	usr/lib/thunderbird/defaults/messenger/
 -rw-r--r--	root/root	usr/lib/thunderbird/defaults/messenger/mailViews.dat
@@ -26,118 +27,19 @@ drwxr-xr-x	root/root	usr/lib/thunderbird/dictionaries/
 -rw-r--r--	root/root	usr/lib/thunderbird/dictionaries/en-US.dic
 drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/
 drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/app.ini
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarm.js
--rwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmMonitor.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAttachment.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAttendee.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCachedCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarManager.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarSearchService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTime.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTimeFormatter.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDavRequestHandlers.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDeletedItems.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDuration.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calEvent.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
--rwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calHtmlExport.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calICSService-worker.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calICSService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsImportExport.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsSerializer.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItemBase.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItipItem.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calListFormatter.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calMonthGridPrinter.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calOutlookCSVImportExport.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calPeriod.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calProtocolHandler.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceDate.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceInfo.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceRule.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRelation.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calStartupService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTimezone.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTodo.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTransactionManager.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapCalendarItems.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapErrors.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapRequest.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapSession.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapUtils.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekInfoService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekPrinter.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.jar
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/
--rwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calBackendLoader.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calCompositeCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calDavCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calDefaultACLManager.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calICALJSComponents.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calICSCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calImportExportModule.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItemModule.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipEmailTransport.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipProtocolHandler.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calSleepMonitor.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/components.manifest
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/icaljs-manifest
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/interfaces.xpt
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/lightningTextCalendarConverter.js
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/lightning.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAsyncUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calExtract.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calProviderUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calRecurrenceUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calViewUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calXMLUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ical.js
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ltnInvitationUtils.jsm
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ltnUtils.jsm
-drwxr-xr-x	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/
--rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/zones.json
+-rw-r--r--	root/root	usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
 drwxr-xr-x	root/root	usr/lib/thunderbird/extensions/
 -rw-r--r--	root/root	usr/lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 drwxr-xr-x	root/root	usr/lib/thunderbird/fonts/
 -rw-r--r--	root/root	usr/lib/thunderbird/fonts/EmojiOneMozilla.ttf
 drwxr-xr-x	root/root	usr/lib/thunderbird/gtk2/
 -rwxr-xr-x	root/root	usr/lib/thunderbird/gtk2/libmozgtk.so
--rw-r--r--	root/root	usr/lib/thunderbird/icudt58l.dat
 drwxr-xr-x	root/root	usr/lib/thunderbird/isp/
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/Bogofilter.sfd
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/DSPAM.sfd
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/POPFile.sfd
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/SpamAssassin.sfd
 -rw-r--r--	root/root	usr/lib/thunderbird/isp/SpamPal.sfd
--rw-r--r--	root/root	usr/lib/thunderbird/isp/movemail.rdf
--rw-r--r--	root/root	usr/lib/thunderbird/isp/rss.rdf
 -rwxr-xr-x	root/root	usr/lib/thunderbird/libldap60.so
 -rwxr-xr-x	root/root	usr/lib/thunderbird/libldif60.so
 -rwxr-xr-x	root/root	usr/lib/thunderbird/liblgpllibs.so
@@ -147,10 +49,10 @@ drwxr-xr-x	root/root	usr/lib/thunderbird/isp/
 -rwxr-xr-x	root/root	usr/lib/thunderbird/libprldap60.so
 -rwxr-xr-x	root/root	usr/lib/thunderbird/libxul.so
 -rw-r--r--	root/root	usr/lib/thunderbird/omni.ja
+-rwxr-xr-x	root/root	usr/lib/thunderbird/pingsender
 -rw-r--r--	root/root	usr/lib/thunderbird/platform.ini
 -rwxr-xr-x	root/root	usr/lib/thunderbird/plugin-container
 -rw-r--r--	root/root	usr/lib/thunderbird/removed-files
--rwxr-xr-x	root/root	usr/lib/thunderbird/run-mozilla.sh
 -rwxr-xr-x	root/root	usr/lib/thunderbird/thunderbird
 -rwxr-xr-x	root/root	usr/lib/thunderbird/thunderbird-bin
 drwxr-xr-x	root/root	usr/share/
diff --git a/thunderbird/.signature b/thunderbird/.signature
index ecab3b302..a9bfea16c 100644
--- a/thunderbird/.signature
+++ b/thunderbird/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QiTryO4MYWsA7JXIAe4OzCezvxCKCAG2erc62RyyM+NzIouALJ5Ey8HwFp7jFrMFXQulEkb63AwH0usALv/DA8=
-SHA256 (Pkgfile) = 9aed39a2ee66441d3e895125c910c57084b3ef0ff6a520979df98186f4fe6d86
-SHA256 (.footprint) = d32de78e18ab67c713ba07095b648690beaeb008b75dbf43c85a15dba4a5024a
-SHA256 (thunderbird-52.9.1.source.tar.xz) = 286fa71504e7184f3a41bcbdebf591bebe8e04dccbad1c93a47c6e72a7125c4d
+RWSE3ohX2g5d/VJGviNjr9vKvPBfi0jqEcReCDfkKfpvBR1TSAjb8xyirPovhfK9w9qAIOCMwEjAzCwIB28q3B16RoxFLgsiiAA=
+SHA256 (Pkgfile) = 115f4867772351ee9db8a1b1cc022feae2db0303f98f7da627f38b582034c76d
+SHA256 (.footprint) = 851d806f087109fe16eb70542ad5269bdcd8b182200e14257c0ab60af67a9e3e
+SHA256 (thunderbird-60.0.source.tar.xz) = bd7da88dcc03c448a4e975b5a1d3e9bf466ec9151b1059392bcdb50955a22056
 SHA256 (thunderbird.desktop) = c6bc6a66f16951c4f7560d019dad48968169aef6587cef4e98380a300078299a
-SHA256 (thunderbird-install-dir.patch) = 6c13be23eb494fe80b9e593f299138ddebe4d90e6459ba7ec40b530765ac3768
diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile
index 0b0bbbac4..fc92d8e1f 100644
--- a/thunderbird/Pkgfile
+++ b/thunderbird/Pkgfile
@@ -1,25 +1,19 @@
 # Description:	email client from the Mozilla project
 # URL:		https://www.thunderbird.net/en-US/
 # Maintainer:	Fredrik Rinnestam, fredrik at crux dot nu
-# Depends on:	nss,autoconf-2.13,unzip,zip,libidl,gtk,gtk3,alsa-lib,xorg-libxt,yasm
+# Depends on:	nss,autoconf-2.13,unzip,zip,libidl,gtk,gtk3,alsa-lib,xorg-libxt,yasm,rust
 
 name=thunderbird
-version=52.9.1
+version=60.0
 release=1
 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz
-	$name.desktop thunderbird-install-dir.patch)
+	$name.desktop)
  
 build() {
 	cd $name-$version
-	sed -i '/^ftglyph.h/ i freetype/ftfntfmt.h' mozilla/config/system-headers
-	patch -p1 -i $SRC/thunderbird-install-dir.patch
-	export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$name"
-	export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-	export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 
 cat <<- EOF > .mozconfig
-	mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"
-	ac_add_options --enable-application=mail
+	ac_add_options --enable-application=comm/mail
 	ac_add_options --prefix=/usr
 	ac_add_options --enable-default-toolkit=cairo-gtk3
 	ac_add_options --with-system-jpeg
@@ -27,7 +21,6 @@ cat <<- EOF > .mozconfig
 	ac_add_options --with-system-png
 	ac_add_options --with-system-nspr
 	ac_add_options --with-system-nss
-	ac_add_options --with-system-cairo
 	ac_add_options --enable-system-ffi
 	ac_add_options --enable-system-pixman
 	#breaks search:
@@ -40,20 +33,22 @@ cat <<- EOF > .mozconfig
 	ac_add_options --disable-dbus
 	ac_add_options --disable-debug
 	ac_add_options --disable-updater
-	ac_add_options --disable-gnomeui
 	ac_add_options --disable-crashreporter
 	ac_add_options --disable-necko-wifi
 	ac_add_options --disable-pulseaudio
 	ac_add_options --disable-gconf
 	ac_add_options --enable-calendar
+	#avoid clang dep
+	ac_add_options --disable-stylo
 EOF
-	make -f client.mk build
-	make -f client.mk DESTDIR=$PKG install
+
+	./mach build
+	DESTDIR=$PKG ./mach install
 
 	mkdir -p $PKG/usr/share/pixmaps
 	ln -s /usr/lib/thunderbird/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/thunderbird_default48.png
 	install -D -m 0644 $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
 
 	find $PKG -iname '*README*' -delete
-	rm -r $PKG/usr/{include,lib/thunderbird-devel,share/idl}
+	#rm -r $PKG/usr/{include,lib/thunderbird-devel,share/idl}
 }
diff --git a/thunderbird/thunderbird-install-dir.patch b/thunderbird/thunderbird-install-dir.patch
deleted file mode 100644
index cca3dde32..000000000
--- a/thunderbird/thunderbird-install-dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -rupN thunderbird-45.0.orig/mozilla/config/baseconfig.mk thunderbird-45.0/mozilla/config/baseconfig.mk
---- thunderbird-45.0.orig/mozilla/config/baseconfig.mk	2016-04-14 20:21:45.871195170 +0200
-+++ thunderbird-45.0/mozilla/config/baseconfig.mk	2016-04-14 20:24:13.356390677 +0200
-@@ -2,10 +2,10 @@
- # directly in python/mozbuild/mozbuild/base.py for gmake validation.
- # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
- # whether a normal build is happening or whether the check is running.
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- ifeq (.,$(DEPTH))
- DIST = dist
- else