From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Feb 2013 01:12:52 -0800 Subject: Sun Feb 10 01:12:35 PST 2013 --- libre/iceweasel-libre/PKGBUILD | 8 +- libre/iceweasel-libre/bug677092.patch | 330 ------------------------ libre/iceweasel-libre/firefox.install | 13 - libre/iceweasel-libre/gcc47.patch | 75 ------ libre/iceweasel-libre/region.properties | 23 -- libre/iceweasel-libre/xulrunner-copy-stub.patch | 11 - 6 files changed, 4 insertions(+), 456 deletions(-) delete mode 100644 libre/iceweasel-libre/bug677092.patch delete mode 100644 libre/iceweasel-libre/firefox.install delete mode 100644 libre/iceweasel-libre/gcc47.patch delete mode 100644 libre/iceweasel-libre/region.properties delete mode 100644 libre/iceweasel-libre/xulrunner-copy-stub.patch (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 571ad31a0..00a6fb3b0 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=18.0.1 +_debver=18.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -54,8 +54,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('5d481dd35a304702d1f311eeb3f1149f' - '6a4781e8ddc1b166f36930c4864e095f' +md5sums=('9869f5aa42cf922526d34b4946fee867' + 'a7f261b9860b9af596e0d8614d52a8cd' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'ac29b01c189f20abae2f3eef1618ffc0' '1ee2d4bcacee73d671b9ffa17a02abaa' diff --git a/libre/iceweasel-libre/bug677092.patch b/libre/iceweasel-libre/bug677092.patch deleted file mode 100644 index aee09b451..000000000 --- a/libre/iceweasel-libre/bug677092.patch +++ /dev/null @@ -1,330 +0,0 @@ -exporting patch: -# HG changeset patch -# User Axel Hecht -# Date 1348128099 -7200 -# Node ID 812d0ba8317507c4026958a740960384eac1507a -# Parent 97e49e7a33266a0680e5af59289264a07e4321f8 -bug 677092, make language packs restartless, r=Unfocused -Make language packs just trigger the chrome registration hooks, and -disable picking up bootstrap.js, and declare them restartless. - -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm ---- a/toolkit/mozapps/extensions/XPIProvider.jsm Wed Sep 26 13:08:50 2012 +0200 -+++ b/toolkit/mozapps/extensions/XPIProvider.jsm Thu Sep 20 10:01:39 2012 +0200 -@@ -740,8 +740,8 @@ - } - } - else { -- // spell check dictionaries never require a restart -- if (addon.type == "dictionary") -+ // spell check dictionaries and language packs never require a restart -+ if (addon.type == "dictionary" || addon.type == "locale") - addon.bootstrap = true; - - // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For -@@ -3695,6 +3695,11 @@ - Components.manager.addBootstrappedManifestLocation(aFile); - - try { -+ // Don't call bootstrap.js methods for language packs, -+ // they only contain chrome. -+ if (aType == "locale") -+ return; -+ - // Load the scope if it hasn't already been loaded - if (!(aId in this.bootstrapScopes)) - this.loadBootstrapScope(aId, aFile, aVersion, aType); -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest Thu Sep 20 10:01:39 2012 +0200 -@@ -0,0 +1,1 @@ -+locale test-langpack x-testing locale/x-testing -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf Thu Sep 20 10:01:39 2012 +0200 -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ langpack-x-testing@tests.mozilla.org -+ 8 -+ 1.0 -+ -+ -+ Language Pack x-testing -+ -+ -+ -+ xpcshell@tests.mozilla.org -+ 1 -+ 2 -+ -+ -+ -+ -+ -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js Thu Sep 20 10:01:39 2012 +0200 -@@ -0,0 +1,247 @@ -+/* Any copyright is dedicated to the Public Domain. -+ * http://creativecommons.org/publicdomain/zero/1.0/ -+ */ -+ -+// This verifies that language packs can be used without restarts. -+Components.utils.import("resource://gre/modules/Services.jsm"); -+ -+// Enable loading extensions from the user scopes -+Services.prefs.setIntPref("extensions.enabledScopes", -+ AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER); -+ -+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); -+ -+const profileDir = gProfD.clone(); -+profileDir.append("extensions"); -+const userExtDir = gProfD.clone(); -+userExtDir.append("extensions2"); -+userExtDir.append(gAppInfo.ID); -+registerDirectory("XREUSysExt", userExtDir.parent); -+ -+var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"] -+ .getService(Components.interfaces.nsIXULChromeRegistry); -+ -+function do_check_locale_not_registered(provider) { -+ let didThrow = false; -+ try { -+ chrome.getSelectedLocale(provider); -+ } catch (e) { -+ didThrow = true; -+ } -+ do_check_true(didThrow); -+} -+ -+function run_test() { -+ do_test_pending(); -+ -+ startupManager(); -+ -+ run_test_1(); -+} -+ -+// Tests that installing doesn't require a restart -+function run_test_1() { -+ prepare_test({ }, [ -+ "onNewInstall" -+ ]); -+ -+ AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) { -+ ensure_test_completed(); -+ -+ do_check_neq(install, null); -+ do_check_eq(install.type, "locale"); -+ do_check_eq(install.version, "1.0"); -+ do_check_eq(install.name, "Language Pack x-testing"); -+ do_check_eq(install.state, AddonManager.STATE_DOWNLOADED); -+ do_check_true(install.addon.hasResource("install.rdf")); -+ do_check_false(install.addon.hasResource("bootstrap.js")); -+ do_check_eq(install.addon.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_INSTALL, 0); -+ -+ let addon = install.addon; -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onInstalling", false], -+ "onInstalled" -+ ] -+ }, [ -+ "onInstallStarted", -+ "onInstallEnded", -+ ], function() { -+ do_check_true(addon.hasResource("install.rdf")); -+ check_test_1(); -+ }); -+ install.install(); -+ }); -+} -+ -+function check_test_1() { -+ AddonManager.getAllInstalls(function(installs) { -+ // There should be no active installs now since the install completed and -+ // doesn't require a restart. -+ do_check_eq(installs.length, 0); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_false(b1.userDisabled); -+ do_check_true(b1.isActive); -+ // check chrome reg that language pack is registered -+ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); -+ do_check_true(b1.hasResource("install.rdf")); -+ do_check_false(b1.hasResource("bootstrap.js")); -+ -+ let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org"); -+ -+ AddonManager.getAddonsWithOperationsByTypes(null, function(list) { -+ do_check_eq(list.length, 0); -+ -+ run_test_2(); -+ }); -+ }); -+ }); -+} -+ -+// Tests that disabling doesn't require a restart -+function run_test_2() { -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onDisabling", false], -+ "onDisabled" -+ ] -+ }); -+ -+ do_check_eq(b1.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_DISABLE, 0); -+ b1.userDisabled = true; -+ ensure_test_completed(); -+ -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_true(b1.userDisabled); -+ do_check_false(b1.isActive); -+ // check chrome reg that language pack is not registered -+ do_check_locale_not_registered("test-langpack"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { -+ do_check_neq(newb1, null); -+ do_check_eq(newb1.version, "1.0"); -+ do_check_false(newb1.appDisabled); -+ do_check_true(newb1.userDisabled); -+ do_check_false(newb1.isActive); -+ -+ run_test_3(); -+ }); -+ }); -+} -+ -+// Test that restarting doesn't accidentally re-enable -+function run_test_3() { -+ shutdownManager(); -+ startupManager(false); -+ // check chrome reg that language pack is not registered -+ do_check_locale_not_registered("test-langpack"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_true(b1.userDisabled); -+ do_check_false(b1.isActive); -+ -+ run_test_4(); -+ }); -+} -+ -+// Tests that enabling doesn't require a restart -+function run_test_4() { -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onEnabling", false], -+ "onEnabled" -+ ] -+ }); -+ -+ do_check_eq(b1.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_ENABLE, 0); -+ b1.userDisabled = false; -+ ensure_test_completed(); -+ -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_false(b1.userDisabled); -+ do_check_true(b1.isActive); -+ // check chrome reg that language pack is registered -+ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { -+ do_check_neq(newb1, null); -+ do_check_eq(newb1.version, "1.0"); -+ do_check_false(newb1.appDisabled); -+ do_check_false(newb1.userDisabled); -+ do_check_true(newb1.isActive); -+ -+ run_test_5(); -+ }); -+ }); -+} -+ -+// Tests that a restart shuts down and restarts the add-on -+function run_test_5() { -+ shutdownManager(); -+ startupManager(false); -+ // check chrome reg that language pack is registered -+ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_false(b1.userDisabled); -+ do_check_true(b1.isActive); -+ do_check_false(isExtensionInAddonsList(profileDir, b1.id)); -+ -+ run_test_7(); -+ }); -+} -+ -+// Tests that uninstalling doesn't require a restart -+function run_test_7() { -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onUninstalling", false], -+ "onUninstalled" -+ ] -+ }); -+ -+ do_check_eq(b1.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0); -+ b1.uninstall(); -+ -+ check_test_7(); -+ }); -+} -+ -+function check_test_7() { -+ ensure_test_completed(); -+ // check chrome reg that language pack is not registered -+ do_check_locale_not_registered("test-langpack"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_eq(b1, null); -+ -+ restartManager(); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { -+ do_check_eq(newb1, null); -+ -+ do_test_finished(); -+ }); -+ }); -+} -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini ---- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini Wed Sep 26 13:08:50 2012 +0200 -+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini Thu Sep 20 10:01:39 2012 +0200 -@@ -139,6 +139,7 @@ - [test_corrupt_strictcompat.js] - [test_db_sanity.js] - [test_dictionary.js] -+[test_langpack.js] - [test_disable.js] - [test_distribution.js] - [test_dss.js] diff --git a/libre/iceweasel-libre/firefox.install b/libre/iceweasel-libre/firefox.install deleted file mode 100644 index 1a1f4b16b..000000000 --- a/libre/iceweasel-libre/firefox.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/libre/iceweasel-libre/gcc47.patch b/libre/iceweasel-libre/gcc47.patch deleted file mode 100644 index 829d59510..000000000 --- a/libre/iceweasel-libre/gcc47.patch +++ /dev/null @@ -1,75 +0,0 @@ - -# HG changeset patch -# User Martin Stránský -# Date 1328886461 -3600 -# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 -# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 -Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin - -diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc ---- a/ipc/chromium/src/base/file_util_linux.cc -+++ b/ipc/chromium/src/base/file_util_linux.cc -@@ -1,15 +1,18 @@ - // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - - #include "base/file_util.h" - - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - #include - - #include "base/eintr_wrapper.h" - #include "base/file_path.h" - #include "base/string_util.h" - -diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc ---- a/ipc/chromium/src/base/message_pump_libevent.cc -+++ b/ipc/chromium/src/base/message_pump_libevent.cc -@@ -1,16 +1,19 @@ - // Copyright (c) 2008 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - - #include "base/message_pump_libevent.h" - - #include - #include -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include "eintr_wrapper.h" - #include "base/logging.h" - #include "base/scoped_nsautorelease_pool.h" - #include "base/scoped_ptr.h" - #include "base/time.h" - #include "third_party/libevent/event.h" - -diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc ---- a/ipc/chromium/src/base/time_posix.cc -+++ b/ipc/chromium/src/base/time_posix.cc -@@ -8,16 +8,19 @@ - #include - #endif - #include - #ifdef ANDROID - #include - #else - #include - #endif -+#if defined(ANDROID) || defined(OS_POSIX) -+#include -+#endif - - #include - - #include "base/basictypes.h" - #include "base/logging.h" - - namespace base { diff --git a/libre/iceweasel-libre/region.properties b/libre/iceweasel-libre/region.properties deleted file mode 100644 index 2e980987e..000000000 --- a/libre/iceweasel-libre/region.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Default search engine -browser.search.defaultenginename=Duck Duck Go (SSL) - -# Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Duck Duck Go (SSL) -browser.search.order.2=Duck Duck Go (Lite) - - -# Keyword URL (for location bar searches) -keyword.URL=https://duckduckgo.com/?q= - -# URL for site-specific search engines -# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site -# to be searched and the user's search query. Place them in the appropriate location -# for your locale's URL but do not translate them. -browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} - -# increment this number when anything gets changed in the list below. This will -# cause Firefox to re-read these prefs and inject any new handlers into the -# profile database. Note that "new" is defined as "has a different URL"; this -# means that it's not possible to update the name of existing handler, so -# don't make any spelling errors here. -#gecko.handlerService.defaultHandlersVersion=3 diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch deleted file mode 100644 index e3b8e9376..000000000 --- a/libre/iceweasel-libre/xulrunner-copy-stub.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 -+++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 -@@ -257,7 +257,7 @@ - else - ifdef LIBXUL_SDK - libs:: -- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) -+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) - endif - endif - -- cgit v1.2.3-54-g00ecf