summaryrefslogtreecommitdiff
path: root/mail/thunderbird/patches
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-09-27 23:46:31 +0000
committertnn <tnn@pkgsrc.org>2015-09-27 23:46:31 +0000
commitd8d5f7e035b483cbf3ae17a141ea290773d27c18 (patch)
tree484ce7258d2313b42841c1872d92eaaea1bbd6ff /mail/thunderbird/patches
parenta369875bd6fc7a29d80588efe21cf9c932173a92 (diff)
downloadpkgsrc-d8d5f7e035b483cbf3ae17a141ea290773d27c18.tar.gz
Remove old and probably stale Gecko Media Plugin patches (from FreeBSD?).
It might still be possible that pkgsrc needs adjustments for gmp loading if/when we adopt some gmp packages, but until then they serve no purpose and in fact appear to be harmful. Fixes Firefox startup error message: addons.manager ERROR Exception calling provider GMPProvider.startup
Diffstat (limited to 'mail/thunderbird/patches')
-rw-r--r--mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp30
-rw-r--r--mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp33
-rw-r--r--mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm30
-rw-r--r--mail/thunderbird/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm12
-rw-r--r--mail/thunderbird/patches/patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm132
5 files changed, 0 insertions, 237 deletions
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);