# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1358374238 -3600
# Node ID dfcb6d8fcf5ac9af46390ea998b28fec39added2
# Parent  9d39369e1b4c766b5f706809d208e35a8d22763e# Parent  127a017193566d78fd67d302e384c16800676273
merge changes from release branch

diff -r 9d39369e1b4c -r dfcb6d8fcf5a MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Jan 16 23:09:49 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Jan 16 23:10:38 2013 +0100
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+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)
+
+-------------------------------------------------------------------
+Sat Jan 12 17:25:11 UTC 2013 - schwab@linux-m68k.org
+
+- Fix WebRTC to build on powerpc
+
+-------------------------------------------------------------------
 Sun Jan  6 21:54:18 UTC 2013 - wr@rosenauer.org
 
 - update to Firefox 18.0 (bnc#796895)
diff -r 9d39369e1b4c -r dfcb6d8fcf5a MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Jan 16 23:09:49 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Jan 16 23:10:38 2013 +0100
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013010500
+%define         releasedate 2013011600
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -98,7 +98,7 @@
 Patch14:        mozilla-ppc.patch
 Patch15:        mozilla-gstreamer-760140.patch
 Patch17:        mozilla-libproxy-compat.patch
-Patch18:        mozilla-backout-677092.patch
+Patch18:        mozilla-webrtc-ppc.patch
 # Firefox/browser
 Patch30:        firefox-browser-css.patch
 Patch31:        firefox-kde.patch
diff -r 9d39369e1b4c -r dfcb6d8fcf5a MozillaFirefox/mozilla-backout-677092.patch
--- a/MozillaFirefox/mozilla-backout-677092.patch	Wed Jan 16 23:09:49 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-backout-677092.patch
\ No newline at end of file
diff -r 9d39369e1b4c -r dfcb6d8fcf5a MozillaFirefox/mozilla-webrtc-ppc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-webrtc-ppc.patch	Wed Jan 16 23:10:38 2013 +0100
@@ -0,0 +1,1 @@
+../mozilla-webrtc-ppc.patch
\ No newline at end of file
diff -r 9d39369e1b4c -r dfcb6d8fcf5a mozilla-backout-677092.patch
--- a/mozilla-backout-677092.patch	Wed Jan 16 23:09:49 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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"
diff -r 9d39369e1b4c -r dfcb6d8fcf5a mozilla-webrtc-ppc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-webrtc-ppc.patch	Wed Jan 16 23:10:38 2013 +0100
@@ -0,0 +1,102 @@
+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) \
+-  $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \
+   $(call EXPAND_LIBNAME_PATH,voice_engine_core,$(DEPTH)/media/webrtc/trunk/src/voice_engine/voice_engine_voice_engine_core) \
+   $(call EXPAND_LIBNAME_PATH,audio_conference_mixer,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_conference_mixer) \
+   $(call EXPAND_LIBNAME_PATH,audio_device,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_device) \
+   $(call EXPAND_LIBNAME_PATH,audio_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_processing) \
+   $(call EXPAND_LIBNAME_PATH,aec,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec) \
+-  $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \
+   $(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) \
+   $(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)
+ 
++# if we're on an intel arch, we want SSE2 optimizations
++ifneq (,$(INTEL_ARCHITECTURE))
++WEBRTC_LIBS += \
++  $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \
++  $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \
++  $(NULL)
++endif
++
+ # If you enable one of these codecs in webrtc_config.gypi, you'll need to re-add the
+ # relevant library from this list:
+ #
+ #  $(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)',
++      'dependencies': [
++        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
++      ],
+       'include_dirs': [
+         'include',
+       ],
+       '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
++#elif defined(__powerpc__)
++#if defined(__powerpc64__)
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
++#define WEBRTC_ARCH_BIG_ENDIAN
++#define WEBRTC_BIG_ENDIAN
+ #else
+ #error Please add support for your architecture in typedefs.h
+ #endif
+ 
+ #if defined(__SSE2__) || defined(_MSC_VER)
+ #define WEBRTC_USE_SSE2
+ #endif
+ 
diff -r 9d39369e1b4c -r dfcb6d8fcf5a series
--- a/series	Wed Jan 16 23:09:49 2013 +0100
+++ b/series	Wed Jan 16 23:10:38 2013 +0100
@@ -18,7 +18,7 @@
 mozilla-ppc.patch
 mozilla-idldir.patch
 mozilla-libproxy-compat.patch
-mozilla-backout-677092.patch
+mozilla-webrtc-ppc.patch
 #mozilla-disable-neon-option.patch
 
 # Firefox patches