thunderbird 68.1.0-1 (znver1;x86_64) 2019-6956
9999

Status published
Submitter cris [@T] beebgames.com
Platform 4.0
Repository main
URL https://abf.openmandriva.org/build_lists/609007
Packages
thunderbird-68.1.0-1.znver1.binary
thunderbird-68.1.0-1.znver1.source
thunderbird-ar-68.1.0-1.znver1.binary
thunderbird-ast-68.1.0-1.znver1.binary
thunderbird-be-68.1.0-1.znver1.binary
thunderbird-bg-68.1.0-1.znver1.binary
thunderbird-br-68.1.0-1.znver1.binary
thunderbird-ca-68.1.0-1.znver1.binary
thunderbird-cs-68.1.0-1.znver1.binary
thunderbird-da-68.1.0-1.znver1.binary
thunderbird-de-68.1.0-1.znver1.binary
thunderbird-el-68.1.0-1.znver1.binary
thunderbird-en_GB-68.1.0-1.znver1.binary
thunderbird-enigmail-68.1.0-1.znver1.binary
thunderbird-en_US-68.1.0-1.znver1.binary
thunderbird-es_AR-68.1.0-1.znver1.binary
thunderbird-es_ES-68.1.0-1.znver1.binary
thunderbird-et-68.1.0-1.znver1.binary
thunderbird-eu-68.1.0-1.znver1.binary
thunderbird-fi-68.1.0-1.znver1.binary
thunderbird-fr-68.1.0-1.znver1.binary
thunderbird-fy-68.1.0-1.znver1.binary
thunderbird-ga-68.1.0-1.znver1.binary
thunderbird-gd-68.1.0-1.znver1.binary
thunderbird-gl-68.1.0-1.znver1.binary
thunderbird-he-68.1.0-1.znver1.binary
thunderbird-hr-68.1.0-1.znver1.binary
thunderbird-hu-68.1.0-1.znver1.binary
thunderbird-hy-68.1.0-1.znver1.binary
thunderbird-id-68.1.0-1.znver1.binary
thunderbird-is-68.1.0-1.znver1.binary
thunderbird-it-68.1.0-1.znver1.binary
thunderbird-ja-68.1.0-1.znver1.binary
thunderbird-ko-68.1.0-1.znver1.binary
thunderbird-lightning-68.1.0-1.znver1.binary
thunderbird-lt-68.1.0-1.znver1.binary
thunderbird-nb_NO-68.1.0-1.znver1.binary
thunderbird-nl-68.1.0-1.znver1.binary
thunderbird-nn_NO-68.1.0-1.znver1.binary
thunderbird-pl-68.1.0-1.znver1.binary
thunderbird-pt_BR-68.1.0-1.znver1.binary
thunderbird-pt_PT-68.1.0-1.znver1.binary
thunderbird-ro-68.1.0-1.znver1.binary
thunderbird-ru-68.1.0-1.znver1.binary
thunderbird-si-68.1.0-1.znver1.binary
thunderbird-sk-68.1.0-1.znver1.binary
thunderbird-sl-68.1.0-1.znver1.binary
thunderbird-sq-68.1.0-1.znver1.binary
thunderbird-sv_SE-68.1.0-1.znver1.binary
thunderbird-tr-68.1.0-1.znver1.binary
thunderbird-uk-68.1.0-1.znver1.binary
thunderbird-vi-68.1.0-1.znver1.binary
thunderbird-zh_CN-68.1.0-1.znver1.binary
thunderbird-zh_TW-68.1.0-1.znver1.binary
thunderbird-68.1.0-1.x86_64.source
thunderbird-68.1.0-1.x86_64.binary
thunderbird-ar-68.1.0-1.x86_64.binary
thunderbird-ast-68.1.0-1.x86_64.binary
thunderbird-be-68.1.0-1.x86_64.binary
thunderbird-bg-68.1.0-1.x86_64.binary
thunderbird-br-68.1.0-1.x86_64.binary
thunderbird-ca-68.1.0-1.x86_64.binary
thunderbird-cs-68.1.0-1.x86_64.binary
thunderbird-da-68.1.0-1.x86_64.binary
thunderbird-de-68.1.0-1.x86_64.binary
thunderbird-el-68.1.0-1.x86_64.binary
thunderbird-en_GB-68.1.0-1.x86_64.binary
thunderbird-enigmail-68.1.0-1.x86_64.binary
thunderbird-en_US-68.1.0-1.x86_64.binary
thunderbird-es_AR-68.1.0-1.x86_64.binary
thunderbird-es_ES-68.1.0-1.x86_64.binary
thunderbird-et-68.1.0-1.x86_64.binary
thunderbird-eu-68.1.0-1.x86_64.binary
thunderbird-fi-68.1.0-1.x86_64.binary
thunderbird-fr-68.1.0-1.x86_64.binary
thunderbird-fy-68.1.0-1.x86_64.binary
thunderbird-ga-68.1.0-1.x86_64.binary
thunderbird-gd-68.1.0-1.x86_64.binary
thunderbird-gl-68.1.0-1.x86_64.binary
thunderbird-he-68.1.0-1.x86_64.binary
thunderbird-hr-68.1.0-1.x86_64.binary
thunderbird-hu-68.1.0-1.x86_64.binary
thunderbird-hy-68.1.0-1.x86_64.binary
thunderbird-id-68.1.0-1.x86_64.binary
thunderbird-is-68.1.0-1.x86_64.binary
thunderbird-it-68.1.0-1.x86_64.binary
thunderbird-ja-68.1.0-1.x86_64.binary
thunderbird-ko-68.1.0-1.x86_64.binary
thunderbird-lightning-68.1.0-1.x86_64.binary
thunderbird-lt-68.1.0-1.x86_64.binary
thunderbird-nb_NO-68.1.0-1.x86_64.binary
thunderbird-nl-68.1.0-1.x86_64.binary
thunderbird-nn_NO-68.1.0-1.x86_64.binary
thunderbird-pl-68.1.0-1.x86_64.binary
thunderbird-pt_BR-68.1.0-1.x86_64.binary
thunderbird-pt_PT-68.1.0-1.x86_64.binary
thunderbird-ro-68.1.0-1.x86_64.binary
thunderbird-ru-68.1.0-1.x86_64.binary
thunderbird-si-68.1.0-1.x86_64.binary
thunderbird-sk-68.1.0-1.x86_64.binary
thunderbird-sl-68.1.0-1.x86_64.binary
thunderbird-sq-68.1.0-1.x86_64.binary
thunderbird-sv_SE-68.1.0-1.x86_64.binary
thunderbird-tr-68.1.0-1.x86_64.binary
thunderbird-uk-68.1.0-1.x86_64.binary
thunderbird-vi-68.1.0-1.x86_64.binary
thunderbird-zh_CN-68.1.0-1.x86_64.binary
thunderbird-zh_TW-68.1.0-1.x86_64.binary
Build Date 2019-09-21 17:14:02 +0000 UTC
Last Updated 2019-09-26 17:21:01.826279333 +0000 UTC
$ git diff --patch-with-stat --summary 188716052daf30fcb2db8a8cc0fb39efd45d827b..f5430c71f04036ae7138df4f29cb36f997618ca8

 .abf.yml                                           | 104 +--
 Build-also-gdata-provider-as-xpi-file.patch        | 966 ---------------------
 bz1554949.patch                                    |  47 -
 firefox-gcc-6.0.patch                              |  26 -
 mozilla-1245783.patch                              | 113 ---
 ...rbird-enigmail-build-package-contents-rdf.patch |  11 -
 ...nderbird-enigmail-ui-content-contents-rdf.patch |  11 -
 mozilla-thunderbird-enigmail-visibility.patch      |  14 -
 rust-1.33-build.patch                              |  47 -
 thunderbird-24.5.0-nss_detect.patch                |  14 -
 thunderbird-appname.patch                          |  16 -
 thunderbird.spec                                   |  22 +-
 12 files changed, 54 insertions(+), 1337 deletions(-)
 delete mode 100644 Build-also-gdata-provider-as-xpi-file.patch
 delete mode 100644 bz1554949.patch
 delete mode 100644 firefox-gcc-6.0.patch
 delete mode 100644 mozilla-1245783.patch
 delete mode 100644 mozilla-thunderbird-enigmail-build-package-contents-rdf.patch
 delete mode 100644 mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch
 delete mode 100644 mozilla-thunderbird-enigmail-visibility.patch
 delete mode 100644 rust-1.33-build.patch
 delete mode 100644 thunderbird-24.5.0-nss_detect.patch
 delete mode 100644 thunderbird-appname.patch

diff --git a/.abf.yml b/.abf.yml
index 3247f11..0177b2f 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -11,61 +11,61 @@ removed_sources:
   enigmail-2.0.8.tar.gz: 2667701b932af9cc75385cd313506a131c1e45d4
   enigmail-2.0.9.tar.gz: 79262ed8331d29489d575c7d64be2e6d6cb5e077
 sources:
-  ar.xpi: c07630d2b35e9617ba8a5effb9fc2f80f2c18d2a
-  ast.xpi: 207bedd96f70af1b64a482e07bf151ceae2384da
-  be.xpi: 132a52bdefa9690bf40a6e339eb1aeef6657a62e
-  bg.xpi: 2c9aff9d038872d53d0e453d9c6e45f8b4301859
+  ar.xpi: f95da973f540171243cd670e22ec899afbe46119
+  ast.xpi: 7053c4a1d002c073f705ad3ff2e390000ad56253
+  be.xpi: 7c57d77ac5e91d4019c406ecb1ec9a3d6739030b
+  bg.xpi: 4008d5c709c213b346a6bf877ed1b725f28220d3
   bn-BD.xpi: 517ee16d261f25248ddc950309efda97cbeeeef1
-  br.xpi: 9d0422c3dd265164dcede20281da1998fc510151
-  ca.xpi: cdddbbb6b17e7c6c0ddeca07bdb7251f9e62bbb0
+  br.xpi: 1df1f48cffd7282035a4e13d7443c6c6263cef76
+  ca.xpi: 7176bdabf1422c34621e5f7ee9570d0b7cea74b6
   cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935
-  cs.xpi: 59536eeff063c9e8f4361be4409dc91639fb7e0b
-  da.xpi: 2e58752847cbf5fcd99b4fd65f97f305454f7ddb
-  de.xpi: f7eebb59f972619a3d32182a5ff6166171bd3aa6
-  el.xpi: 8df2536ebcde6888a476d922f7a00e5245ec776b
-  en-GB.xpi: 6018d7f69027bb368989d0dcf07fac06f00df71b
-  en-US.xpi: 91bdde5baa981b73499584afe7ad4e0cabab9d6b
+  cs.xpi: 5bc83f195a9ae151c61c45b3608917196e4b326b
+  da.xpi: 68051455d88cc0c4f6b5e30df8b15f94f10ea810
+  de.xpi: bb80ef4f21a3c8bdf5b839609fc61547e33b899f
+  el.xpi: 18d111edbf40db160da1ab94b410c35ad5a30638
+  en-GB.xpi: f7dcf7c19deedc71b4141507272b1cb48d4e51d5
+  en-US.xpi: 7ec520f61d461f45eab07695ecdc17b1e29d3408
   enigmail-2.1.2.tar.gz: 826412f2d0e4a945bd12271f23da70c759d58f76
   enigmail-2.1.2.tar.gz.asc: dd8038d9b85756a6567720c861136ce456334baa
-  es-AR.xpi: 6239071b76a857afd8f56b944aa95edc50ac17c6
-  es-ES.xpi: 285e6898a635239c6c2c83f2d3d5d35f8ecd456e
-  et.xpi: 344f800cefcddad098ac64644f03ee83adf9f958
-  eu.xpi: 0b4650a20bc9bbe70ca9f214e6dc866fd5b4610c
-  fi.xpi: 979d4b40b1f79900d333fd8adf963210f0c5a2c7
-  fr.xpi: 061411fd3e3dc6b0a47be9a13320e65e4ae08304
-  fy-NL.xpi: 7a946d15f6bcd63d6eb20174288622d51831d74c
-  ga-IE.xpi: 23a9f68c89c609b01f236b4a4815905766849a21
-  gd.xpi: 759a5d8e33ca4140b7aafa3aaed76002c978c24a
-  gl.xpi: a7faf21754b542add687ccc31a471c7ddde7a4d9
-  he.xpi: 7ca0e3b0e4a8915c07435055ccc40082710ee24b
-  hr.xpi: c55d2474276216950f2e184d614c6a42e85bd524
-  hu.xpi: 10ad678986117081d8487fdd1bc5aafbe5d2f805
-  hy-AM.xpi: 307e2fa6dfdca2776c112ef546bd3b81318c763c
-  id.xpi: b460402c579d252f6696a6fa24beef48ece3141c
-  is.xpi: 34a62ba65bf21710bb19013034d33fb8b95d944a
-  it.xpi: 9929915ad943ae72e0b3005b9ecce72cc82285fe
-  ja.xpi: 5dcce64052c757b1aea0c0353113cc8021b883a4
-  ko.xpi: 2823a8456bfefb30f1228586612bd43b4225a739
-  lt.xpi: b8266184b9fe47a2eed61032a8dd55391a6c42d8
-  nb-NO.xpi: f676c2194f56be9e068ce1a4ecd7b32de5ecc890
-  nl.xpi: 077efb7c4e7622356139b9601edc27be07129dab
-  nn-NO.xpi: fa47121f92f763250dd1b7b45c8fdeefd025093a
+  es-AR.xpi: a72b0e218316944ae75a0d09bdf780541a6e316a
+  es-ES.xpi: eba404ac43581bf1f49609d457e527e0a0c9d3f3
+  et.xpi: 81b285c2e6c8591e99d63e0f0d0b41faf8926346
+  eu.xpi: 8bf10946f5d73b7c8077bb2ebeaa4b7546940884
+  fi.xpi: eaede2030a6288e6c465bc9907892986f17b5a3a
+  fr.xpi: be95cad40977d2db08697165a920907b2d908576
+  fy-NL.xpi: 9ae7a6fb1adfe6ba0d472a8e449a99a02fd483cc
+  ga-IE.xpi: ad6e743f4eb6c3f7595f918abcb186a109416059
+  gd.xpi: 21f65e10693d46f94f7fe844af648f165b4ef323
+  gl.xpi: 845fe2fb3a131b6d6825bf913c8ae1a10cc72d2a
+  he.xpi: fd77364fefaea25df49cbf84307801912cc2804f
+  hr.xpi: 061a0e436b3fdc3c5045dd3bf32ed22152adebe7
+  hu.xpi: cf7c43f3ad5db25bf8fc7b70857cf006259cf883
+  hy-AM.xpi: 301048167f61b31d15928f9a4ed31016085cbad5
+  id.xpi: cfd75a9a4824091dd4fbfb3aa21589c4981b1701
+  is.xpi: 0f7e14b3836b165307ffd17e327f0790c04590bc
+  it.xpi: c816b5ff23d2ca6db9996bd6b42f5fccd5cc2c7f
+  ja.xpi: 9ed797b8ad9dc97eea7a280cab1458026daefd97
+  ko.xpi: 66bcb46349b59d9865a97eff2da1fa4f1cf13c56
+  lt.xpi: f59970fd8fa7e93a97a35887a5af00c3f57ebf8d
+  nb-NO.xpi: 045358ef5168d6b1db41181186c1b0e47962550b
+  nl.xpi: bf61b14b575d2d1fd62a4db85532f1c7c6967172
+  nn-NO.xpi: ad45a268614c272568393944e1dfdb5c5466e5b3
   pa-IN.xpi: ea454dad19df7c3bc1ddfa4a355e17082c07d90b
-  pl.xpi: 89ae5aadda814ce862e7193e177857cf822b82af
-  pt-BR.xpi: e66a17d0005e20c6669a9fe71df1389c184ebbcf
-  pt-PT.xpi: 9987441c54c6e5fe0b5f07d5e2f650d4a5b648db
-  ro.xpi: 038aceb918b072c9dce7de04c23bec45c62c9fce
-  ru.xpi: 3df5fafa962145a31459484c960b3558fc371f71
-  si.xpi: d21eec9ba511f68e833af17ee94a493ecb5ffd26
-  sk.xpi: a124fac64f06ee330f8ecc577f631dda347e6c5b
-  sl.xpi: d26236829fa9188bb6a6f411894e0547e9d4aa9c
-  sq.xpi: 5c5040418f9ac088766f9c7ae9befe432c67b002
-  sr.xpi: b3effe15e5e4d64467cf13607261c2cd783ab588
-  sv-SE.xpi: 20d6ac5f3e60ff3353eddc0686d5ea509b7b76f9
+  pl.xpi: 25bd3a6f3abcc9971007df2801dbcaba6f45df2e
+  pt-BR.xpi: a6451a66d52988d7fc362b7656c810325f9c428f
+  pt-PT.xpi: 7c254a5224ba6f30600bb558865054faf3c4a6e0
+  ro.xpi: 00a80953b49f31faedebc006b44bd0b14c9c8671
+  ru.xpi: f6fb8db5894a361d3b783bf2f8565df3b57e4d76
+  si.xpi: 91e200e9e9669401c110e83a14aaf40efc99bc8e
+  sk.xpi: d86a3d389ef6f9152017b736d88469c384d175f1
+  sl.xpi: 3053fdde1c4b9200ff936fe364acef4e90a00555
+  sq.xpi: 5f0156295dd58b04dd7f2bc49cce6af94071b69d
+  sr.xpi: 7941c08a96bb638d49c7f7bd5fe92ce724c402c6
+  sv-SE.xpi: d82aa0a27c11b9a92178e248d754d84948d9a2dd
   ta-LK.xpi: 16c61db0f821e1ad9f83f49784636fc46224bfd1
-  thunderbird-68.0.source.tar.xz: b41a32bb198b942a3c206942978caa53ca7ed443
-  tr.xpi: c6b23884eb359c75c3f1de0883c058d17e76fa64
-  uk.xpi: e77b3002aa3ee28e66229e9a7475548a975cde9d
-  vi.xpi: 44e9f4c46d7ad41ada4d948b3f138832a030f4bd
-  zh-CN.xpi: ca00e5dd4ae1b68b8a9e050f93f40b2a453424b7
-  zh-TW.xpi: 49925f3cd143523541539072e6f4aa2907db5663
+  thunderbird-68.1.0.source.tar.xz: 1b658b8477869d59be71099c2ecb51e27da8a18f
+  tr.xpi: 7d3d3b7bd9c540cba6d9e8a3d1a73088b7976b63
+  uk.xpi: 3d7f8896651feb021c2f3c868a61083c9913d487
+  vi.xpi: 69b02a0bf984d261d49f852189f4ed5b3e8346e3
+  zh-CN.xpi: e925a3c4bc41b4b19b993243b4ccb33c554a9403
+  zh-TW.xpi: b7aab5bf14e684a1d6e12b0226f901919f614ea8
diff --git a/Build-also-gdata-provider-as-xpi-file.patch b/Build-also-gdata-provider-as-xpi-file.patch
deleted file mode 100644
index 714ef1e..0000000
--- a/Build-also-gdata-provider-as-xpi-file.patch
+++ /dev/null
@@ -1,966 +0,0 @@
-From: Carsten Schoenert <c.schoenert@t-online.de>
-Date: Sat, 30 Jun 2018 11:09:53 +0200
-Subject: Build also gdata-provider as xpi file
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1471326
----
- comm/calendar/lightning/versions.mk            |   2 -
- comm/calendar/providers/gdata/Makefile.in      |  34 ++--
- comm/calendar/providers/gdata/moz.build        |   4 +
- comm/calendar/test/unit/test_gdata_provider.js | 244 ++++++++++++-------------
- comm/calendar/test/unit/xpcshell-shared.ini    |   4 +-
- comm/mail/app.mozbuild                         |   3 +-
- 6 files changed, 143 insertions(+), 148 deletions(-)
-
-diff --git a/comm/calendar/lightning/versions.mk b/comm/calendar/lightning/versions.mk
-index 5ecbb39..a7f7c95 100644
---- a/comm/calendar/lightning/versions.mk
-+++ b/comm/calendar/lightning/versions.mk
-@@ -12,8 +12,6 @@ else
- LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
- endif
- 
--#GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
--
- # For extensions we require a max version that is compatible across security releases.
- # THUNDERBIRD_MAXVERSION and SEAMONKEY_MAXVERSION is our method for doing that.
- # Alpha versions 10.0a1 and 10.0a2 aren't affected
-diff --git a/comm/calendar/providers/gdata/Makefile.in b/comm/calendar/providers/gdata/Makefile.in
-index 647cc3f..c8db78a 100644
---- a/comm/calendar/providers/gdata/Makefile.in
-+++ b/comm/calendar/providers/gdata/Makefile.in
-@@ -2,32 +2,24 @@
- # 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/.
- 
--XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
--XPI_VERSION = $(GDATA_VERSION)
-+XPI_NAME = gdata-provider
-+XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD)
- XPI_EM_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
- XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
- 
--DEFINES += -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
--           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
--           -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
--           -DCOMM_BUILD=$(COMM_BUILD) \
--           -DGDATA_VERSION=$(GDATA_VERSION) \
--           $(NULL)
--
--ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--# If the macbundle dist dir was already created, sync the gdata provider here to avoid
--# the need to make -C objdir/mail/app each time
--tools repackage::
--	[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -a $(FINAL_TARGET)/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/extensions/$(XPI_EM_ID) || true
-+ifdef MOZ_SUITE
-+LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(THUNDERBIRD_VERSION))
-+else
-+LIGHTNING_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
- endif
- 
--# stage the extension for use in packaged tests
--PKG_STAGE = $(DIST)/test-stage
-+GDATA_VERSION := $(shell $(PYTHON) $(commtopsrcdir)/calendar/providers/gdata/makeversion.py $(LIGHTNING_VERSION))
-+THUNDERBIRD_VERSION := $(shell cat $(commtopsrcdir)/mail/config/version.txt)
-+SEAMONKEY_VERSION := $(shell cat $(commtopsrcdir)/suite/config/version.txt)
- 
--stage-package:
--	$(NSINSTALL) -D $(PKG_STAGE)/extensions/$(XPI_EM_ID)
--	(cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/extensions/$(XPI_EM_ID) && tar -xf -)
-+DEFINES += -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
-+           -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
-+           -DGDATA_VERSION=$(GDATA_VERSION) \
-+           $(NULL)
- 
--include $(moztopsrcdir)/config/rules.mk
--include $(commtopsrcdir)/calendar/lightning/versions.mk
- include $(commtopsrcdir)/calendar/lightning/lightning-packager.mk
-diff --git a/comm/calendar/providers/gdata/moz.build b/comm/calendar/providers/gdata/moz.build
-index 3460ac8..45a12ed 100644
---- a/comm/calendar/providers/gdata/moz.build
-+++ b/comm/calendar/providers/gdata/moz.build
-@@ -4,6 +4,7 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- XPI_NAME = 'gdata-provider'
-+export('XPI_NAME')
- 
- FINAL_TARGET_PP_FILES += ['install.rdf']
- 
-@@ -26,6 +27,9 @@ EXTRA_COMPONENTS += [
-     'components/calGoogleCalendar.manifest',
- ]
- 
-+USE_EXTENSION_MANIFEST = True
-+export('USE_EXTENSION_MANIFEST')
-+
- JAR_MANIFESTS += ['jar.mn']
- 
- JS_PREFERENCE_FILES += [
-diff --git a/comm/calendar/test/unit/test_gdata_provider.js b/comm/calendar/test/unit/test_gdata_provider.js
-index c9e2641..1118501 100644
---- a/comm/calendar/test/unit/test_gdata_provider.js
-+++ b/comm/calendar/test/unit/test_gdata_provider.js
-@@ -508,7 +508,7 @@ function run_test() {
-     });
- }
- 
--add_task(function* test_migrate_cache() {
-+add_task(async function test_migrate_cache() {
-     let uriString = "googleapi://xpcshell/?calendar=xpcshell%40example.com";
-     let uri = Services.io.newURI(uriString);
-     let client = cal.getCalendarManager().createCalendar("gdata", uri);
-@@ -520,26 +520,26 @@ add_task(function* test_migrate_cache() {
-     });
- 
-     // No version, should not reset
--    equal(yield migrateStorageCache(), false);
-+    equal(await migrateStorageCache(), false);
-     equal(client.getProperty("cache.version"), 3);
- 
-     // Check migrate 1 -> 2
-     unwrapped.CACHE_DB_VERSION = 2;
-     client.setProperty("cache.version", 1);
--    equal(yield migrateStorageCache(), true);
-+    equal(await migrateStorageCache(), true);
-     equal(client.getProperty("cache.version"), 2);
- 
-     // Check migrate 2 -> 3 normal calendar
-     unwrapped.CACHE_DB_VERSION = 3;
-     client.setProperty("cache.version", 2);
--    equal(yield migrateStorageCache(), false);
-+    equal(await migrateStorageCache(), false);
- 
-     // Check migrate 2 -> 3 birthday calendar
-     unwrapped.CACHE_DB_VERSION = 3;
-     uri = "googleapi://xpcshell/?calendar=%23contacts%40group.v.calendar.google.com";
-     unwrapped.uri = Services.io.newURI(uri);
-     client.setProperty("cache.version", 2);
--    equal(yield migrateStorageCache(), true);
-+    equal(await migrateStorageCache(), true);
- });
- 
- add_test(function test_migrate_uri() {
-@@ -573,7 +573,7 @@ add_test(function test_migrate_uri() {
-     run_next_test();
- });
- 
--add_task(function* test_dateToJSON() {
-+add_task(async function test_dateToJSON() {
-     function _createDateTime(tzid, offset=0) {
-         let offsetFrom = offset <= 0 ? "-0" + (offset - 1) : "+0" + (offset - 1) + "00";
-         let offsetTo = "+0" + offset + "00";
-@@ -672,7 +672,7 @@ add_task(function* test_dateToJSON() {
-     deepEqual(dateToJSON(date), { date: "2015-01-30" });
- });
- 
--add_task(function* test_JSONToDate() {
-+add_task(async function test_JSONToDate() {
-     function convert(aEntry, aTimezone="Europe/Berlin") {
-         let tzs = cal.getTimezoneService();
-         let calendarTz = tzs.getTimezone(aTimezone);
-@@ -716,9 +716,9 @@ add_task(function* test_JSONToDate() {
-     equal(convert({ dateTime: "2015-01-02T03:04:05+05:00" }), "20150102T030405 in Antarctica/Mawson");
- });
- 
--add_task(function* test_organizerCN() {
-+add_task(async function test_organizerCN() {
-     gServer.events = [];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     equal(client.getProperty("organizerCN"), null);
-     gServer.resetClient(client);
- 
-@@ -735,12 +735,12 @@ add_task(function* test_organizerCN() {
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     }];
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     equal(client.getProperty("organizerCN"), gServer.creator.displayName);
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_always_readOnly() {
-+add_task(async function test_always_readOnly() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"2299601498276000\"",
-@@ -755,26 +755,26 @@ add_task(function* test_always_readOnly() {
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     }];
-     gServer.calendarListData.accessRole = "freeBusyReader";
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
-     ok(client.readOnly);
-     client.readOnly = false;
-     ok(client.readOnly);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
-     notEqual(items[0].title, "New Event");
-     gServer.resetClient(client);
- 
-     gServer.calendarListData.accessRole = "reader";
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     ok(client.readOnly);
-     client.readOnly = false;
-     ok(client.readOnly);
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_reset_sync() {
-+add_task(async function test_reset_sync() {
-     gServer.tasks = [{
-         kind: "tasks#task",
-         id: "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU",
-@@ -819,18 +819,18 @@ add_task(function* test_reset_sync() {
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "fepf8uf6n7n04w7feukucs9n8e@google.com"
-     }];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let uncached = client.wrappedJSObject.mUncachedCalendar.wrappedJSObject;
-     let pclient = cal.async.promisifyCalendar(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 4);
- 
-     notEqual(client.getProperty("syncToken.events"), "");
-     notEqual(client.getProperty("lastUpdated.tasks"), "");
- 
--    yield uncached.resetSync();
--    items = yield pclient.getAllItems();
-+    await uncached.resetSync();
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     equal(client.getProperty("syncToken.events"), "");
-@@ -839,7 +839,7 @@ add_task(function* test_reset_sync() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_basicItems() {
-+add_task(async function test_basicItems() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"2299601498276000\"",
-@@ -903,10 +903,10 @@ add_task(function* test_basicItems() {
-         }]
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 2);
- 
-     let event = cal.item.isEvent(items[0]) ? items[0] : items[1];
-@@ -965,8 +965,8 @@ add_task(function* test_basicItems() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_addModifyDeleteItem() {
--    let client = yield gServer.getClient();
-+add_task(async function test_addModifyDeleteItem() {
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-     equal(gServer.events.length, 0);
-     equal(gServer.tasks.length, 0);
-@@ -1016,11 +1016,11 @@ add_task(function* test_addModifyDeleteItem() {
-     ].join("\r\n"));
- 
-     // Add an event
--    let addedEvent = yield pclient.adoptItem(event);
-+    let addedEvent = await pclient.adoptItem(event);
-     notEqual(addedEvent.id, null);
-     equal(addedEvent.organizer.id, "mailto:xpcshell@example.com");
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(items[0].id, addedEvent.id);
-     equal(items[0].organizer.id, "mailto:xpcshell@example.com");
-@@ -1029,10 +1029,10 @@ add_task(function* test_addModifyDeleteItem() {
-     equal(gServer.tasks.length, 0);
- 
-     // Add a task
--    let addedTask = yield pclient.adoptItem(task);
-+    let addedTask = await pclient.adoptItem(task);
-     notEqual(addedTask.id, null);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 2);
-     equal(items[1].id, addedTask.id);
- 
-@@ -1043,10 +1043,10 @@ add_task(function* test_addModifyDeleteItem() {
-     let newEvent = items[0].clone();
-     newEvent.title = "changed";
- 
--    let modifiedEvent = yield pclient.modifyItem(newEvent, items[0]);
-+    let modifiedEvent = await pclient.modifyItem(newEvent, items[0]);
-     equal(modifiedEvent.title, "changed");
-     notEqual(modifiedEvent.getProperty("LAST-MODIFIED"), addedEvent.getProperty("LAST-MODIFIED"));
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 2);
-     equal(items[0].title, "changed");
-     equal(items[0].id, addedEvent.id);
-@@ -1058,10 +1058,10 @@ add_task(function* test_addModifyDeleteItem() {
-     let newTask = items[1].clone();
-     newTask.title = "changed";
- 
--    let modifiedTask = yield pclient.modifyItem(newTask, items[1]);
-+    let modifiedTask = await pclient.modifyItem(newTask, items[1]);
-     equal(modifiedTask.title, "changed");
-     notEqual(modifiedTask.getProperty("LAST-MODIFIED"), addedTask.getProperty("LAST-MODIFIED"));
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 2);
-     equal(items[1].title, "changed");
-     equal(items[1].id, addedTask.id);
-@@ -1070,15 +1070,15 @@ add_task(function* test_addModifyDeleteItem() {
-     equal(gServer.tasks.length, 1);
- 
-     // Delete an event
--    yield pclient.deleteItem(modifiedEvent);
--    items = yield pclient.getAllItems();
-+    await pclient.deleteItem(modifiedEvent);
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(gServer.events.length, 0);
-     equal(gServer.tasks.length, 1);
- 
-     // Delete a task
--    yield pclient.deleteItem(modifiedTask);
--    items = yield pclient.getAllItems();
-+    await pclient.deleteItem(modifiedTask);
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
-     equal(gServer.events.length, 0);
-     equal(gServer.tasks.length, 0);
-@@ -1086,8 +1086,8 @@ add_task(function* test_addModifyDeleteItem() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_recurring_event() {
--    let client = yield gServer.getClient();
-+add_task(async function test_recurring_event() {
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
-     let event = cal.createEvent([
-@@ -1099,7 +1099,7 @@ add_task(function* test_recurring_event() {
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    event = yield pclient.addItem(event);
-+    event = await pclient.addItem(event);
-     equal(gServer.events.length, 1);
-     equal(gServer.events[0].recurrence.length, 1);
-     equal(gServer.events[0].recurrence[0], "RRULE:FREQ=WEEKLY");
-@@ -1109,7 +1109,7 @@ add_task(function* test_recurring_event() {
-     changedOcc.title = "changed";
-     event.recurrenceInfo.modifyException(occ, true);
- 
--    event = yield pclient.modifyItem(changedOcc, occ);
-+    event = await pclient.modifyItem(changedOcc, occ);
-     occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
-     equal(occ.title, "changed");
-     equal(gServer.events.length, 2);
-@@ -1117,7 +1117,7 @@ add_task(function* test_recurring_event() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_recurring_exception() {
-+add_task(async function test_recurring_exception() {
-     gServer.syncs = [{
-         token: "1",
-         events: [{
-@@ -1162,10 +1162,10 @@ add_task(function* test_recurring_exception() {
-         }]
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     let exIds = items[0].recurrenceInfo.getExceptionIds({});
-@@ -1175,9 +1175,9 @@ add_task(function* test_recurring_exception() {
-     equal(ex.title, "New Event changed");
- 
-     client.refresh();
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     exIds = items[0].recurrenceInfo.getExceptionIds({});
-@@ -1186,7 +1186,7 @@ add_task(function* test_recurring_exception() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_recurring_cancelled_exception() {
-+add_task(async function test_recurring_cancelled_exception() {
-     gServer.syncs = [{
-         token: "1",
-         events: [{
-@@ -1204,18 +1204,18 @@ add_task(function* test_recurring_cancelled_exception() {
-         }]
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_import_invitation() {
-+add_task(async function test_import_invitation() {
-     Preferences.set("calendar.google.enableAttendees", true);
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-     let event = cal.createEvent([
-         "BEGIN:VEVENT",
-@@ -1236,14 +1236,14 @@ add_task(function* test_import_invitation() {
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    let addedItem = yield pclient.adoptItem(event);
-+    let addedItem = await pclient.adoptItem(event);
-     equal(gServer.events.length, 1);
-     equal(addedItem.icalString, event.icalString);
-     gServer.resetClient(client);
-     Preferences.set("calendar.google.enableAttendees", false);
- });
- 
--add_task(function* test_modify_invitation() {
-+add_task(async function test_modify_invitation() {
-     Preferences.set("calendar.google.enableAttendees", true);
-     let organizer = {
-         displayName: "organizer name",
-@@ -1278,10 +1278,10 @@ add_task(function* test_modify_invitation() {
-     }];
- 
-     // Case #1: User is attendee
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     let item = items[0];
-@@ -1297,7 +1297,7 @@ add_task(function* test_modify_invitation() {
-     att.participationStatus = "ACCEPTED";
-     newItem.addAttendee(att);
- 
--    yield pclient.modifyItem(newItem, items[0]);
-+    await pclient.modifyItem(newItem, items[0]);
-     equal(gServer.lastMethod, "PATCH");
- 
-     // Case #2: User is organizer
-@@ -1318,10 +1318,10 @@ add_task(function* test_modify_invitation() {
-     gServer.events[0].creator = gServer.creator;
-     gServer.events[0].attendees = [organizer, attendee];
- 
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     item = items[0];
-@@ -1337,13 +1337,13 @@ add_task(function* test_modify_invitation() {
-     org.participationStatus = "TENTATIVE";
-     newItem.addAttendee(org);
- 
--    modifiedItem = yield pclient.modifyItem(newItem, items[0]);
-+    modifiedItem = await pclient.modifyItem(newItem, items[0]);
-     equal(gServer.lastMethod, "PUT");
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_metadata() {
-+add_task(async function test_metadata() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-@@ -1367,12 +1367,12 @@ add_task(function* test_metadata() {
-         notes: "description"
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let offline = client.wrappedJSObject.mCachedCalendar;
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
-     // Check initial metadata
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     let meta = getAllMeta(offline);
-     let [event, task] = items;
-     ok(cal.item.isEvent(event));
-@@ -1385,9 +1385,9 @@ add_task(function* test_metadata() {
-     gServer.nextEtag = '"3"';
-     let newEvent = event.clone();
-     newEvent.title = "changed";
--    yield pclient.modifyItem(newEvent, event);
-+    await pclient.modifyItem(newEvent, event);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     meta = getAllMeta(offline);
-     [event, task] = items;
-     ok(cal.item.isEvent(event));
-@@ -1400,9 +1400,9 @@ add_task(function* test_metadata() {
-     gServer.nextEtag = '"4"';
-     let newTask = task.clone();
-     newTask.title = "changed";
--    yield pclient.modifyItem(newTask, task);
-+    await pclient.modifyItem(newTask, task);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     meta = getAllMeta(offline);
-     [event, task] = items;
-     equal(meta.size, 2);
-@@ -1410,19 +1410,19 @@ add_task(function* test_metadata() {
-     equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
- 
-     // Delete an event
--    yield pclient.deleteItem(event);
-+    await pclient.deleteItem(event);
-     meta = getAllMeta(offline);
-     equal(meta.size, 1);
-     equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
- 
-     // Delete a task
--    yield pclient.deleteItem(task);
-+    await pclient.deleteItem(task);
-     meta = getAllMeta(offline);
-     equal(meta.size, 0);
- 
-     // Add an event
-     gServer.nextEtag = '"6"';
--    newEvent = yield pclient.addItem(event);
-+    newEvent = await pclient.addItem(event);
-     meta = getAllMeta(offline);
-     equal(meta.size, 1);
-     equal(gServer.events.length, 1);
-@@ -1430,7 +1430,7 @@ add_task(function* test_metadata() {
- 
-     // Add a task
-     gServer.nextEtag = '"7"';
--    newTask = yield pclient.addItem(task);
-+    newTask = await pclient.addItem(task);
-     meta = getAllMeta(offline);
-     equal(meta.size, 2);
-     equal(gServer.events.length, 1);
-@@ -1441,7 +1441,7 @@ add_task(function* test_metadata() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_metadata_recurring() {
-+add_task(async function test_metadata_recurring() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-@@ -1477,10 +1477,10 @@ add_task(function* test_metadata_recurring() {
-         originalStartTime: { dateTime: "2006-06-17T18:00:00+02:00" }
-     }];
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let offline = client.wrappedJSObject.mCachedCalendar;
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
- 
-     let meta = getAllMeta(offline);
-     equal(meta.size, 3);
-@@ -1496,7 +1496,7 @@ add_task(function* test_metadata_recurring() {
-     let newEx = ex.clone();
-     newEx.title = "New Event changed again";
-     gServer.nextEtag = '"4"';
--    yield pclient.modifyItem(newEx, ex);
-+    await pclient.modifyItem(newEx, ex);
-     meta = getAllMeta(offline);
-     equal(meta.size, 3);
-     equal(meta.get(newEx.hashId), ['"4"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
-@@ -1504,20 +1504,20 @@ add_task(function* test_metadata_recurring() {
-     // Deleting an exception should delete the metadata, as it turns into an EXDATE
-     let newItem = items[0].clone();
-     newItem.recurrenceInfo.removeOccurrenceAt(exIds[0]);
--    yield pclient.modifyItem(newItem, items[0]);
-+    await pclient.modifyItem(newItem, items[0]);
- 
-     meta = getAllMeta(offline);
-     equal(meta.size, 2);
- 
-     // Deleting the master item should remove all metadata entries
--    yield pclient.deleteItem(items[0]);
-+    await pclient.deleteItem(items[0]);
-     meta = getAllMeta(offline);
-     equal(meta.size, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_conflict_modify() {
-+add_task(async function test_conflict_modify() {
-     // TODO task/event conflicts are handled in the same way so I'm going to
-     // skip adding tests for tasks here, but it probably wouldn't hurt to
-     // create them at some point.
-@@ -1534,9 +1534,9 @@ add_task(function* test_conflict_modify() {
-         end: { dateTime: "2006-06-10T20:00:00+02:00" },
-         iCalUID: "go6ijb0b46hlpbu4eeu92njevo@google.com"
-     }];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
--    let item = (yield pclient.getAllItems())[0];
-+    let item = (await pclient.getAllItems())[0];
- 
-     // Case #1: Modified on server, modify locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-@@ -1544,8 +1544,8 @@ add_task(function* test_conflict_modify() {
-     newItem.title = "local change";
-     gServer.events[0].etag = '"2"';
-     gServer.events[0].summary = "remote change";
--    let modifiedItem = yield pclient.modifyItem(newItem, item);
--    item = (yield pclient.getAllItems())[0];
-+    let modifiedItem = await pclient.modifyItem(newItem, item);
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "local change");
-     notEqual(gServer.events[0].etag, '"2"');
-     equal(item.title, "local change");
-@@ -1557,7 +1557,7 @@ add_task(function* test_conflict_modify() {
-     gServer.events[0].etag = '"3"';
-     gServer.events[0].summary = "remote change";
-     try {
--        modifiedItem = yield pclient.modifyItem(newItem, item);
-+        modifiedItem = await pclient.modifyItem(newItem, item);
-         do_throw("Expected modifyItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-@@ -1566,9 +1566,9 @@ add_task(function* test_conflict_modify() {
-         }
-     }
- 
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    item = (yield pclient.getAllItems())[0];
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "remote change");
-     equal(gServer.events[0].etag, '"3"');
-     equal(item.title, "remote change");
-@@ -1578,7 +1578,7 @@ add_task(function* test_conflict_modify() {
-     gServer.events[0].etag = '"4"';
-     gServer.events[0].summary = "remote change";
-     try {
--        yield pclient.deleteItem(item);
-+        await pclient.deleteItem(item);
-         do_throw("Expected deleteItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-@@ -1587,9 +1587,9 @@ add_task(function* test_conflict_modify() {
-         }
-     }
- 
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    item = (yield pclient.getAllItems())[0];
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "remote change");
-     equal(gServer.events[0].etag, '"4"');
-     equal(item.title, "remote change");
-@@ -1598,14 +1598,14 @@ add_task(function* test_conflict_modify() {
-     MockConflictPrompt.overwrite = true;
-     gServer.events[0].etag = '"5"';
-     gServer.events[0].summary = "remote change";
--    yield pclient.deleteItem(item);
--    item = (yield pclient.getAllItems())[0];
-+    await pclient.deleteItem(item);
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_conflict_delete() {
-+add_task(async function test_conflict_delete() {
-     // TODO task/event conflicts are handled in the same way so I'm going to
-     // skip adding tests for tasks here, but it probably wouldn't hurt to
-     // create them at some point.
-@@ -1625,17 +1625,17 @@ add_task(function* test_conflict_delete() {
- 
-     // Load intial event to server
-     gServer.events = [coreEvent];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
--    let item = (yield pclient.getAllItems())[0];
-+    let item = (await pclient.getAllItems())[0];
- 
-     // Case #1: Deleted on server, modify locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-     gServer.events = [];
-     let newItem = item.clone();
-     newItem.title = "local change";
--    let modifiedItem = yield pclient.modifyItem(newItem, item);
--    item = (yield pclient.getAllItems())[0];
-+    let modifiedItem = await pclient.modifyItem(newItem, item);
-+    item = (await pclient.getAllItems())[0];
-     equal(gServer.events[0].summary, "local change");
-     notEqual(gServer.events[0].etag, '"2"');
-     equal(item.title, "local change");
-@@ -1646,7 +1646,7 @@ add_task(function* test_conflict_delete() {
-     MockConflictPrompt.overwrite = false;
-     gServer.events = [];
-     try {
--        modifiedItem = yield pclient.modifyItem(newItem, item);
-+        modifiedItem = await pclient.modifyItem(newItem, item);
-         do_throw("Expected modifyItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-@@ -1658,24 +1658,24 @@ add_task(function* test_conflict_delete() {
-     coreEvent.status = "cancelled";
-     gServer.events = [coreEvent];
- 
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 0);
-     equal(gServer.events.length, 1);
- 
-     // Put the event back in the calendar for the next run
-     delete gServer.events[0].status;
-     client.refresh();
--    yield gServer.waitForLoad(client);
--    items = yield pclient.getAllItems();
-+    await gServer.waitForLoad(client);
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     // Case #3: Deleted on server, delete locally, don't overwrite conflict
-     MockConflictPrompt.overwrite = false;
-     gServer.events = [];
-     try {
--        yield pclient.deleteItem(item);
-+        await pclient.deleteItem(item);
-         do_throw("Expected deleteItem to be cancelled");
-     } catch (e) {
-         // Swallow cancelling the request
-@@ -1686,29 +1686,29 @@ add_task(function* test_conflict_delete() {
-     // The next synchronize should cause the event to be deleted locally.
-     coreEvent.status = "cancelled";
-     gServer.events = [coreEvent];
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     // Put the event back in the calendar for the next run
-     delete gServer.events[0].status;
-     client.refresh();
--    yield gServer.waitForLoad(client);
--    items = yield pclient.getAllItems();
-+    await gServer.waitForLoad(client);
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
- 
-     // Case #4: Deleted on server, delete locally, overwrite conflict
-     MockConflictPrompt.overwrite = true;
-     gServer.events = [];
--    yield pclient.deleteItem(item);
--    items = yield pclient.getAllItems();
-+    await pclient.deleteItem(item);
-+    items = await pclient.getAllItems();
-     equal(items.length, 0);
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_default_alarms() {
-+add_task(async function test_default_alarms() {
-     let defaultReminders = [
-         { method: "popup", minutes: 10 },
-         { method: "email", minutes: 20 },
-@@ -1731,11 +1731,11 @@ add_task(function* test_default_alarms() {
-     }];
- 
-     // Case #1: read default alarms from event stream
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-     equal(client.getProperty("settings.defaultReminders"), JSON.stringify(defaultReminders));
- 
--    let item = (yield pclient.getAllItems())[0];
-+    let item = (await pclient.getAllItems())[0];
-     let alarms = item.getAlarms({});
- 
-     equal(alarms.length, 2);
-@@ -1760,7 +1760,7 @@ add_task(function* test_default_alarms() {
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    yield pclient.addItem(event);
-+    await pclient.addItem(event);
-     ok(gServer.events[1].reminders.useDefault);
-     equal(gServer.events[1].reminders.overrides.length, 0);
- 
-@@ -1784,7 +1784,7 @@ add_task(function* test_default_alarms() {
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    yield pclient.addItem(event);
-+    await pclient.addItem(event);
-     ok(gServer.events[2].reminders.useDefault);
-     equal(gServer.events[2].reminders.overrides.length, 1);
-     equal(gServer.events[2].reminders.overrides[0].minutes, 5);
-@@ -1794,7 +1794,7 @@ add_task(function* test_default_alarms() {
-     // Case #4a: Empty default alarms
-     gServer.calendarListData.defaultReminders = [];
-     gServer.eventsData.defaultReminders = [];
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
-     event = cal.createEvent([
-@@ -1806,7 +1806,7 @@ add_task(function* test_default_alarms() {
-         "END:VEVENT"
-     ].join("\r\n"));
- 
--    yield pclient.addItem(event);
-+    await pclient.addItem(event);
-     ok(gServer.events[0].reminders.useDefault);
-     equal(gServer.events[0].reminders.overrides, undefined);
- 
-@@ -1815,16 +1815,16 @@ add_task(function* test_default_alarms() {
- 
-     // Case #4b: Read an item with empty default alarms
-     gServer.events = events;
--    client = yield gServer.getClient();
-+    client = await gServer.getClient();
-     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
- 
--    item = (yield pclient.getAllItems())[0];
-+    item = (await pclient.getAllItems())[0];
-     equal(item.getProperty("X-DEFAULT-ALARM"), "TRUE");
- 
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_paginate() {
-+add_task(async function test_paginate() {
-     gServer.events = [{
-         kind: "calendar#event",
-         etag: "\"1\"",
-@@ -1873,7 +1873,7 @@ add_task(function* test_paginate() {
- 
-     Preferences.set("calendar.google.maxResultsPerRequest", 1);
- 
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
- 
-     // Make sure all pages were requested
-@@ -1882,7 +1882,7 @@ add_task(function* test_paginate() {
- 
-     // ...and we have all items. Not checking props
-     // because the other tests do this sufficiently.
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 4);
- 
-     equal(client.getProperty("syncToken.events"), "next-sync-token");
-@@ -1891,7 +1891,7 @@ add_task(function* test_paginate() {
-     gServer.resetClient(client);
- });
- 
--add_task(function* test_incremental_reset() {
-+add_task(async function test_incremental_reset() {
-     gServer.syncs = [{
-         token: "1",
-         events: [{
-@@ -1926,17 +1926,17 @@ add_task(function* test_incremental_reset() {
-             iCalUID: "fepf8uf6n7n04w7feukucs9n8e@google.com"
-         }]
-     }];
--    let client = yield gServer.getClient();
-+    let client = await gServer.getClient();
-     let pclient = cal.async.promisifyCalendar(client);
- 
--    let items = yield pclient.getAllItems();
-+    let items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(items[0].title, "New Event");
- 
-     client.refresh();
--    yield gServer.waitForLoad(client);
-+    await gServer.waitForLoad(client);
- 
--    items = yield pclient.getAllItems();
-+    items = await pclient.getAllItems();
-     equal(items.length, 1);
-     equal(items[0].title, "New Event 2");
- 
-diff --git a/comm/calendar/test/unit/xpcshell-shared.ini b/comm/calendar/test/unit/xpcshell-shared.ini
-index f759cf0..44d91e5 100644
---- a/comm/calendar/test/unit/xpcshell-shared.ini
-+++ b/comm/calendar/test/unit/xpcshell-shared.ini
-@@ -29,8 +29,8 @@
- [test_email_utils.js]
- [test_freebusy.js]
- [test_freebusy_service.js]
--#[test_gdata_provider.js]
--#requesttimeoutfactor = 2
-+[test_gdata_provider.js]
-+requesttimeoutfactor = 2
- [test_hashedarray.js]
- [test_ics.js]
- [test_ics_parser.js]
-diff --git a/comm/mail/app.mozbuild b/comm/mail/app.mozbuild
-index a377f74..814c4b07 100644
---- a/comm/mail/app.mozbuild
-+++ b/comm/mail/app.mozbuild
-@@ -21,7 +21,8 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
- if CONFIG['MOZ_CALENDAR']:
-     DIRS += [
-         '/%s/calendar/lightning' % CONFIG['commreltopsrcdir'],
--        '/%s/calendar/timezones' % CONFIG['commreltopsrcdir']
-+        '/%s/calendar/providers/gdata' % CONFIG['commreltopsrcdir'],
-+        '/%s/calendar/timezones' % CONFIG['commreltopsrcdir'],
-     ]
- 
- DIRS += [
diff --git a/bz1554949.patch b/bz1554949.patch
deleted file mode 100644
index 15b7569..0000000
--- a/bz1554949.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1559048542 0
-# Node ID 49be991ad4d9ab41ddd6dd829edf62a2154fbfea
-# Parent  7cae42dee59feb7d5754a755220b27fe9e684eb7
-Bug 1554949 - Fix WebRTC build failure with newer linux kernel. r=dminor
-
-Recent kernel commit[1] moved a bit the define for this constant. This revealed
-a missing include in WebRTC.
-
-I filed this upstream in:
-
- * https://bugs.chromium.org/p/webrtc/issues/detail?id=10677
-
-And sent a patch in:
-
- * https://webrtc-review.googlesource.com/c/src/+/138270
-
-[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0768e17073dc5
-
-Differential Revision: https://phabricator.services.mozilla.com/D32809
-
-diff --git a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
---- a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
-+++ b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
-@@ -56,16 +56,19 @@
- #if defined(WEBRTC_POSIX)
- #include <netinet/tcp.h>  // for TCP_NODELAY
- #define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h
- typedef void* SockOptArg;
- 
- #endif  // WEBRTC_POSIX
- 
- #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
-+#if defined(WEBRTC_LINUX)
-+#include <linux/sockios.h>
-+#endif
- 
- int64_t GetSocketRecvTimestamp(int socket) {
-   struct timeval tv_ioctl;
-   int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
-   if (ret != 0)
-     return -1;
-   int64_t timestamp =
-       rtc::kNumMicrosecsPerSec * static_cast<int64_t>(tv_ioctl.tv_sec) +
-
diff --git a/firefox-gcc-6.0.patch b/firefox-gcc-6.0.patch
deleted file mode 100644
index 58b1ff4..0000000
--- a/firefox-gcc-6.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up firefox-44.0/nsprpub/config/make-system-wrappers.pl.back firefox-44.0/nsprpub/config/make-system-wrappers.pl
---- firefox-44.0/mozilla/nsprpub/config/make-system-wrappers.pl.back	2016-01-24 00:23:49.000000000 +0100
-+++ firefox-44.0/mozilla/nsprpub/config/make-system-wrappers.pl	2016-02-02 14:58:45.064112655 +0100
-@@ -19,7 +19,9 @@ while (<STDIN>) {
-     open OUT, ">$output_dir/$_";
-     print OUT "#pragma GCC system_header\n";  # suppress include_next warning
-     print OUT "#pragma GCC visibility push(default)\n";
-+    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
-     print OUT "#include_next \<$_\>\n";
-+    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
-     print OUT "#pragma GCC visibility pop\n";
-     close OUT;
- }
-diff -up firefox-44.0/mozglue/build/arm.cpp.old firefox-44.0/mozglue/build/arm.cpp
---- firefox-44.0/mozilla/mozglue/build/arm.cpp.old	2016-02-03 10:07:29.879526500 +0100
-+++ firefox-44.0/mozilla/mozglue/build/arm.cpp	2016-02-03 10:08:11.062697517 +0100
-@@ -104,7 +104,9 @@ check_neon(void)
- 
- #  elif defined(__linux__) || defined(ANDROID)
- #    include <stdio.h>
-+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- #    include <stdlib.h>
-+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
- #    include <string.h>
- 
- enum{
diff --git a/mozilla-1245783.patch b/mozilla-1245783.patch
deleted file mode 100644
index 52223ea..0000000
--- a/mozilla-1245783.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-<head>
-<title>mozilla-1245783.patch - rpms/thunderbird.git - thunderbird</title>
-<meta name='generator' content='cgit v1.1'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/thunderbird.git/atom/mozilla-1245783.patch?h=master' type='application/atom+xml'/>
-<link rel='vcs-git' href='https://src.fedoraproject.org/git/rpms/thunderbird.git' title='rpms/thunderbird.git Git repository'/>
-</head>
-<body>
-<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
-<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
-
-<script>
-    var base = 'https://apps.fedoraproject.org/';
-    var tokens = window.location.href.split('/');
-  var repo = null;
-  if (tokens.length > 5 && tokens[4] == 'rpms' && tokens[5] != '') {
-    repo = tokens[5].split('.')[0];
-  }
-  fedmenu({
-      'url': base + 'js/data.js',
-      'mimeType': 'application/javascript',
-      'position': 'bottom-right',
-      'package': repo,
-  });
-</script>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/thunderbird.git' href='/cgit/rpms/thunderbird.git/'>rpms/thunderbird.git</a></td><td class='form'><form method='get'>
-<select name='h' onchange='this.form.submit();'>
-<option value='epel7'>epel7</option>
-<option value='f10'>f10</option>
-<option value='f11'>f11</option>
-<option value='f12'>f12</option>
-<option value='f13'>f13</option>
-<option value='f14'>f14</option>
-<option value='f15'>f15</option>
-<option value='f16'>f16</option>
-<option value='f17'>f17</option>
-<option value='f18'>f18</option>
-<option value='f19'>f19</option>
-<option value='f20'>f20</option>
-<option value='f21'>f21</option>
-<option value='f22'>f22</option>
-<option value='f23'>f23</option>
-<option value='f24'>f24</option>
-<option value='f25'>f25</option>
-<option value='f26'>f26</option>
-<option value='f7'>f7</option>
-<option value='f8'>f8</option>
-<option value='f9'>f9</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit' value='switch'/></form></td></tr>
-<tr><td class='sub'>thunderbird</td><td class='sub right'>Jesse Keating</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/rpms/thunderbird.git/'>summary</a><a href='/cgit/rpms/thunderbird.git/refs/'>refs</a><a href='/cgit/rpms/thunderbird.git/log/mozilla-1245783.patch'>log</a><a class='active' href='/cgit/rpms/thunderbird.git/tree/mozilla-1245783.patch'>tree</a><a href='/cgit/rpms/thunderbird.git/commit/mozilla-1245783.patch'>commit</a><a href='/cgit/rpms/thunderbird.git/diff/mozilla-1245783.patch'>diff</a><a href='/cgit/rpms/thunderbird.git/stats/mozilla-1245783.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/thunderbird.git/log/mozilla-1245783.patch'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/cgit/rpms/thunderbird.git/tree/'>root</a>/<a href='/cgit/rpms/thunderbird.git/tree/mozilla-1245783.patch'>mozilla-1245783.patch</a></div><div class='content'>blob: 3452616197bdac0ddd74367aeef4541919f32925 (<a href='/cgit/rpms/thunderbird.git/plain/mozilla-1245783.patch'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-<a id='n14' href='#n14'>14</a>
-<a id='n15' href='#n15'>15</a>
-<a id='n16' href='#n16'>16</a>
-<a id='n17' href='#n17'>17</a>
-</pre></td>
-<td class='lines'><pre><code># Remove when mozbz#1269319 lands
-
---- firefox-45.0.1-orig/mozilla/js/src/Makefile.in	2016-05-17 14:53:58.753178403 +0200
-+++ firefox-45.0.1/mozilla/js/src/Makefile.in	2016-05-17 14:53:28.432817862 +0200
-@@ -144,6 +144,11 @@ distclean::
- 
- CFLAGS += $(MOZ_ZLIB_CFLAGS)
- 
-+# Avoid GNU gcc bug #70526
-+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70526#c14
-+CFLAGS += -fno-schedule-insns2
-+CXXFLAGS += -fno-schedule-insns2
-+
- # Silence warnings on AIX/HP-UX from non-GNU compilers
- ifndef GNU_CC
- ifeq ($(OS_ARCH),AIX)
-
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.1</a> at 2017-03-10 21:07:43 +0000</div>
-</div> <!-- id=cgit -->
-</body>
-</html>
diff --git a/mozilla-thunderbird-enigmail-build-package-contents-rdf.patch b/mozilla-thunderbird-enigmail-build-package-contents-rdf.patch
deleted file mode 100644
index 1963c69..0000000
--- a/mozilla-thunderbird-enigmail-build-package-contents-rdf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/extensions/enigmail/build/package/contents.rdf.orig	2005-01-16 01:56:19.000000000 +0000
-+++ mozilla/extensions/enigmail/build/package/contents.rdf	2005-01-16 01:56:47.000000000 +0000
-@@ -13,7 +13,7 @@
-         chrome:author="Team Enigmail"
-         chrome:authorURL="http://enigmail.mozdev.org/"
-         chrome:name="enigmime"
--        chrome:extension="true"
-+        chrome:extension="false"
-         chrome:description="This is the platform dependent part of the Enigmail extension.">
-   </RDF:Description>
- </RDF:RDF>
diff --git a/mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch b/mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch
deleted file mode 100644
index 2d0d325..0000000
--- a/mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/extensions/enigmail/ui/content/contents.rdf.orig	2004-09-17 10:52:05.000000000 +0000
-+++ mozilla/extensions/enigmail/ui/content/contents.rdf	2004-09-17 10:52:15.000000000 +0000
-@@ -13,7 +13,7 @@
-         chrome:author="Team Enigmail"
-         chrome:authorURL="http://enigmail.mozdev.org/"
-         chrome:name="enigmail"
--        chrome:extension="true"
-+        chrome:extension="false"
-         chrome:description="This extension adds support for OpenPGP message encryption."
-         chrome:settingsURL="chrome://enigmail/content/pref-enigmail.xul">
-      <chrome:uninstallInfo>
diff --git a/mozilla-thunderbird-enigmail-visibility.patch b/mozilla-thunderbird-enigmail-visibility.patch
deleted file mode 100644
index 14ca16b..0000000
--- a/mozilla-thunderbird-enigmail-visibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: mozilla/extensions/enigmail/build/nsEnigModule.cpp
-===================================================================
---- mozilla/extensions/enigmail/build/nsEnigModule.cpp
-+++ mozilla/extensions/enigmail/build/nsEnigModule.cpp	2009-07-28 17:09:02.000000000 +0200
-@@ -39,7 +39,9 @@
- #include "nsCOMPtr.h"
- 
- #include "nsIFactory.h"
-+#pragma GCC visibility push(default)
- #include "nsIGenericFactory.h"
-+#pragma GCC visibility pop
- #include "nsIServiceManager.h"
- #include "nsIModule.h"
- 
diff --git a/rust-1.33-build.patch b/rust-1.33-build.patch
deleted file mode 100644
index 746145f..0000000
--- a/rust-1.33-build.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build thunderbird-60.8.0/servo/components/style_traits/values.rs
---- thunderbird-60.8.0/servo/components/style_traits/values.rs.rust-1.33-build	2019-07-03 17:25:28.000000000 +0200
-+++ thunderbird-60.8.0/servo/components/style_traits/values.rs	2019-07-11 13:38:53.687318154 +0200
-@@ -135,6 +135,7 @@ where
-     }
- }
- 
-+/// Some comment
- #[macro_export]
- macro_rules! serialize_function {
-     ($dest: expr, $name: ident($( $arg: expr, )+)) => {
-@@ -404,6 +405,7 @@ impl_to_css_for_predefined_type!(::csspa
- impl_to_css_for_predefined_type!(::cssparser::Color);
- impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
- 
-+/// Some comment
- #[macro_export]
- macro_rules! define_css_keyword_enum {
-     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
-diff -up thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs
---- thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs.old	2019-07-11 14:22:51.393784701 +0200
-+++ thunderbird-60.8.0/servo/components/style/properties/properties.mako.rs	2019-07-11 14:24:03.182578100 +0200
-@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster;
- 
- pub use self::declaration_block::*;
- 
-+/// Neco
- #[cfg(feature = "gecko")]
- #[macro_export]
- macro_rules! property_name {
-@@ -3852,7 +3853,7 @@ impl fmt::Debug for AliasId {
-     }
- }
- 
--// NOTE(emilio): Callers are responsible to deal with prefs.
-+/// NOTE(emilio): Callers are responsible to deal with prefs.
- #[macro_export]
- macro_rules! css_properties_accessors {
-     ($macro_name: ident) => {
-@@ -3875,6 +3876,7 @@ macro_rules! css_properties_accessors {
-     }
- }
- 
-+/// Neco
- #[macro_export]
- macro_rules! longhand_properties_idents {
-     ($macro_name: ident) => {
diff --git a/thunderbird-24.5.0-nss_detect.patch b/thunderbird-24.5.0-nss_detect.patch
deleted file mode 100644
index d5c7252..0000000
--- a/thunderbird-24.5.0-nss_detect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla-release/mozilla/configure.orig	2014-03-19 10:50:38.758940687 +0000
-+++ mozilla-release/mozilla/configure	2014-03-19 10:52:04.239943420 +0000
-@@ -15217,9 +15217,10 @@
- 		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
- 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- 		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
--			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+			sed 's/\([0-9]*\).\([0-9]*\).*\([0-9]*\)/\2/'`
- 		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
- 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-+		if [ -z "$nss_config_micro_version" ]; then nss_config_micro_version=0; fi
- 		min_nss_major_version=`echo $min_nss_version | \
- 			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- 		min_nss_minor_version=`echo $min_nss_version | \
diff --git a/thunderbird-appname.patch b/thunderbird-appname.patch
deleted file mode 100644
index a5859b2..0000000
--- a/thunderbird-appname.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -p -up comm-1.9.2/mail/components/shell/nsMailGNOMEIntegration.cpp.thunderbird-appname comm-1.9.2/mail/components/shell/nsMailGNOMEIntegration.cpp
---- comm-1.9.2/mail/components/shell/nsMailGNOMEIntegration.cpp.thunderbird-appname	2010-07-13 18:22:45.000000000 -0300
-+++ comm-1.9.2/mail/components/shell/nsMailGNOMEIntegration.cpp	2010-07-20 17:37:39.595057298 -0300
-@@ -98,6 +98,12 @@ nsMailGNOMEIntegration::Init()
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-   rv = appPath->GetNativePath(mAppPath);
-+
-+  /* This path of thunderbird is hardcoded for the default path setting 
-+   * And the above code is not used.
-+   */
-+  mAppPath.Assign ("/usr/bin/thunderbird");
-+
-   return rv;
- }
- 
diff --git a/thunderbird.spec b/thunderbird.spec
index a051dbb..e7d8a10 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -204,7 +204,7 @@
 
 Summary:	Full-featured email, RSS, and newsgroup client
 Name:		thunderbird
-Version:	68.0
+Version:	68.1.0
 Release:	1
 License:	MPL
 Group:		Networking/Mail
@@ -242,24 +242,17 @@ Source401:	thunderbird-l10n-template.in
 %endif
 # Build patches
 #
-Patch1:	bz1554949.patch
 # Fedora patches (Patch100+)
 #
-#Patch101:	rust-1.33-build.patch
 #
 # Debian patches (Patch200+)
 #
 Patch201:       mozilla-thunderbird-default-mailer.patch
-Patch212:       mozilla-thunderbird-enigmail-ui-content-contents-rdf.patch
-Patch213:       mozilla-thunderbird-enigmail-build-package-contents-rdf.patch
-Patch215:	mozilla-thunderbird-enigmail-visibility.patch
-Patch216:	Build-also-gdata-provider-as-xpi-file.patch
 # Mandriva patches (Patch300+)
 Patch300:       mozilla-thunderbird-0.8-progname.patch
 Patch301:       mozilla-thunderbird-enigmail-package.patch
 Patch304:       mozilla-thunderbird-run-mozilla.patch
 # OpenSuse patches (Patch400+)
-Patch400:	thunderbird-appname.patch
 
 BuildRequires:	imagemagick
 BuildRequires:	autoconf2.1
@@ -386,14 +379,7 @@ Calendar extension for Thunderbird.
 
 %setup -q -n %{name}-%{version}
 
-%patch1 -p1 -b .1554949
-
-#patch101 -p1 -b .rust133
-%patch201 -p1 -b .default_mail
-#patch216 -p1 -b .gdata
-%patch300 -p1 -b .progname
-%patch301 -p1 -b .enigmailpackage
-%patch304 -p1 -b .run-mozilla
+%apply_patches
 
 mkdir -p my_rust_vendor
 cd my_rust_vendor
@@ -412,10 +398,6 @@ env CARGO_HOME=.cargo cargo install cbindgen
 #===============================================================================
 # Enigmail
 %setup -q -T -D -n %{name}-%{version}/extensions -a300
-%if 0
-%patch212 -p2 -b .enigmail-ui-content-contents-rdf
-%patch213 -p2 -b .enigmail-build-package-contents-rdf
-%endif
 
 %setup -q -T -D -n %{name}-%{version}
 
Not Available

benbullard79 [@T] cox.netHuh?1648d 01hrs
benbullard79 [@T] cox.netTime to cull the herd1645d 05hrs
benbullard79 [@T] cox.netcull the herd1645d 04hrs