1
0

- update to Firefox 18.0.1

* blocklist updates
  * backed out bmo#677092 (removed patch)
  * fixed problems involving HTTP proxy transactions

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=315
This commit is contained in:
Wolfgang Rosenauer 2013-01-20 09:36:34 +00:00 committed by Git OBS Bridge
parent 29bd40e39a
commit 1ad53d1168
10 changed files with 71 additions and 319 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 16 20:51:55 UTC 2013 - wr@rosenauer.org
- update to Firefox 18.0.1
* blocklist updates
* backed out bmo#677092 (removed patch)
* fixed problems involving HTTP proxy transactions
-------------------------------------------------------------------
Sat Jan 12 17:25:11 UTC 2013 - schwab@linux-m68k.org

View File

@ -18,7 +18,7 @@
%define major 18
%define mainver %major.0
%define mainver %major.0.1
%define update_channel release
Name: MozillaFirefox
@ -54,7 +54,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
%endif
Version: %{mainver}
Release: 0
%define releasedate 2013010500
%define releasedate 2013011600
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@ -100,8 +100,7 @@ Patch14: mozilla-ppc.patch
Patch15: mozilla-gstreamer-760140.patch
Patch16: mozilla-webrtc.patch
Patch17: mozilla-libproxy-compat.patch
Patch18: mozilla-backout-677092.patch
Patch19: mozilla-webrtc-ppc.patch
Patch18: mozilla-webrtc-ppc.patch
# Firefox/browser
Patch30: firefox-browser-css.patch
Patch31: firefox-kde.patch
@ -238,7 +237,6 @@ cd $RPM_BUILD_DIR/mozilla
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
#
%patch30 -p1
%if %suse_version >= 1110

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc2fcd2cdbe11b51361f888f50b80837ae01c06a3916ad1f7fff1f922fcf21e0
oid sha256:a34ed619ad391e6f03dbfd85d41befe975b1dce6312793faca8d5c0a171badf8
size 29924

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d9421b89267bf10d5975794d54dd07924d7b55110cd49a7b5b84dad8751e4be
size 97931811

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22e4edfaddcaf69e36f2ad407b13199967b80b560f132334551ff9f6ba4b2ce9
size 97967804

3
l10n-18.0.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa73d51c42bd178b02b02729be9ec0272e0491547bc739b27866d5ee7fa41f58
size 52331601

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe0078528a121e861b2e5eb80adf76fbf3688a3ca59e6925c22aa423c6835c0c
size 52439072

View File

@ -1,296 +0,0 @@
# HG changeset patch
# Parent 297b3a7802b2488cca8f2e6febc77e9dbf7f16e0
# User Wolfgang Rosenauer <wr@rosenauer.org>
Bug 818468 - Langpacks bundled in distribution/extensions are registered but disabled even if shown enabled
(backing out Bug 677092 - Make language packs restartless by default)
diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -757,18 +757,18 @@ function loadManifestFromRDF(aUri, aStre
if (addon.optionsType &&
addon.optionsType != AddonManager.OPTIONS_TYPE_DIALOG &&
addon.optionsType != AddonManager.OPTIONS_TYPE_INLINE &&
addon.optionsType != AddonManager.OPTIONS_TYPE_TAB) {
throw new Error("Install manifest specifies unknown type: " + addon.optionsType);
}
}
else {
- // spell check dictionaries and language packs never require a restart
- if (addon.type == "dictionary" || addon.type == "locale")
+ // spell check dictionaries never require a restart
+ if (addon.type == "dictionary")
addon.bootstrap = true;
// Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For
// all other types they are silently ignored
addon.optionsURL = null;
addon.optionsType = null;
addon.aboutURL = null;
@@ -3712,21 +3712,16 @@ var XPIProvider = {
// Never call any bootstrap methods in safe mode
if (Services.appinfo.inSafeMode)
return;
if (aMethod == "startup")
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);
if (!(aMethod in this.bootstrapScopes[aId])) {
WARN("Add-on " + aId + " is missing bootstrap method " + aMethod);
return;
}
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js
--- a/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_dictionary.js
@@ -4,19 +4,16 @@
// This verifies that bootstrappable add-ons 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);
-// The test extension uses an insecure update url.
-Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
-
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);
@@ -98,17 +95,16 @@ var HunspellEngine = {
}
};
function run_test() {
do_test_pending();
// Create and configure the HTTP server.
testserver = new HttpServer();
- testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
startupManager();
run_test_1();
}
@@ -563,17 +559,17 @@ function check_test_23() {
AddonManager.getAddonsWithOperationsByTypes(null, function(list) {
do_check_eq(list.length, 0);
restartManager();
AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) {
b1.uninstall();
restartManager();
- run_test_25();
+ testserver.stop(run_test_25);
});
});
});
});
}
// Tests that updating from a bootstrappable add-on to a normal add-on calls
// the uninstall method
@@ -631,160 +627,15 @@ function run_test_26() {
AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) {
do_check_neq(b1, null);
do_check_eq(b1.version, "1.0");
do_check_true(b1.isActive);
do_check_eq(b1.pendingOperations, AddonManager.PENDING_NONE);
HunspellEngine.deactivate();
- b1.uninstall();
- restartManager();
- run_test_27();
+
+ do_test_finished();
});
});
});
}
-// Tests that an update check from a normal add-on to a bootstrappable add-on works
-function run_test_27() {
- writeInstallRDFForExtension({
- id: "ab-CD@dictionaries.addons.mozilla.org",
- version: "1.0",
- updateURL: "http://localhost:4444/data/test_dictionary.rdf",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "1",
- maxVersion: "1"
- }],
- name: "Test Dictionary",
- }, profileDir);
- restartManager();
-
- prepare_test({
- "ab-CD@dictionaries.addons.mozilla.org": [
- "onInstalling"
- ]
- }, [
- "onNewInstall",
- "onDownloadStarted",
- "onDownloadEnded",
- "onInstallStarted",
- "onInstallEnded"
- ], check_test_27);
-
- AddonManagerPrivate.backgroundUpdateCheck();
-}
-
-function check_test_27(install) {
- do_check_eq(install.existingAddon.pendingUpgrade.install, install);
-
- restartManager();
- AddonManager.getAddonByID("ab-CD@dictionaries.addons.mozilla.org", function(b1) {
- do_check_neq(b1, null);
- do_check_eq(b1.version, "2.0");
- do_check_eq(b1.type, "dictionary");
- b1.uninstall();
- restartManager();
-
- run_test_28();
- });
-}
-
-// Tests that an update check from a bootstrappable add-on to a normal add-on works
-function run_test_28() {
- writeInstallRDFForExtension({
- id: "ef@dictionaries.addons.mozilla.org",
- version: "1.0",
- type: "64",
- updateURL: "http://localhost:4444/data/test_dictionary.rdf",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "1",
- maxVersion: "1"
- }],
- name: "Test Dictionary ef",
- }, profileDir);
- restartManager();
-
- prepare_test({
- "ef@dictionaries.addons.mozilla.org": [
- "onInstalling"
- ]
- }, [
- "onNewInstall",
- "onDownloadStarted",
- "onDownloadEnded",
- "onInstallStarted",
- "onInstallEnded"
- ], check_test_28);
-
- AddonManagerPrivate.backgroundUpdateCheck();
-}
-
-function check_test_28(install) {
- do_check_eq(install.existingAddon.pendingUpgrade.install, install);
-
- restartManager();
- AddonManager.getAddonByID("ef@dictionaries.addons.mozilla.org", function(b2) {
- do_check_neq(b2, null);
- do_check_eq(b2.version, "2.0");
- do_check_eq(b2.type, "extension");
- b2.uninstall();
- restartManager();
-
- run_test_29();
- });
-}
-
-// Tests that an update check from a bootstrappable add-on to a bootstrappable add-on works
-function run_test_29() {
- writeInstallRDFForExtension({
- id: "gh@dictionaries.addons.mozilla.org",
- version: "1.0",
- type: "64",
- updateURL: "http://localhost:4444/data/test_dictionary.rdf",
- targetApplications: [{
- id: "xpcshell@tests.mozilla.org",
- minVersion: "1",
- maxVersion: "1"
- }],
- name: "Test Dictionary gh",
- }, profileDir);
- restartManager();
-
- prepare_test({
- "gh@dictionaries.addons.mozilla.org": [
- ["onInstalling", false /* = no restart */],
- ["onInstalled", false]
- ]
- }, [
- "onNewInstall",
- "onDownloadStarted",
- "onDownloadEnded",
- "onInstallStarted",
- "onInstallEnded"
- ], check_test_29);
-
- AddonManagerPrivate.backgroundUpdateCheck();
-}
-
-function check_test_29(install) {
- AddonManager.getAddonByID("gh@dictionaries.addons.mozilla.org", function(b2) {
- do_check_neq(b2, null);
- do_check_eq(b2.version, "2.0");
- do_check_eq(b2.type, "dictionary");
-
- prepare_test({
- "gh@dictionaries.addons.mozilla.org": [
- ["onUninstalling", false],
- ["onUninstalled", false],
- ]
- }, [
- ], finish_test_29);
-
- b2.uninstall();
- });
-}
-
-function finish_test_29() {
- testserver.stop(do_test_finished);
-}
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -136,17 +136,16 @@ fail-if = os == "android"
[test_cacheflush.js]
[test_checkcompatibility.js]
[test_ChromeManifestParser.js]
[test_compatoverrides.js]
[test_corrupt.js]
[test_corrupt_strictcompat.js]
[test_db_sanity.js]
[test_dictionary.js]
-[test_langpack.js]
[test_disable.js]
[test_distribution.js]
[test_dss.js]
# Bug 676992: test consistently fails on Android
fail-if = os == "android"
[test_duplicateplugins.js]
# Bug 676992: test consistently hangs on Android
skip-if = os == "android"

View File

@ -1,6 +1,18 @@
--- mozilla/media/webrtc/shared_libs.mk
+++ mozilla/media/webrtc/shared_libs.mk
@@ -28,13 +28,11 @@ WEBRTC_LIBS = \
Submitted-by: schwab@@linux-m68k.org
Subject: fix PPC build
References: (not delivered with the patch but apparently mix of:)
Bug 750869 - Support WebRTC for Android in our build system (TM:20)
Bug 814693 - Build failure on Debian powerpc (TM:20)
diff --git a/media/webrtc/shared_libs.mk b/media/webrtc/shared_libs.mk
--- a/media/webrtc/shared_libs.mk
+++ b/media/webrtc/shared_libs.mk
@@ -23,33 +23,39 @@ WEBRTC_LIBS = \
$(call EXPAND_LIBNAME_PATH,video_render_module,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_render_module) \
$(call EXPAND_LIBNAME_PATH,video_engine_core,$(DEPTH)/media/webrtc/trunk/src/video_engine/video_engine_video_engine_core) \
$(call EXPAND_LIBNAME_PATH,media_file,$(DEPTH)/media/webrtc/trunk/src/modules/modules_media_file) \
$(call EXPAND_LIBNAME_PATH,rtp_rtcp,$(DEPTH)/media/webrtc/trunk/src/modules/modules_rtp_rtcp) \
$(call EXPAND_LIBNAME_PATH,udp_transport,$(DEPTH)/media/webrtc/trunk/src/modules/modules_udp_transport) \
$(call EXPAND_LIBNAME_PATH,bitrate_controller,$(DEPTH)/media/webrtc/trunk/src/modules/modules_bitrate_controller) \
$(call EXPAND_LIBNAME_PATH,remote_bitrate_estimator,$(DEPTH)/media/webrtc/trunk/src/modules/modules_remote_bitrate_estimator) \
$(call EXPAND_LIBNAME_PATH,video_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing) \
@ -14,7 +26,10 @@
$(call EXPAND_LIBNAME_PATH,apm_util,$(DEPTH)/media/webrtc/trunk/src/modules/modules_apm_util) \
$(call EXPAND_LIBNAME_PATH,aecm,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aecm) \
$(call EXPAND_LIBNAME_PATH,agc,$(DEPTH)/media/webrtc/trunk/src/modules/modules_agc) \
@@ -45,6 +43,14 @@ WEBRTC_LIBS = \
$(call EXPAND_LIBNAME_PATH,ns,$(DEPTH)/media/webrtc/trunk/src/modules/modules_ns) \
$(call EXPAND_LIBNAME_PATH,yuv,$(DEPTH)/media/webrtc/trunk/third_party/libyuv/libyuv_libyuv) \
$(call EXPAND_LIBNAME_PATH,webrtc_jpeg,$(DEPTH)/media/webrtc/trunk/src/common_video/common_video_webrtc_jpeg) \
$(call EXPAND_LIBNAME_PATH,nicer,$(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer) \
$(call EXPAND_LIBNAME_PATH,nrappkit,$(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit) \
$(NULL)
@ -29,9 +44,20 @@
# If you enable one of these codecs in webrtc_config.gypi, you'll need to re-add the
# relevant library from this list:
#
--- mozilla/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
+++ mozilla/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -11,6 +11,9 @@
# $(call EXPAND_LIBNAME_PATH,G722,$(DEPTH)/media/webrtc/trunk/src/modules/modules_G722) \
# $(call EXPAND_LIBNAME_PATH,iLBC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iLBC) \
# $(call EXPAND_LIBNAME_PATH,iSAC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSAC) \
# $(call EXPAND_LIBNAME_PATH,iSACFix,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSACFix) \
#
diff --git a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
--- a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
+++ b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -6,16 +6,19 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'targets': [
{
'target_name': 'PCM16B',
'type': '<(library)',
@ -41,9 +67,20 @@
'include_dirs': [
'include',
],
--- mozilla/media/webrtc/trunk/src/typedefs.h
+++ mozilla/media/webrtc/trunk/src/typedefs.h
@@ -57,6 +57,14 @@
'direct_dependent_settings': {
'include_dirs': [
'include',
],
},
diff --git a/media/webrtc/trunk/src/typedefs.h b/media/webrtc/trunk/src/typedefs.h
--- a/media/webrtc/trunk/src/typedefs.h
+++ b/media/webrtc/trunk/src/typedefs.h
@@ -52,16 +52,24 @@
//#define WEBRTC_ARCH_ARMEL
#define WEBRTC_ARCH_32_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
#define WEBRTC_LITTLE_ENDIAN
#elif defined(__MIPSEL__)
#define WEBRTC_ARCH_32_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
#define WEBRTC_LITTLE_ENDIAN
@ -58,3 +95,8 @@
#else
#error Please add support for your architecture in typedefs.h
#endif
#if defined(__SSE2__) || defined(_MSC_VER)
#define WEBRTC_USE_SSE2
#endif

View File

@ -1,2 +1,2 @@
REV=8efe34fa2289
REV=eecd28b7ba09
REPO=http://hg.mozilla.org/releases/mozilla-release