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

7 files changed, 3 insertions, 246 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 6e03cbe05e8..c63f9cb9a3b 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.134 2015/09/21 05:03:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.135 2015/09/27 23:46:31 tnn Exp $
 
 DISTNAME=	# empty
 PKGNAME=	seamonkey-${SM_VER:S/b/beta/}
 SM_VER=		2.35
 #LIGHTNINGVER=	1.9
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
 #MASTER_SITES=	${MASTER_SITE_MOZILLA_ALL:=seamonkey/releases/${SM_VER}/source/}
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 98b498a31ad..2a59da82894 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.123 2015/09/21 05:03:45 ryoon Exp $
+$NetBSD: distinfo,v 1.124 2015/09/27 23:46:31 tnn Exp $
 
 SHA1 (seamonkey-2.35.source.tar.bz2) = 309078b0e2d7d1d25ef57e12df679bc3bbccfa81
 RMD160 (seamonkey-2.35.source.tar.bz2) = 6ce430d36a82e18b389b88e9dbad4226189db13e
@@ -14,8 +14,6 @@ SHA1 (patch-ldap_sdks_c-sdk_ldap_include_portable.h) = 4ce9e1a0e8f0d05367243e8d2
 SHA1 (patch-mail_app_Makefile.in) = 4d69a03cac313bd7f55c6dd5a54d8d361c3a9131
 SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = 0cbabcf5b188e86404e3ded8452c73a7f498efe3
 SHA1 (patch-mozilla_accessible_atk_Platform.cpp) = c5f43a6b66fcf8a6c242b2b9400679e44b5ee8e8
-SHA1 (patch-mozilla_b2g_installer_Makefile.in) = 9281d16c242b7e7d8608244363bd32ab431fc5f0
-SHA1 (patch-mozilla_b2g_installer_package-manifest.in) = 2de99fe5dc609e0955d5b20d78813143c461e40f
 SHA1 (patch-mozilla_browser_app_nsBrowserApp.cpp) = b2a9784925d95947194d7ad3a4812abd91728b9d
 SHA1 (patch-mozilla_browser_installer_package-manifest.in) = 84825ae3eb2ed39da9792e890a5bfbf8fa7e4708
 SHA1 (patch-mozilla_build_autoconf_compiler-opts.m4) = 1970fa246049adde4f2338ccd51f3651081bea56
@@ -32,8 +30,6 @@ SHA1 (patch-mozilla_config_system-headers) = 35e01aa6f0fdb7299ea5ee4d07a7aa1b95d
 SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = e1e0b68c13af61edd54a6f12d63a8da3ddb21132
 SHA1 (patch-mozilla_dom_base_moz.build) = de05328ca4339e0e3a92da3e4517697df9d3b53a
 SHA1 (patch-mozilla_dom_media_AudioStream.h) = 92029dfdf3cfd168b88e313806340db9d13d408f
-SHA1 (patch-mozilla_dom_media_gmp_GMPChild.cpp) = 39bd9871057efd69853f26b2230f58bcf9e4c94b
-SHA1 (patch-mozilla_dom_media_gmp_GMPParent.cpp) = 8e3c3738e80c63503b34d20437a389e595cf4acb
 SHA1 (patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp) = c160b78d4ea5058df602c74be43be9476cb78d1f
 SHA1 (patch-mozilla_dom_media_moz.build) = e21f162f6fb2f053e3e04a8273033b92bd6a75dd
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 005a611073f3a8b865d19e7204df9d40e5e1c3ff
@@ -142,9 +138,6 @@ SHA1 (patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp) = 0ab4f1ff35d40
 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = abf9d1bb447264172ac7e7421e98113d926f44cd
 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 9637d1ecc330845c43b02ab75873c2c1f4e446a2
 SHA1 (patch-mozilla_toolkit_library_moz.build) = ce5cf8db841d8161ee661f54bd30aa37cb08eaf5
-SHA1 (patch-mozilla_toolkit_modules_GMPInstallManager.jsm) = a9474a17fd78874bf6e646812d07cc5fa4d8deb6
-SHA1 (patch-mozilla_toolkit_modules_GMPUtils.jsm) = 2e4ea40458200837de154fc9e854b06ad7d41777
-SHA1 (patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm) = c65f084cee178bbf427cd1851b1e9c71757ff282
 SHA1 (patch-mozilla_toolkit_xre_nsAppRunner.cpp) = 6ce047ed4a029f0935ebc9c297e99c8b9ccd76f1
 SHA1 (patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp) = 70030e59b2ed09b9bc9827d35e17b12be7f0cd71
 SHA1 (patch-mozilla_webapprt_moz.build) = 8323bfea8fe835571bf60d95cfa59859b745083f
diff --git a/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp b/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp
deleted file mode 100644
index 12465908ecc..00000000000
--- a/www/seamonkey/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/03/17 19:50:42 ryoon Exp $
-
---- mozilla/dom/media/gmp/GMPChild.cpp.orig	2015-03-09 05:34:53.000000000 +0000
-+++ mozilla/dom/media/gmp/GMPChild.cpp
-@@ -82,21 +82,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/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp b/www/seamonkey/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp
deleted file mode 100644
index 8d62f97745f..00000000000
--- a/www/seamonkey/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/03/17 19:50:42 ryoon Exp $
-
---- mozilla/dom/media/gmp/GMPParent.cpp.orig	2015-03-09 05:34:53.000000000 +0000
-+++ mozilla/dom/media/gmp/GMPParent.cpp
-@@ -96,23 +96,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/www/seamonkey/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm b/www/seamonkey/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm
deleted file mode 100644
index defed4740da..00000000000
--- a/www/seamonkey/patches/patch-mozilla_toolkit_modules_GMPInstallManager.jsm
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-mozilla_toolkit_modules_GMPInstallManager.jsm,v 1.2 2015/09/21 05:03:45 ryoon Exp $
-
---- mozilla/toolkit/modules/GMPInstallManager.jsm.orig	2015-09-02 09:27: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/www/seamonkey/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm b/www/seamonkey/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm
deleted file mode 100644
index 21707ebca96..00000000000
--- a/www/seamonkey/patches/patch-mozilla_toolkit_modules_GMPUtils.jsm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-mozilla_toolkit_modules_GMPUtils.jsm,v 1.1 2015/09/21 05:03:45 ryoon Exp $
-
---- mozilla/toolkit/modules/GMPUtils.jsm.orig	2015-09-02 09:27: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/www/seamonkey/patches/patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm b/www/seamonkey/patches/patch-mozilla_toolkit_mozapps_extensions_internal_GMPProvider.jsm
deleted file mode 100644
index 939bc8ddefe..00000000000
--- a/www/seamonkey/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/09/21 05:03:45 ryoon Exp $
-
---- mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm.orig	2015-09-02 09:27: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);