diff options
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/iceweasel/non-openh264.patch | 541 |
2 files changed, 553 insertions, 1 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 46ec99fe1..6c30f31ea 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -17,6 +17,7 @@ _debname=iceweasel _debver=33.0 _debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ +_parabolarepo=https://repo.parabola.nu/other/$_debname-libre debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel @@ -43,7 +44,8 @@ install=iceweasel.install replaces=('firefox' "${pkgname}-libre") conflicts=('firefox' "${pkgname}-libre") provides=('firefox') -source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" +mksource=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" +source=("$_parabolarepo/$_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz" mozconfig mozconfig.pgo @@ -66,6 +68,15 @@ md5sums=('5288af8026ff814fc4d769fed69865f7' '16a112aaeee34ff3cae1fc1a521448a0' '6e335a517c68488941340ee1c23f97b0') +mksource() { + export DEBIAN_BUILD="mozilla-release" + + cd "$srcdir/$DEBIAN_BUILD" + + # Remove nonfree OpenH264 plugin provided by Cisco Systems + rm -v toolkit/mozapps/extensions/{test/{browser/browser_openH264.js,xpcshell/test_openh264.js},content/{OpenH264-license.txt,openH264Prefs.xul},internal/OpenH264Provider.jsm} +} + prepare() { export DEBIAN_BUILD="mozilla-release" diff --git a/libre/iceweasel/non-openh264.patch b/libre/iceweasel/non-openh264.patch new file mode 100644 index 000000000..e38072a0d --- /dev/null +++ b/libre/iceweasel/non-openh264.patch @@ -0,0 +1,541 @@ +diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js +--- mozilla-release.orig/browser/app/profile/firefox.js 2014-10-11 07:06:16.000000000 -0200 ++++ mozilla-release/browser/app/profile/firefox.js 2014-10-19 01:52:24.472980961 -0200 +@@ -1697,6 +1697,3 @@ + pref("experiments.manifest.certs.1.issuerName", "CN=Cybertrust Public SureServer SV CA,O=Cybertrust Inc"); + // Whether experiments are supported by the current application profile. + pref("experiments.supported", true); +- +-// Enable the OpenH264 plugin support in the addon manager. +-pref("media.gmp-gmpopenh264.provider.enabled", true); +diff -Nur mozilla-release.orig/dom/locales/en-US/chrome/plugins.properties mozilla-release/dom/locales/en-US/chrome/plugins.properties +--- mozilla-release.orig/dom/locales/en-US/chrome/plugins.properties 2014-10-11 07:06:22.000000000 -0200 ++++ mozilla-release/dom/locales/en-US/chrome/plugins.properties 2014-10-19 01:51:29.184391813 -0200 +@@ -19,6 +19,3 @@ + mimetype_label=MIME Type + description_label=Description + suffixes_label=Suffixes +- +-openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc. +-openH264_description=Play back web video and use video chats. +diff -Nur mozilla-release.orig/security/sandbox/mac/Sandbox.h mozilla-release/security/sandbox/mac/Sandbox.h +--- mozilla-release.orig/security/sandbox/mac/Sandbox.h 2014-10-11 07:06:46.000000000 -0200 ++++ mozilla-release/security/sandbox/mac/Sandbox.h 2014-10-19 02:40:00.177677126 -0200 +@@ -17,7 +17,6 @@ + enum MacSandboxPluginType { + MacSandboxPluginType_Default = 0, + MacSandboxPluginType_GMPlugin_Default, // Any Gecko Media Plugin +- MacSandboxPluginType_GMPlugin_OpenH264, // Gecko Media Plugin, OpenH264 + MacSandboxPluginType_GMPlugin_EME, // Gecko Media Plugin, EME + MacSandboxPluginType_Invalid + }; +diff -Nur mozilla-release.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties mozilla-release/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties +--- mozilla-release.orig/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties 2014-10-11 07:06:48.000000000 -0200 ++++ mozilla-release/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties 2014-10-19 01:53:46.325827609 -0200 +@@ -56,8 +56,6 @@ + notification.installError=There was an error installing %1$S. + notification.installError.retry=Try again + notification.installError.retry.tooltip=Try downloading and installing this add-on again +-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later. +-notification.openH264Pending=Will be installed shortly. + + #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions + contributionAmount2=Suggested Contribution: %S +@@ -99,8 +97,6 @@ + details.notification.uninstall=%1$S will be uninstalled after you restart %2$S. + #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name + details.notification.upgrade=%1$S will be updated after you restart %2$S. +-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later. +-details.notification.openH264Pending=Will be installed shortly. + + # LOCALIZATION NOTE (details.experiment.time.daysRemaining): + # Semicolon-separated list of plural forms. +diff -Nur mozilla-release.orig/toolkit/modules/GMPInstallManager.jsm mozilla-release/toolkit/modules/GMPInstallManager.jsm +--- mozilla-release.orig/toolkit/modules/GMPInstallManager.jsm 2014-10-11 07:06:48.000000000 -0200 ++++ mozilla-release/toolkit/modules/GMPInstallManager.jsm 2014-10-19 02:02:32.404134498 -0200 +@@ -14,7 +14,6 @@ + const DOWNLOAD_INTERVAL = 0; + // 1 day default + const DEFAULT_SECONDS_BETWEEN_CHECKS = 60 * 60 * 24; +-const OPEN_H264_ID = "gmp-gmpopenh264"; + + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + Cu.import("resource://gre/modules/Services.jsm"); +@@ -27,7 +26,7 @@ + Cu.import("resource://gre/modules/ctypes.jsm"); + + this.EXPORTED_SYMBOLS = ["GMPInstallManager", "GMPExtractor", "GMPDownloader", +- "GMPAddon", "GMPPrefs", "OPEN_H264_ID"]; ++ "GMPAddon", "GMPPrefs"]; + + var gLocale = null; + const PARENT_LOGGER_ID = "GMPInstallManager"; +@@ -416,15 +415,12 @@ + /** + * Wrapper for checkForAddons and installAddon. + * Will only install if not already installed and will log the results. +- * This will only install/update the OpenH264 plugin + */ + simpleCheckAndInstall: function() { + let log = getScopedLogger("GMPInstallManager.simpleCheckAndInstall"); + +- let autoUpdate = GMPPrefs.get(GMPPrefs.KEY_ADDON_AUTOUPDATE, +- OPEN_H264_ID, true); ++ let autoUpdate = GMPPrefs.get(GMPPrefs.KEY_ADDON_AUTOUPDATE, true); + if (!autoUpdate) { +- log.info("Auto-update is off for openh264, aborting check."); + return Promise.resolve({status: "check-disabled"}); + } + +@@ -446,15 +442,13 @@ + log.info("Found " + gmpAddons.length + " addons advertised."); + let addonsToInstall = gmpAddons.filter(gmpAddon => { + log.info("Found addon: " + gmpAddon.toString()); +- return gmpAddon.isValid && gmpAddon.isOpenH264 && ++ return gmpAddon.isValid && + !gmpAddon.isInstalled + }); + if (!addonsToInstall.length) { + log.info("No new addons to install, returning"); + return deferred.resolve({status: "nothing-new-to-install"}); + } +- // Only 1 addon will be returned because of the gmpAddon.isOpenH264 +- // check above. + addonsToInstall.forEach(gmpAddon => { + promise = this.installAddon(gmpAddon); + promise.then(extractedPaths => { +@@ -670,7 +664,6 @@ + return this.id + " (" + + "isValid: " + this.isValid + + ", isInstalled: " + this.isInstalled + +- ", isOpenH264: " + this.isOpenH264 + + ", hashFunction: " + this.hashFunction+ + ", hashValue: " + this.hashValue + + (this.size !== undefined ? ", size: " + this.size : "" ) + +@@ -684,13 +677,6 @@ + return this.id && this.URL && this.version && + this.hashFunction && !!this.hashValue; + }, +- /** +- * Open H264 has special handling. +- * @return true if the plugin is the openh264 plugin +- */ +- get isOpenH264() { +- return this.id === OPEN_H264_ID; +- }, + get isInstalled() { + return this.version && + GMPPrefs.get(GMPPrefs.KEY_ADDON_VERSION, this.id) === this.version; +diff -Nur mozilla-release.orig/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js mozilla-release/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js +--- mozilla-release.orig/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js 2014-10-11 07:06:48.000000000 -0200 ++++ mozilla-release/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js 2014-10-19 02:09:57.836312466 -0200 +@@ -162,211 +162,6 @@ + }); + + /** +- * Tests that getting a response with a single addon works as expected +- */ +-add_test(function test_checkForAddons_singleAddonNoUpdates() { +- let responseXML = +- "<?xml version=\"1.0\"?>" + +- "<updates>" + +- " <addons>" + +- " <addon id=\"gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha256\"" + +- " hashValue=\"1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"1.1\"/>" + +- " </addons>" + +- "</updates>" +- overrideXHR(200, responseXML); +- let installManager = new GMPInstallManager(); +- let promise = installManager.checkForAddons(); +- promise.then(function(gmpAddons) { +- do_check_eq(gmpAddons.length, 1); +- let gmpAddon= gmpAddons[0]; +- do_check_eq(gmpAddon.id, "gmp-gmpopenh264"); +- do_check_eq(gmpAddon.URL, "http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip"); +- do_check_eq(gmpAddon.hashFunction, "sha256"); +- do_check_eq(gmpAddon.hashValue, "1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee"); +- do_check_eq(gmpAddon.version, "1.1"); +- do_check_eq(gmpAddon.size, undefined); +- do_check_true(gmpAddon.isValid); +- do_check_true(gmpAddon.isOpenH264); +- do_check_false(gmpAddon.isInstalled); +- installManager.uninit(); +- run_next_test(); +- }, function(err) { +- do_throw("1 addon found should not reject"); +- }); +-}); +- +-/** +- * Tests that getting a response with a single addon with the optional size +- * attribute parses as expected. +- */ +-add_test(function test_checkForAddons_singleAddonNoUpdates() { +- let responseXML = +- "<?xml version=\"1.0\"?>" + +- "<updates>" + +- " <addons>" + +- " <addon id=\"openh264-plugin-no-at-symbol\"" + +- " URL=\"http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha256\"" + +- " size=\"42\"" + +- " hashValue=\"1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"1.1\"/>" + +- " </addons>" + +- "</updates>" +- overrideXHR(200, responseXML); +- let installManager = new GMPInstallManager(); +- let promise = installManager.checkForAddons(); +- promise.then(function(gmpAddons) { +- do_check_eq(gmpAddons.length, 1); +- let gmpAddon= gmpAddons[0]; +- do_check_eq(gmpAddon.id, "openh264-plugin-no-at-symbol"); +- do_check_eq(gmpAddon.URL, "http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip"); +- do_check_eq(gmpAddon.hashFunction, "sha256"); +- do_check_eq(gmpAddon.hashValue, "1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee"); +- do_check_eq(gmpAddon.size, 42); +- do_check_eq(gmpAddon.version, "1.1"); +- do_check_true(gmpAddon.isValid); +- do_check_false(gmpAddon.isOpenH264); +- do_check_false(gmpAddon.isInstalled); +- installManager.uninit(); +- run_next_test(); +- }, function(err) { +- do_throw("1 addon found should not reject"); +- }); +-}); +- +-/** +- * Tests that checking for multiple addons work correctly. +- * Also tests that invalid addons work correctly. +- */ +-add_test(function test_checkForAddons_multipleAddonNoUpdatesSomeInvalid() { +- let responseXML = +- "<?xml version=\"1.0\"?>" + +- "<updates>" + +- " <addons>" + +- // valid openh264 +- " <addon id=\"gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha256\"" + +- " hashValue=\"1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"1.1\"/>" + +- // valid not openh264 +- " <addon id=\"NOT-gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha512\"" + +- " hashValue=\"141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"9.1\"/>" + +- // noid +- " <addon notid=\"NOT-gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha512\"" + +- " hashValue=\"141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"9.1\"/>" + +- // no URL +- " <addon id=\"NOT-gmp-gmpopenh264\"" + +- " notURL=\"http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha512\"" + +- " hashValue=\"141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"9.1\"/>" + +- // no hash function +- " <addon id=\"NOT-gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip\"" + +- " nothashFunction=\"sha512\"" + +- " hashValue=\"141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"9.1\"/>" + +- // no hash function +- " <addon id=\"NOT-gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha512\"" + +- " nothashValue=\"141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"9.1\"/>" + +- // not version +- " <addon id=\"NOT-gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha512\"" + +- " hashValue=\"141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " notversion=\"9.1\"/>" + +- " </addons>" + +- "</updates>" +- overrideXHR(200, responseXML); +- let installManager = new GMPInstallManager(); +- let promise = installManager.checkForAddons(); +- promise.then(function(gmpAddons) { +- do_check_eq(gmpAddons.length, 7); +- let gmpAddon= gmpAddons[0]; +- do_check_eq(gmpAddon.id, "gmp-gmpopenh264"); +- do_check_eq(gmpAddon.URL, "http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip"); +- do_check_eq(gmpAddon.hashFunction, "sha256"); +- do_check_eq(gmpAddon.hashValue, "1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee"); +- do_check_eq(gmpAddon.version, "1.1"); +- do_check_true(gmpAddon.isValid); +- do_check_true(gmpAddon.isOpenH264); +- do_check_false(gmpAddon.isInstalled); +- +- gmpAddon= gmpAddons[1]; +- do_check_eq(gmpAddon.id, "NOT-gmp-gmpopenh264"); +- do_check_eq(gmpAddon.URL, "http://127.0.0.1:8011/NOT-gmp-gmpopenh264-1.1.zip"); +- do_check_eq(gmpAddon.hashFunction, "sha512"); +- do_check_eq(gmpAddon.hashValue, "141592656f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee"); +- do_check_eq(gmpAddon.version, "9.1"); +- do_check_true(gmpAddon.isValid); +- do_check_false(gmpAddon.isOpenH264); +- do_check_false(gmpAddon.isInstalled); +- +- for (let i = 2; i < gmpAddons.length; i++) { +- do_check_false(gmpAddons[i].isValid); +- do_check_false(gmpAddons[i].isInstalled); +- } +- installManager.uninit(); +- run_next_test(); +- }, function(err) { +- do_throw("multiple addons found should not reject"); +- }); +-}); +- +-/** +- * Tests that checking for addons when there are also updates available +- * works as expected. +- */ +-add_test(function test_checkForAddons_updatesWithAddons() { +- let responseXML = +- "<?xml version=\"1.0\"?>" + +- " <updates>" + +- " <update type=\"minor\" displayVersion=\"33.0a1\" appVersion=\"33.0a1\" platformVersion=\"33.0a1\" buildID=\"20140628030201\">" + +- " <patch type=\"complete\" URL=\"http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014/06/2014-06-28-03-02-01-mozilla-central/firefox-33.0a1.en-US.mac.complete.mar\" hashFunction=\"sha512\" hashValue=\"f3f90d71dff03ae81def80e64bba3e4569da99c9e15269f731c2b167c4fc30b3aed9f5fee81c19614120230ca333e73a5e7def1b8e45d03135b2069c26736219\" size=\"85249896\"/>" + +- " </update>" + +- " <addons>" + +- " <addon id=\"gmp-gmpopenh264\"" + +- " URL=\"http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip\"" + +- " hashFunction=\"sha256\"" + +- " hashValue=\"1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee\"" + +- " version=\"1.1\"/>" + +- " </addons>" + +- "</updates>" +- overrideXHR(200, responseXML); +- let installManager = new GMPInstallManager(); +- let promise = installManager.checkForAddons(); +- promise.then(function(gmpAddons) { +- do_check_eq(gmpAddons.length, 1); +- let gmpAddon= gmpAddons[0]; +- do_check_eq(gmpAddon.id, "gmp-gmpopenh264"); +- do_check_eq(gmpAddon.URL, "http://127.0.0.1:8011/gmp-gmpopenh264-1.1.zip"); +- do_check_eq(gmpAddon.hashFunction, "sha256"); +- do_check_eq(gmpAddon.hashValue, "1118b90d6f645eefc2b99af17bae396636ace1e33d079c88de715177584e2aee"); +- do_check_eq(gmpAddon.version, "1.1"); +- do_check_true(gmpAddon.isValid); +- do_check_true(gmpAddon.isOpenH264); +- do_check_false(gmpAddon.isInstalled); +- installManager.uninit(); +- run_next_test(); +- }, function(err) { +- do_throw("updates with addons should not reject"); +- }); +-}); +- +-/** + * Tests that installing found addons works as expected + */ + function test_checkForAddons_installAddon(id, includeSize,wantInstallReject) { +@@ -394,16 +189,6 @@ + + let responseXML = + "<?xml version=\"1.0\"?>" + +- "<updates>" + +- " <addons>" + +- " <addon id=\"" + id + "-gmp-gmpopenh264\"" + +- " URL=\"" + zipURL + "\"" + +- " hashFunction=\"" + hashFunc + "\"" + +- " hashValue=\"" + expectedDigest + "\"" + +- (includeSize ? " size=\"" + fileSize + "\"" : "") + +- " version=\"1.1\"/>" + +- " </addons>" + +- "</updates>" + + overrideXHR(200, responseXML); + let installManager = new GMPInstallManager(); +@@ -478,7 +263,7 @@ + * Tests simpleCheckAndInstall autoupdate disabled + */ + add_task(function test_simpleCheckAndInstall() { +- GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, false, OPEN_H264_ID); ++ GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, false); + let installManager = new GMPInstallManager(); + let promise = installManager.simpleCheckAndInstall(); + promise.then((result) => { +@@ -492,7 +277,7 @@ + * Tests simpleCheckAndInstall nothing to install + */ + add_task(function test_simpleCheckAndInstall() { +- GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, true, OPEN_H264_ID); ++ GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, true); + let installManager = new GMPInstallManager(); + let promise = installManager.simpleCheckAndInstall(); + promise.then((result) => { +@@ -506,7 +291,7 @@ + * Tests simpleCheckAndInstall too frequent + */ + add_task(function test_simpleCheckAndInstall() { +- GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, true, OPEN_H264_ID); ++ GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, true); + let installManager = new GMPInstallManager(); + let promise = installManager.simpleCheckAndInstall(); + promise.then((result) => { +@@ -529,15 +314,6 @@ + + let responseXML = + "<?xml version=\"1.0\"?>" + +- "<updates>" + +- " <addons>" + +- " <addon id=\"gmp-gmpopenh264\"" + +- " URL=\"" + zipURL + "\"" + +- " hashFunction=\"sha256\"" + +- " hashValue=\"11221cbda000347b054028b527a60e578f919cb10f322ef8077d3491c6fcb474\"" + +- " version=\"1.1\"/>" + +- " </addons>" + +- "</updates>" + + overrideXHR(200, responseXML); + let installManager = new GMPInstallManager(); +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/content/extensions.js mozilla-release/toolkit/mozapps/extensions/content/extensions.js +--- mozilla-release.orig/toolkit/mozapps/extensions/content/extensions.js 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/content/extensions.js 2014-10-19 02:46:06.824431601 -0200 +@@ -53,8 +53,6 @@ + + const VIEW_DEFAULT = "addons://discover/"; + +-const OPENH264_ADDON_ID = "gmp-gmpopenh264"; +- + var gStrings = {}; + XPCOMUtils.defineLazyServiceGetter(gStrings, "bundleSvc", + "@mozilla.org/intl/stringbundle;1", +@@ -1024,7 +1022,7 @@ + + cmd_showItemPreferences: { + isEnabled: function cmd_showItemPreferences_isEnabled(aAddon) { +- if (!aAddon || (!aAddon.isActive && aAddon.id != OPENH264_ADDON_ID) || !aAddon.optionsURL) ++ if (!aAddon || (!aAddon.isActive) || !aAddon.optionsURL) + return false; + if (gViewController.currentViewObj == gDetailView && + aAddon.optionsType == AddonManager.OPTIONS_TYPE_INLINE) { +@@ -2784,14 +2782,7 @@ + + var fullDesc = document.getElementById("detail-fulldesc"); + if (aAddon.fullDescription) { +- // The following is part of an awful hack to include the OpenH264 license +- // without having bug 624602 fixed yet, and intentionally ignores +- // localisation. +- if (aAddon.id == OPENH264_ADDON_ID) +- fullDesc.innerHTML = aAddon.fullDescription; +- else +- fullDesc.textContent = aAddon.fullDescription; +- ++ fullDesc.textContent = aAddon.fullDescription; + fullDesc.hidden = false; + } else { + fullDesc.hidden = true; +@@ -3097,10 +3088,6 @@ + errorLink.value = gStrings.ext.GetStringFromName("details.notification.vulnerableNoUpdate.link"); + errorLink.href = this._addon.blocklistURL; + errorLink.hidden = false; +- } else if (this._addon.id == OPENH264_ADDON_ID && !this._addon.isInstalled) { +- this.node.setAttribute("notification", "warning"); +- let warning = document.getElementById("detail-warning"); +- warning.textContent = gStrings.ext.GetStringFromName("details.notification.openH264Pending"); + } else { + this.node.removeAttribute("notification"); + } +Binary files mozilla-release.orig/toolkit/mozapps/extensions/content/.extensions.js.swp and mozilla-release/toolkit/mozapps/extensions/content/.extensions.js.swp differ +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/content/extensions.xml mozilla-release/toolkit/mozapps/extensions/content/extensions.xml +--- mozilla-release.orig/toolkit/mozapps/extensions/content/extensions.xml 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/content/extensions.xml 2014-10-19 02:28:38.692307550 -0200 +@@ -1294,9 +1294,6 @@ + this._errorLink.value = gStrings.ext.GetStringFromName("notification.vulnerableNoUpdate.link"); + this._errorLink.href = this.mAddon.blocklistURL; + this._errorLink.hidden = false; +- } else if (this.mAddon.id == "gmp-gmpopenh264" && !this.mAddon.isInstalled) { +- this.setAttribute("notification", "warning"); +- this._warning.textContent = gStrings.ext.GetStringFromName("notification.openH264Pending"); + } else { + this.removeAttribute("notification"); + } +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/extensions.manifest mozilla-release/toolkit/mozapps/extensions/extensions.manifest +--- mozilla-release.orig/toolkit/mozapps/extensions/extensions.manifest 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/extensions.manifest 2014-10-19 02:39:34.883411390 -0200 +@@ -14,5 +14,4 @@ + contract @mozilla.org/addons/installtrigger;1 {9df8ef2b-94da-45c9-ab9f-132eb55fddf1} + category JavaScript-global-property InstallTrigger @mozilla.org/addons/installtrigger;1 + category addon-provider-module PluginProvider resource://gre/modules/addons/PluginProvider.jsm +-category addon-provider-module OpenH264Provider resource://gre/modules/addons/OpenH264Provider.jsm + #endif +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/internal/moz.build mozilla-release/toolkit/mozapps/extensions/internal/moz.build +--- mozilla-release.orig/toolkit/mozapps/extensions/internal/moz.build 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/internal/moz.build 2014-10-19 02:38:55.831969979 -0200 +@@ -13,7 +13,6 @@ + 'AddonUpdateChecker.jsm', + 'Content.js', + 'LightweightThemeImageOptimizer.jsm', +- 'OpenH264Provider.jsm', + 'PluginProvider.jsm', + 'SpellCheckDictionaryBootstrap.js', + ] +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/jar.mn mozilla-release/toolkit/mozapps/extensions/jar.mn +--- mozilla-release.orig/toolkit/mozapps/extensions/jar.mn 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/jar.mn 2014-10-19 02:38:28.590963098 -0200 +@@ -29,8 +29,6 @@ + content/mozapps/extensions/newaddon.js (content/newaddon.js) + content/mozapps/extensions/setting.xml (content/setting.xml) + content/mozapps/extensions/pluginPrefs.xul (content/pluginPrefs.xul) +- content/mozapps/extensions/openH264Prefs.xul (content/openH264Prefs.xul) +- content/mozapps/extensions/OpenH264-license.txt (content/OpenH264-license.txt) + content/mozapps/xpinstall/xpinstallConfirm.xul (content/xpinstallConfirm.xul) + content/mozapps/xpinstall/xpinstallConfirm.js (content/xpinstallConfirm.js) + content/mozapps/xpinstall/xpinstallConfirm.css (content/xpinstallConfirm.css) +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/test/browser/browser.ini mozilla-release/toolkit/mozapps/extensions/test/browser/browser.ini +--- mozilla-release.orig/toolkit/mozapps/extensions/test/browser/browser.ini 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/test/browser/browser.ini 2014-10-19 02:36:46.520512902 -0200 +@@ -41,7 +41,6 @@ + [browser_hotfix.js] + [browser_installssl.js] + [browser_newaddon.js] +-[browser_openH264.js] + [browser_select_compatoverrides.js] + [browser_select_confirm.js] + [browser_select_selection.js] +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js mozilla-release/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js +--- mozilla-release.orig/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/test/xpcshell/test_duplicateplugins.js 2014-10-19 02:37:19.735079356 -0200 +@@ -102,7 +102,6 @@ + function run_test() { + do_test_pending(); + createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); +- Services.prefs.setBoolPref("media.gmp-gmpopenh264.provider.enabled", false); + + startupManager(); + +diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js mozilla-release/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js +--- mozilla-release.orig/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js 2014-10-19 02:37:41.129205965 -0200 +@@ -67,8 +67,6 @@ + do_test_pending();
+ createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+
+- Services.prefs.setBoolPref("media.gmp-gmpopenh264.provider.enabled", false);
+-
+ startupManager();
+ AddonManager.addAddonListener(AddonListener);
+ AddonManager.addInstallListener(InstallListener);
+diff -Nur mozilla-release.orig/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini mozilla-release/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +--- mozilla-release.orig/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2014-10-11 07:06:49.000000000 -0200 ++++ mozilla-release/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2014-10-19 02:37:57.999830973 -0200 +@@ -13,6 +13,5 @@ + [test_asyncBlocklistLoad.js] + [test_DeferredSave.js] + [test_metadata_update.js] +-[test_openh264.js] + run-if = appname == "firefox" + [test_XPIcancel.js] |