diff options
Diffstat (limited to 'mail')
7 files changed, 3 insertions, 244 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index c17036e3bea..e3f56bb3fac 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.156 2015/08/29 12:42:55 ryoon Exp $ +# $NetBSD: Makefile,v 1.157 2015/09/27 23:46:31 tnn Exp $ DISTNAME= # empty PKGNAME= thunderbird-${TB_VER} TB_VER= 38.2.0 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} DISTFILES= thunderbird-${TB_VER}.source.tar.bz2 diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index a83cd0e99ea..957096c1bdf 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.164 2015/09/07 15:19:10 ryoon Exp $ +$NetBSD: distinfo,v 1.165 2015/09/27 23:46:31 tnn Exp $ SHA1 (thunderbird-38.2.0.source.tar.bz2) = 0e27c54ee63b71cd7e8ff4fd87bbe66e0a16ffc1 RMD160 (thunderbird-38.2.0.source.tar.bz2) = 62d8388cf8998bd051ee6b899a98883dd278d85b @@ -43,8 +43,6 @@ SHA1 (patch-mozilla_config_system-headers) = 2b66e88ad46cf4e7c0b8a663c615b272a47 SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 32d4ab3fbf80bf19783dab7c4a875a7262f419cf SHA1 (patch-mozilla_dom_base_moz.build) = dce93f4c00bb662d5c702b442ee169bb8888237d SHA1 (patch-mozilla_dom_media_AudioStream.h) = b5092adaf26c8c1809b4ad62eb92be101c07ac88 -SHA1 (patch-mozilla_dom_media_gmp_GMPChild.cpp) = 18e604d744edf775776fb482e59a2864cbf146bd -SHA1 (patch-mozilla_dom_media_gmp_GMPParent.cpp) = 1ca834cab61dac2c79ed4288da958f8ed7055953 SHA1 (patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp) = cadb3396a56ed3147c4ec2b4b8494205672883fb SHA1 (patch-mozilla_dom_media_moz.build) = 12ab0e2441422bbb683a5da163644db9bfd11aec SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = a877a2e086149d14004b15e2c96970d27b4de3a2 @@ -147,9 +145,6 @@ SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = dc5066e49bb37 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = 455c218c6fce4d7f26bda18c9169e3bd263af6f8 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 8f48e55d1a1483b7727ef8b2e11b0142894aa14c SHA1 (patch-mozilla_toolkit_library_moz.build) = 0d2a0509f34686260e417f0ae221e738b3378100 -SHA1 (patch-mozilla_toolkit_modules_GMPInstallManager.jsm) = 975a04826031128d04d2fdba2f7a2bd6dd7d2844 -SHA1 (patch-mozilla_toolkit_modules_GMPUtils.jsm) = b66bb759d73cea16372570cff288dd018b3ad0fc -SHA1 (patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm) = 6dd0ab01b21e11a77b554d3be32bbb0aeed0a441 SHA1 (patch-mozilla_toolkit_xre_nsAppRunner.cpp) = 9e2212cfa52080593c88e8ffc926681016dfb6a5 SHA1 (patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp) = 41dbac602fb4b61835c794c6fc950f16cadd2f6f SHA1 (patch-mozilla_webapprt_moz.build) = a61c46543c2c4cc5ecfcd3eb24facab3e6081b52 diff --git a/mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp b/mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp deleted file mode 100644 index fd1418cacfe..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-mozilla_dom_media_gmp_GMPChild.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/dom/media/gmp/GMPChild.cpp.orig 2015-06-08 17:49:28.000000000 +0000 -+++ mozilla/dom/media/gmp/GMPChild.cpp -@@ -79,21 +79,14 @@ GetFileBase(const std::string& aPluginPa - } - #endif - -- nsCOMPtr<nsIFile> parent; -- rv = aFileBase->GetParent(getter_AddRefs(parent)); -- if (NS_FAILED(rv)) { -- return false; -- } -- -- nsAutoString parentLeafName; -- rv = parent->GetLeafName(parentLeafName); -- if (NS_FAILED(rv)) { -+ nsAutoString leafName; -+ if (NS_FAILED(aFileBase->GetLeafName(leafName))) { - return false; - } - -- aBaseName = Substring(parentLeafName, -+ aBaseName = Substring(leafName, - 4, -- parentLeafName.Length() - 1); -+ leafName.Length() - 1); - return true; - } - diff --git a/mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp b/mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp deleted file mode 100644 index 3fd2eeffe43..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-mozilla_dom_media_gmp_GMPParent.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/dom/media/gmp/GMPParent.cpp.orig 2015-06-08 17:49:28.000000000 +0000 -+++ mozilla/dom/media/gmp/GMPParent.cpp -@@ -100,23 +100,16 @@ GMPParent::Init(GeckoMediaPluginService - mService = aService; - mDirectory = aPluginDir; - -- // aPluginDir is <profile-dir>/<gmp-plugin-id>/<version> -- // where <gmp-plugin-id> should be gmp-gmpopenh264 -- nsCOMPtr<nsIFile> parent; -- nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent)); -- if (NS_FAILED(rv)) { -- return rv; -- } -- nsAutoString parentLeafName; -- rv = parent->GetLeafName(parentLeafName); -+ nsAutoString leafname; -+ nsresult rv = aPluginDir->GetLeafName(leafname); - if (NS_FAILED(rv)) { - return rv; - } - LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, -- NS_LossyConvertUTF16toASCII(parentLeafName).get())); -+ NS_LossyConvertUTF16toASCII(leafname).get())); - -- MOZ_ASSERT(parentLeafName.Length() > 4); -- mName = Substring(parentLeafName, 4); -+ MOZ_ASSERT(leafname.Length() > 4); -+ mName = Substring(leafname, 4); - - return ReadGMPMetaData(); - } diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm b/mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm deleted file mode 100644 index 0fc33b65d93..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_modules_GMPInstallManager.jsm,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/toolkit/modules/GMPInstallManager.jsm.orig 2015-06-08 17:49:31.000000000 +0000 -+++ mozilla/toolkit/modules/GMPInstallManager.jsm -@@ -874,9 +874,7 @@ GMPDownloader.prototype = { - let gmpAddon = this._gmpAddon; - let installToDirPath = Cc["@mozilla.org/file/local;1"]. - createInstance(Ci.nsIFile); -- let path = OS.Path.join(OS.Constants.Path.profileDir, -- gmpAddon.id, -- gmpAddon.version); -+ let path = OS.Path.join(OS.Constants.Path.profileDir, gmpAddon.id); - installToDirPath.initWithPath(path); - log.info("install to directory path: " + installToDirPath.path); - let gmpInstaller = new GMPExtractor(zipPath, installToDirPath.path); -@@ -885,10 +883,12 @@ GMPDownloader.prototype = { - // Success, set the prefs - let now = Math.round(Date.now() / 1000); - GMPPrefs.set(GMPPrefs.KEY_PLUGIN_LAST_UPDATE, now, gmpAddon.id); -- // Setting the version pref signals installation completion to consumers, -- // if you need to set other prefs etc. do it before this. -+ // Setting the path pref signals installation completion to consumers, -+ // so set the version and potential other information they use first. - GMPPrefs.set(GMPPrefs.KEY_PLUGIN_VERSION, gmpAddon.version, - gmpAddon.id); -+ GMPPrefs.set(GMPPrefs.KEY_PLUGIN_PATH, -+ installToDirPath.path, gmpAddon.id); - this._deferred.resolve(extractedPaths); - }, err => { - this._deferred.reject(err); diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm b/mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm deleted file mode 100644 index f925119b203..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_modules_GMPUtils.jsm,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/toolkit/modules/GMPUtils.jsm.orig 2015-06-08 17:49:31.000000000 +0000 -+++ mozilla/toolkit/modules/GMPUtils.jsm -@@ -74,6 +74,7 @@ this.GMPPrefs = { - KEY_EME_ENABLED: "media.eme.enabled", - KEY_PLUGIN_ENABLED: "media.{0}.enabled", - KEY_PLUGIN_LAST_UPDATE: "media.{0}.lastUpdate", -+ KEY_PLUGIN_PATH: "media.{0}.path", - KEY_PLUGIN_VERSION: "media.{0}.version", - KEY_PLUGIN_AUTOUPDATE: "media.{0}.autoupdate", - KEY_PLUGIN_FORCEVISIBLE: "media.{0}.forcevisible", diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm b/mail/thunderbird/patches/patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm deleted file mode 100644 index 8a0c129d877..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm +++ /dev/null @@ -1,132 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig 2015-06-08 17:49:31.000000000 +0000 -+++ mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm -@@ -101,12 +101,11 @@ function GMPWrapper(aPluginInfo) { - Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP", - "GMPWrapper(" + - this._plugin.id + ") "); -- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, -- this._plugin.id), -+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, this._plugin.id), - this.onPrefEnabledChanged, this); -- Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION, -+ Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH, - this._plugin.id), -- this.onPrefVersionChanged, this); -+ this.onPrefPathChanged, this); - if (this._plugin.isEME) { - Preferences.observe(GMPPrefs.KEY_EME_ENABLED, - this.onPrefEMEGlobalEnabledChanged, this); -@@ -123,17 +122,14 @@ GMPWrapper.prototype = { - optionsType: AddonManager.OPTIONS_TYPE_INLINE, - get optionsURL() { return this._plugin.optionsURL; }, - -+ - set gmpPath(aPath) { this._gmpPath = aPath; }, - get gmpPath() { -- if (!this._gmpPath && this.isInstalled) { -- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir, -- this._plugin.id, -- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, -- null, this._plugin.id)); -+ if (!this._gmpPath) { -+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); - } - return this._gmpPath; - }, -- - get id() { return this._plugin.id; }, - get type() { return "plugin"; }, - get isGMPlugin() { return true; }, -@@ -144,8 +140,13 @@ GMPWrapper.prototype = { - get description() { return this._plugin.description; }, - get fullDescription() { return this._plugin.fullDescription; }, - -- get version() { return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null, -- this._plugin.id); }, -+ get version() { -+ if (this.isInstalled) { -+ return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null, -+ this._plugin.id); -+ } -+ return null; -+ }, - - get isActive() { return !this.appDisabled && !this.userDisabled; }, - get appDisabled() { -@@ -292,24 +293,17 @@ GMPWrapper.prototype = { - - get pluginMimeTypes() { return []; }, - get pluginLibraries() { -- if (this.isInstalled) { -- let path = this.version; -- return [path]; -- } -- return []; -+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); -+ return path && path.length ? [OS.Path.basename(path)] : []; - }, - get pluginFullpath() { -- if (this.isInstalled) { -- let path = OS.Path.join(OS.Constants.Path.profileDir, -- this._plugin.id, -- this.version); -- return [path]; -- } -- return []; -+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); -+ return path && path.length ? [path] : []; - }, - - get isInstalled() { -- return this.version && this.version.length > 0; -+ let path = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, null, this._plugin.id); -+ return path && path.length > 0; - }, - - _handleEnabledChanged: function() { -@@ -389,10 +383,10 @@ GMPWrapper.prototype = { - } - }, - -- onPrefVersionChanged: function() { -+ onPrefPathChanged: function() { - AddonManagerPrivate.callAddonListeners("onUninstalling", this, false); - if (this._gmpPath) { -- this._log.info("onPrefVersionChanged() - unregistering gmp directory " + -+ this._log.info("onPrefPathChanged() - unregistering gmp directory " + - this._gmpPath); - gmpService.removeAndDeletePluginDirectory(this._gmpPath, true /* can defer */); - } -@@ -401,15 +395,10 @@ GMPWrapper.prototype = { - AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this, - null, false); - AddonManagerPrivate.callAddonListeners("onInstalling", this, false); -- this._gmpPath = null; -- if (this.isInstalled) { -- this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir, -- this._plugin.id, -- GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, -- null, this._plugin.id)); -- } -+ this._gmpPath = GMPPrefs.get(GMPPrefs.KEY_PLUGIN_PATH, -+ null, this._plugin.id); - if (this._gmpPath && this.isActive) { -- this._log.info("onPrefVersionChanged() - registering gmp directory " + -+ this._log.info("onPrefPathChanged() - registering gmp directory " + - this._gmpPath); - gmpService.addPluginDirectory(this._gmpPath); - } -@@ -431,9 +420,9 @@ GMPWrapper.prototype = { - Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED, - this._plugin.id), - this.onPrefEnabledChanged, this); -- Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION, -+ Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_PATH, - this._plugin.id), -- this.onPrefVersionChanged, this); -+ this.onPrefPathChanged, this); - if (this._plugin.isEME) { - Preferences.ignore(GMPPrefs.KEY_EME_ENABLED, - this.onPrefEMEGlobalEnabledChanged, this); |