From 2a3d0389493b0c2ca18839ef1238510b6eae1e6d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Dec 2014 14:51:30 -0200 Subject: iceweasel-1:34.0.deb1-1: updating version * try without rpath * don't need to specify the PGO script anymore * avoid openh264 being downloaded and disable it if it is already there -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716 --- libre/iceweasel/PKGBUILD | 23 +- libre/iceweasel/libre.patch | 56 ++-- libre/iceweasel/mozconfig.pgo | 3 - libre/iceweasel/non-openh264.patch | 541 ------------------------------------- 4 files changed, 33 insertions(+), 590 deletions(-) delete mode 100644 libre/iceweasel/mozconfig.pgo delete mode 100644 libre/iceweasel/non-openh264.patch (limited to 'libre/iceweasel') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index ea23f656e..6ed6d74aa 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=33.1 +_debver=34.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -46,8 +46,6 @@ conflicts=("${pkgname}-libre") source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz" mozconfig - mozconfig.pgo - non-openh264.patch libre.patch gnu_headshadow.png $pkgname.desktop @@ -55,12 +53,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js rhbz-966424.patch $pkgname-fixed-loading-icon.png) -md5sums=('8f866d57af8649152fb814a3a697d5c2' - 'c646686c03f1fe350fa8ca1151ac61d5' +md5sums=('67c5ab2f4551c2743e70a3bcb041bf66' + '5d72813950fdcf47a38b2f0eb7ebe33d' '5eca2c1dbdd9c043b24de39cd05d6e8f' - 'df08eaa1ac3bc6c2356be4fbf8ec8932' - 'dea78e67cbda6811905e6c7b1e72df88' - '615e983df37cdee26095df4d645cd2ab' + '747e2db5987302777e9bf7be58dd4c72' 'b03a979a78484503ba8dddad4f2c96d1' 'fd8f61f2ae44e5b0e0b2c7b433695980' '1c42509891cf6843660a5f3c69896e80' @@ -87,10 +83,6 @@ prepare() { install -m644 "$srcdir/gnu_headshadow.png" \ browser/base/content/abouthome - # Remove nonfree OpenH264 references - rm -v toolkit/mozapps/extensions/{test/{browser/browser_openH264.js,xpcshell/test_openh264.js},content/{OpenH264-license.txt,openH264Prefs.xul},internal/OpenH264Provider.jsm} - patch -Np1 -i "$srcdir/non-openh264.patch" - # Install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" @@ -123,10 +115,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig - fi - # From js on abslibre-mips64el.git if [ "$CARCH" = "mips64el" ]; then msg "Force disabling JIT." @@ -181,7 +169,6 @@ build() { cd "$srcdir/$DEBIAN_BUILD" export PATH="$srcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" if $_pgo; then diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index a90cb8610..331c11b61 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -1,7 +1,7 @@ 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-16 03:11:36.489138574 -0200 -+++ mozilla-release/browser/app/profile/firefox.js 2014-10-16 03:14:47.987353379 -0200 -@@ -287,11 +287,6 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2014-12-04 14:35:08.800256420 -0200 ++++ mozilla-release/browser/app/profile/firefox.js 2014-12-04 14:38:00.315002361 -0200 +@@ -291,11 +291,6 @@ pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); @@ -14,8 +14,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-10-11 07:06:16.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-10-16 03:14:47.987353379 -0200 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-11-26 00:17:06.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-12-04 14:38:00.315002361 -0200 @@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -37,8 +37,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi + width: 47px; } - #searchText { -@@ -145,48 +139,6 @@ + #searchIcon { +@@ -177,48 +171,6 @@ transition-duration: 0ms; } @@ -87,7 +87,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #launcher { display: -moz-box; -moz-box-align: center; -@@ -335,26 +287,25 @@ +@@ -367,26 +319,25 @@ width: 32px; } @@ -120,8 +120,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } /* [HiDPI] -@@ -366,26 +317,6 @@ - background-image: url("chrome://branding/content/about-logo@2x.png"); +@@ -402,26 +353,6 @@ + background-image: url("chrome://browser/skin/magnifier@2x.png"); } - #defaultSnippet1, @@ -147,7 +147,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi .launchButton:-moz-dir(rtl)::before, #aboutMozilla:-moz-dir(rtl)::before { transform: scale(.5) translateX(32px); -@@ -431,9 +362,5 @@ +@@ -467,9 +398,5 @@ transform: scale(-0.5, 0.5) translateX(24px); transform-origin: top center; } @@ -158,10 +158,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2014-10-11 07:06:16.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-10-16 03:14:47.990686739 -0200 -@@ -3,154 +3,44 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2014-11-26 00:17:06.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-12-04 14:40:25.106182469 -0200 +@@ -5,154 +5,44 @@ + "use strict"; const SEARCH_ENGINES = { - "Google": { @@ -350,7 +350,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -158,7 +48,6 @@ +@@ -160,7 +50,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -358,7 +358,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil gInitialized = true; } return; -@@ -183,117 +72,6 @@ +@@ -185,117 +74,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -448,13 +448,13 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - - // The cache has been filled up, create the snippets map. - gSnippetsMap = Object.freeze({ -- get: function (aKey) cache.get(aKey), +- get: (aKey) => cache.get(aKey), - set: function (aKey, aValue) { - db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") - .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey); - return cache.set(aKey, aValue); - }, -- has: function (aKey) cache.has(aKey), +- has: (aKey) => cache.has(aKey), - delete: function (aKey) { - db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") - .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey); @@ -465,7 +465,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear(); - return cache.clear(); - }, -- get size() cache.size +- get size() { return cache.size; }, - }); - - setTimeout(invokeCallbacks, 0); @@ -476,7 +476,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -364,144 +142,6 @@ +@@ -366,144 +144,6 @@ document.dispatchEvent(event); } @@ -622,9 +622,9 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-10-11 07:06:16.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-10-16 03:14:47.990686739 -0200 -@@ -47,15 +47,6 @@ +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-11-26 00:17:06.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-12-04 14:38:00.315002361 -0200 +@@ -48,15 +48,6 @@ @@ -640,7 +640,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
-@@ -75,6 +66,6 @@ +@@ -76,6 +67,6 @@
@@ -770,8 +770,8 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in

diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm ---- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-10-11 07:06:18.000000000 -0200 -+++ mozilla-release/browser/modules/AboutHome.jsm 2014-10-16 03:14:48.017353625 -0200 +--- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-11-26 00:17:08.000000000 -0200 ++++ mozilla-release/browser/modules/AboutHome.jsm 2014-12-04 14:38:00.341669245 -0200 @@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -848,7 +848,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -229,18 +169,9 @@ +@@ -242,18 +182,9 @@ }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, diff --git a/libre/iceweasel/mozconfig.pgo b/libre/iceweasel/mozconfig.pgo deleted file mode 100644 index 71ba205a4..000000000 --- a/libre/iceweasel/mozconfig.pgo +++ /dev/null @@ -1,3 +0,0 @@ - -# PGO -mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' diff --git a/libre/iceweasel/non-openh264.patch b/libre/iceweasel/non-openh264.patch deleted file mode 100644 index e38072a0d..000000000 --- a/libre/iceweasel/non-openh264.patch +++ /dev/null @@ -1,541 +0,0 @@ -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 = -- "" + -- "" + -- " " + -- " " + -- " " + -- "" -- 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 = -- "" + -- "" + -- " " + -- " " + -- " " + -- "" -- 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 = -- "" + -- "" + -- " " + -- // valid openh264 -- " " + -- // valid not openh264 -- " " + -- // noid -- " " + -- // no URL -- " " + -- // no hash function -- " " + -- // no hash function -- " " + -- // not version -- " " + -- " " + -- "" -- 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 = -- "" + -- " " + -- " " + -- " " + -- " " + -- " " + -- " " + -- " " + -- "" -- 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 = - "" + -- "" + -- " " + -- " " + -- " " + -- "" - - 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 = - "" + -- "" + -- " " + -- " " + -- " " + -- "" - - 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] -- cgit v1.2.3