--- a/MozillaFirefox/MozillaFirefox.changes Wed Oct 24 10:25:01 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Fri Oct 26 13:01:33 2012 +0200
@@ -1,12 +1,16 @@
-------------------------------------------------------------------
-Mon Oct 15 14:15:53 UTC 2012 - wr@rosenauer.org
-
-- update to Aurora 18 (20121015)
-
--------------------------------------------------------------------
-Mon Oct 15 14:07:12 UTC 2012 - wr@rosenauer.org
-
-- update to Firefox 17.0b1
+Fri Oct 26 10:59:41 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 18 (20121025)
+ * requires NSS 3.14
+- enable system NSPR
+- ported patches
+
+-------------------------------------------------------------------
+Wed Oct 24 06:24:39 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 17.0b3
+- rebased patches
- use internal NSPR for now (bmo#776877)
-------------------------------------------------------------------
--- a/MozillaFirefox/MozillaFirefox.spec Wed Oct 24 10:25:01 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Fri Oct 26 13:01:33 2012 +0200
@@ -44,8 +44,8 @@
%else
BuildRequires: wireless-tools
%endif
-BuildRequires: mozilla-nspr-devel >= 4.9.2
-BuildRequires: mozilla-nss-devel >= 3.13.6
+BuildRequires: mozilla-nspr-devel >= 4.9.3
+BuildRequires: mozilla-nss-devel >= 3.14
BuildRequires: nss-shared-helper-devel
%if %suse_version > 1140
BuildRequires: pkgconfig(gstreamer-0.10)
@@ -54,7 +54,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2012101500
+%define releasedate 2012102500
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -98,6 +98,7 @@
Patch13: mozilla-gstreamer.patch
Patch14: mozilla-ppc.patch
Patch15: mozilla-gstreamer-760140.patch
+Patch16: mozilla-webrtc.patch
# Firefox/browser
Patch30: firefox-browser-css.patch
Patch31: firefox-kde.patch
@@ -231,6 +232,7 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
#
%patch30 -p1
%if %suse_version >= 1110
@@ -280,7 +282,7 @@
ac_add_options --sysconfdir=%{_sysconfdir}
ac_add_options --mandir=%{_mandir}
ac_add_options --includedir=%{_includedir}
-#ac_add_options --with-system-nspr
+ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
#ac_add_options --with-system-jpeg # libjpeg-turbo is used internally
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-webrtc.patch Fri Oct 26 13:01:33 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-webrtc.patch
\ No newline at end of file
--- a/firefox-branded-icons.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/firefox-branded-icons.patch Fri Oct 26 13:01:33 2012 +0200
@@ -1,27 +1,27 @@
# HG changeset patch
-# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb
+# Parent ab9210b3779914924d12de5a3952d4cc52cd9d78
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
-@@ -127,16 +127,21 @@ endif
+@@ -133,16 +133,21 @@ endif
endif #} LIBXUL_SDK
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
- $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
- $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
- $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
- $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default
+ifdef MOZ_OFFICIAL_BRANDING
-+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default
-+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default
-+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default
++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default
++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default
++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default
+endif
endif
libs:: $(srcdir)/profile/prefs.js
- $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
+ $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
ifndef LIBXUL_SDK
# channel-prefs.js is handled separate from other prefs due to bug 756325
@@ -29,7 +29,7 @@
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
-@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \
+@@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \
firefox.icns \
disk.icns \
document.icns \
@@ -54,7 +54,7 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -496,18 +496,21 @@
+@@ -541,18 +541,21 @@
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
#ifdef SHIP_FEEDBACK
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
--- a/firefox-kde.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/firefox-kde.patch Fri Oct 26 13:01:33 2012 +0200
@@ -1270,12 +1270,12 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -35,16 +35,18 @@ browser.jar:
- content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
- content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png)
- content/browser/abouthome/noise.png (content/abouthome/noise.png)
+@@ -50,16 +50,18 @@ browser.jar:
+ content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png)
+ #endif
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
+ content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
* content/browser/browser.css (content/browser.css)
* content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)
@@ -1286,9 +1286,9 @@
content/browser/newtab/newTab.xul (content/newtab/newTab.xul)
* content/browser/newtab/newTab.js (content/newtab/newTab.js)
content/browser/newtab/newTab.css (content/newtab/newTab.css)
+ content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
* content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
- content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1370,12 +1370,12 @@
#ifdef HAVE_SHELL_SERVICE
this.updateSetDefaultBrowser();
#ifdef XP_WIN
- let shellSvc = getShellService();
// In Windows 8 we launch the control panel since it's the only
// way to get all file type association prefs. So we don't know
// when the user will select the default. We refresh here periodically
- // in case the default changes.
-@@ -737,14 +743,25 @@ var gAdvancedPane = {
+ // in case the default changes. On other Windows OS's defaults can also
+ // be set while the prefs are open.
+@@ -715,14 +721,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser.
*/
setDefaultBrowser: function()
@@ -1837,7 +1837,7 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -559,18 +559,20 @@
+@@ -572,18 +572,20 @@
@BINPATH@/@PREF_DIR@/services-sync.js
#endif
@BINPATH@/greprefs.js
--- a/mozilla-gstreamer-760140.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-gstreamer-760140.patch Fri Oct 26 13:01:33 2012 +0200
@@ -4,7 +4,7 @@
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
-@@ -137,16 +137,19 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_
+@@ -147,16 +147,19 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_
#include "xpcprivate.h" // nsXPConnect
#include "nsScriptSecurityManager.h"
#include "nsIChannelPolicy.h"
@@ -24,7 +24,7 @@
#include "mozilla/Base64.h"
#include "mozilla/Preferences.h"
#include "nsDOMMutationObserver.h"
-@@ -6580,26 +6583,23 @@ nsContentUtils::FindInternalContentViewe
+@@ -6706,26 +6709,23 @@ nsContentUtils::FindInternalContentViewe
}
return docFactory.forget();
}
@@ -60,7 +60,7 @@
diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
-@@ -256,17 +256,19 @@ public:
+@@ -263,17 +263,19 @@ public:
void UpdateMediaSize(nsIntSize size);
// Returns the CanPlayStatus indicating if we can handle this
@@ -81,7 +81,7 @@
// Returns true if we should handle this MIME type when it appears
// as an <object> or as a toplevel page. If, in practice, our support
// for the type is more limited than appears in the wild, we should return
-@@ -296,20 +298,17 @@ public:
+@@ -303,20 +305,17 @@ public:
#ifdef MOZ_WEBM
static bool IsWebMEnabled();
static bool IsWebMType(const nsACString& aType);
@@ -97,16 +97,17 @@
+ static bool IsGStreamerEnabled();
#endif
- #ifdef MOZ_MEDIA_PLUGINS
- static bool IsMediaPluginsEnabled();
- static bool IsMediaPluginsType(const nsACString& aType);
+ #ifdef MOZ_WIDGET_GONK
+ static bool IsOmxEnabled();
+ static bool IsOmxSupportedType(const nsACString& aType);
+ static const char gOmxTypes[5][16];
+ static char const *const gH264Codecs[7];
#endif
-
- /**
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2112,52 +2112,20 @@ nsHTMLMediaElement::IsWebMType(const nsA
+@@ -2128,55 +2128,32 @@ nsHTMLMediaElement::IsWebMType(const nsA
+ return true;
}
}
@@ -114,6 +115,19 @@
}
#endif
+-#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
++#ifdef MOZ_WIDGET_GONK
+ char const *const nsHTMLMediaElement::gH264Codecs[7] = {
+ "avc1.42E01E",
+ "avc1.42001E",
+ "avc1.58A01E",
+ "avc1.4D401E",
+ "avc1.64001E",
+ "mp4a.40.2",
+ nullptr
+ };
+ #endif
+
#ifdef MOZ_GSTREAMER
-const char nsHTMLMediaElement::gH264Types[3][16] = {
- "video/mp4",
@@ -121,19 +135,9 @@
- "video/quicktime",
-};
-
--char const *const nsHTMLMediaElement::gH264Codecs[7] = {
-- "avc1.42E01E",
-- "avc1.42001E",
-- "avc1.58A01E",
-- "avc1.4D401E",
-- "avc1.64001E",
-- "mp4a.40.2",
-- nullptr
--};
--
- bool
+-bool
-nsHTMLMediaElement::IsH264Enabled()
-+nsHTMLMediaElement::IsGStreamerEnabled()
++bool nsHTMLMediaElement::IsGStreamerEnabled()
{
- return Preferences::GetBool("media.h264.enabled");
-}
@@ -156,13 +160,13 @@
}
#endif
- #ifdef MOZ_MEDIA_PLUGINS
- bool
- nsHTMLMediaElement::IsMediaPluginsEnabled()
- {
- return Preferences::GetBool("media.plugins.enabled");
-@@ -2180,18 +2148,22 @@ nsHTMLMediaElement::IsMediaPluginsType(c
- }
+ #ifdef MOZ_WIDGET_GONK
+ const char nsHTMLMediaElement::gOmxTypes[5][16] = {
+ "audio/mpeg",
+ "audio/mp4",
+ "video/mp4",
+@@ -2262,18 +2239,22 @@ nsHTMLMediaElement::IsDASHMPDType(const
+
return false;
}
#endif
@@ -185,9 +189,9 @@
#endif
#ifdef MOZ_OGG
if (IsOggType(nsDependentCString(aMIMEType))) {
-@@ -2208,20 +2180,22 @@ nsHTMLMediaElement::CanHandleMediaType(c
- #ifdef MOZ_WEBM
- if (IsWebMType(nsDependentCString(aMIMEType))) {
+@@ -2297,20 +2278,22 @@ nsHTMLMediaElement::CanHandleMediaType(c
+ if (IsDASHMPDType(nsDependentCString(aMIMEType))) {
+ // DASH manifest uses WebM codecs only.
*aCodecList = gWebMCodecs;
return CANPLAY_YES;
}
@@ -205,14 +209,14 @@
+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs))
+ return CANPLAY_YES;
#endif
- #ifdef MOZ_MEDIA_PLUGINS
- if (IsMediaPluginsEnabled() && GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), aCodecList))
+ #ifdef MOZ_WIDGET_GONK
+ if (IsOmxSupportedType(nsDependentCString(aMIMEType))) {
+ *aCodecList = gH264Codecs;
return CANPLAY_MAYBE;
+ }
#endif
- return CANPLAY_NO;
- }
-
-@@ -2236,17 +2210,17 @@ bool nsHTMLMediaElement::ShouldHandleMed
+ #ifdef MOZ_MEDIA_PLUGINS
+@@ -2331,17 +2314,17 @@ bool nsHTMLMediaElement::ShouldHandleMed
if (IsOggType(nsDependentCString(aMIMEType)))
return true;
#endif
@@ -225,13 +229,13 @@
+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr))
return true;
#endif
- #ifdef MOZ_MEDIA_PLUGINS
- if (IsMediaPluginsEnabled() && GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), NULL))
+ #ifdef MOZ_WIDGET_GONK
+ if (IsOmxSupportedType(nsDependentCString(aMIMEType))) {
return true;
+ }
#endif
- // We should not return true for Wave types, since there are some
- // Wave codecs actually in use in the wild that we don't support, and
-@@ -2272,26 +2246,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA
+ #ifdef MOZ_MEDIA_PLUGINS
+@@ -2372,26 +2355,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA
{
nsContentTypeParser parser(aType);
nsAutoString mimeType;
@@ -268,8 +272,8 @@
// of the 'codecs' parameter
nsCharSeparatedTokenizer tokenizer(codecs, ',');
bool expectMoreTokens = false;
-@@ -2369,17 +2348,19 @@ nsHTMLMediaElement::CreateDecoder(const
- nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder();
+@@ -2486,17 +2474,19 @@ nsHTMLMediaElement::CreateDecoder(const
+ nsRefPtr<nsDASHDecoder> decoder = new nsDASHDecoder();
if (decoder->Init(this)) {
return decoder.forget();
}
@@ -548,22 +552,22 @@
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
-@@ -165,17 +165,17 @@ pref("media.opus.enabled", true);
- #endif
- #ifdef MOZ_WAVE
- pref("media.wave.enabled", true);
+@@ -164,17 +164,17 @@ pref("media.wave.enabled", true);
#endif
#ifdef MOZ_WEBM
pref("media.webm.enabled", true);
#endif
+ #ifdef MOZ_DASH
+ pref("media.dash.enabled", true);
+ #endif
#ifdef MOZ_GSTREAMER
-pref("media.h264.enabled", true);
+pref("media.gstreamer.enabled", true);
#endif
#ifdef MOZ_WEBRTC
pref("media.navigator.enabled", false);
+ pref("media.peerconnection.enabled", false);
+ pref("media.navigator.permission.disabled", false);
#else
#ifdef ANDROID
pref("media.navigator.enabled", true);
- #endif
- #endif
--- a/mozilla-gstreamer.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-gstreamer.patch Fri Oct 26 13:01:33 2012 +0200
@@ -1,12 +1,12 @@
# HG changeset patch
-# Parent e4b87e710b1a5f0bb7db058911bc163b4bf30227
+# Parent b6b96c933ed1acd86ee0201165f696a8c2ebd8eb
# User Wolfgang Rosenauer <wr@rosenauer.org>
No Bug - use GStreamer _only_ for MP4 (not WebM/OGG)
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2277,21 +2277,17 @@ nsHTMLMediaElement::CreateDecoder(const
+@@ -2437,21 +2437,17 @@ nsHTMLMediaElement::CreateDecoder(const
nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder();
if (decoder->Init(this)) {
return decoder.forget();
@@ -28,7 +28,7 @@
#ifdef MOZ_WAVE
if (IsWaveType(aType)) {
nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder();
-@@ -2305,21 +2301,17 @@ nsHTMLMediaElement::CreateDecoder(const
+@@ -2473,21 +2469,17 @@ nsHTMLMediaElement::CreateDecoder(const
nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType);
if (decoder->Init(this)) {
return decoder.forget();
@@ -48,5 +48,5 @@
}
#endif
- #ifdef MOZ_GSTREAMER
- if (IsH264Type(aType)) {
+ #ifdef MOZ_DASH
+ if (IsDASHMPDType(aType)) {
--- a/mozilla-kde.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-kde.patch Fri Oct 26 13:01:33 2012 +0200
@@ -82,7 +82,7 @@
bool hasMore;
@@ -921,17 +940,17 @@ static nsresult pref_LoadPrefsInDirList(
- nsCAutoString leaf;
+ nsAutoCString leaf;
path->GetNativeLeafName(leaf);
// Do we care if a file provided by this process fails to load?
@@ -159,7 +159,7 @@
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -35,16 +35,20 @@
+@@ -36,16 +36,20 @@
#ifdef XP_WIN
#include <shlobj.h>
@@ -180,7 +180,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2233,16 +2237,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2253,16 +2257,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -194,7 +194,7 @@
+ command.AppendElement( NS_LITERAL_CSTRING( "DOWNLOADFINISHED" ));
+ nsAutoString displayName;
+ GetDisplayName( displayName );
-+ command.AppendElement( nsCAutoString( ToNewUTF8String( displayName )));
++ command.AppendElement( nsAutoCString( ToNewUTF8String( displayName )));
+ nsKDEUtils::command( command );
+ } else {
+ // begin non-KDE block
@@ -206,7 +206,7 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2266,19 +2279,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2286,19 +2299,20 @@ nsDownload::SetState(DownloadState aStat
// If downloads are automatically removed per the user's
// retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and
@@ -231,7 +231,7 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -45,29 +45,33 @@ toolkit.jar:
+@@ -46,29 +46,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml)
@@ -2068,8 +2068,7 @@
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -13,16 +13,19 @@
- #include "prnetdb.h"
+@@ -14,16 +14,18 @@
#include "prenv.h"
#include "nsPrintfCString.h"
#include "nsNetUtil.h"
@@ -2077,9 +2076,9 @@
#include "nsIGSettingsService.h"
#include "nsInterfaceHashtable.h"
#include "mozilla/Attributes.h"
+ #include "nsIURI.h"
+#include "nsVoidArray.h"
+#include "nsKDEUtils.h"
-+
class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
public:
@@ -2088,7 +2087,7 @@
nsUnixSystemProxySettings() {}
nsresult Init();
-@@ -34,16 +37,17 @@ private:
+@@ -35,16 +37,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@@ -2102,31 +2101,31 @@
NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
- nsresult
- nsUnixSystemProxySettings::Init()
+ NS_IMETHODIMP
+ nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
{
- // If this is a GNOME session, load gconf and try to use its preferences.
-@@ -496,16 +500,19 @@ nsUnixSystemProxySettings::GetProxyForUR
- nsCAutoString host;
- rv = aURI->GetHost(host);
- NS_ENSURE_SUCCESS(rv, rv);
+ // dbus prevents us from being threadsafe, but this routine should not block anyhow
+@@ -499,16 +502,19 @@ nsUnixSystemProxySettings::GetProxyFromG
- int32_t port;
- rv = aURI->GetPort(&port);
- NS_ENSURE_SUCCESS(rv, rv);
-
-+ if( nsKDEUtils::kdeSupport())
-+ return GetProxyFromKDE(scheme, host, port, aResult);
+ nsresult
+ nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
+ const nsACString & aScheme,
+ const nsACString & aHost,
+ const int32_t aPort,
+ nsACString & aResult)
+ {
++ if( nsKDEUtils::kdeSupport()) {
++ return GetProxyFromKDE(aScheme, aHost, aPort, aResult);
+
if (mProxySettings) {
- rv = GetProxyFromGSettings(scheme, host, port, aResult);
- if (rv == NS_OK)
+ nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
+ if (NS_SUCCEEDED(rv))
return rv;
}
if (mGConf)
- return GetProxyFromGConf(scheme, host, port, aResult);
+ return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-@@ -531,8 +538,34 @@ static const mozilla::Module::ContractID
+@@ -534,8 +540,34 @@ static const mozilla::Module::ContractID
static const mozilla::Module kUnixProxyModule = {
mozilla::Module::kVersion,
@@ -2142,7 +2141,7 @@
+ PRInt32 aPort,
+ nsACString& aResult)
+{
-+ nsCAutoString url;
++ nsAutoCString url;
+ url = aScheme;
+ url += "://";
+ url += aHost;
@@ -2321,7 +2320,7 @@
+ *eol = '\0';
+ command_done = ( strcmp( buf, "\\1" ) == 0 );
+ command_failed = ( strcmp( buf, "\\0" ) == 0 );
-+ nsCAutoString line( buf );
++ nsAutoCString line( buf );
+ line.ReplaceSubstring( "\\n", "\n" );
+ line.ReplaceSubstring( "\\" "\\", "\\" ); // \\ -> \ , i.e. unescape
+ if( p->output && !( command_done || command_failed ))
@@ -2364,7 +2363,7 @@
+ nsCOMPtr<nsISupportsCString> str = do_QueryElementAt( command, i );
+ if( str )
+ {
-+ nsCAutoString s;
++ nsAutoCString s;
+ str->GetData( s );
+ in.AppendElement( s );
+ }
@@ -2625,7 +2624,7 @@
+#include "nsVoidArray.h"
+#include "nsKDEUtils.h"
+
-+/* static */ PRBool
++/* static */ bool
+nsCommonRegistry::HandlerExists(const char *aProtocolScheme)
+{
+ if( nsKDEUtils::kdeSupport())
@@ -2683,7 +2682,7 @@
+class nsCommonRegistry
+{
+ public:
-+ static PRBool HandlerExists(const char *aProtocolScheme);
++ static bool HandlerExists(const char *aProtocolScheme);
+
+ static nsresult LoadURL(nsIURI *aURL);
+
@@ -2698,7 +2697,7 @@
new file mode 100644
--- /dev/null
+++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -2713,12 +2712,12 @@
+#include "nsAutoPtr.h"
+#include "nsKDEUtils.h"
+
-+/* static */ PRBool
++/* static */ bool
+nsKDERegistry::HandlerExists(const char *aProtocolScheme)
+{
+ nsTArray<nsCString> command;
+ command.AppendElement( NS_LITERAL_CSTRING( "HANDLEREXISTS" ));
-+ command.AppendElement( nsCAutoString( aProtocolScheme ));
++ command.AppendElement( nsAutoCString( aProtocolScheme ));
+ return nsKDEUtils::command( command );
+}
+
@@ -2730,7 +2729,11 @@
+ nsCString url;
+ aURL->GetSpec( url );
+ command.AppendElement( url );
-+ return nsKDEUtils::command( command );
++ bool rv = nsKDEUtils::command( command );
++ if (!rv)
++ return NS_ERROR_FAILURE;
++
++ return NS_OK;
+}
+
+/* static */ void
@@ -2799,13 +2802,13 @@
+#include "nsTArray.h"
+
+class nsMIMEInfoBase;
-+class nsCAutoString;
++class nsAutoCString;
+class nsCString;
+
+class nsKDERegistry
+{
+ public:
-+ static PRBool HandlerExists(const char *aProtocolScheme);
++ static bool HandlerExists(const char *aProtocolScheme);
+
+ static nsresult LoadURL(nsIURI *aURL);
+
@@ -2855,7 +2858,7 @@
if (NS_FAILED(rv)){
HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
if (action) {
- nsCAutoString spec;
+ nsAutoCString spec;
aURI->GetAsciiSpec(spec);
if (hildon_uri_open(spec.get(), action, nullptr))
@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
@@ -2870,7 +2873,7 @@
- nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
if (!mimeInfo) {
- nsCAutoString ext;
+ nsAutoCString ext;
nsresult rv = GetPrimaryExtension(ext);
if (NS_SUCCEEDED(rv)) {
- mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
@@ -2910,7 +2913,7 @@
+ }
+
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCAutoString uriSpec;
+ nsAutoCString uriSpec;
if (giovfs) {
// nsGIOMimeApp->Launch wants a URI string instead of local file
nsresult rv;
@@ -2929,7 +2932,7 @@
- nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
if (mimeInfo) {
- nsCAutoString type;
+ nsAutoCString type;
mimeInfo->GetType(type);
if (giovfs) {
nsCOMPtr<nsIGIOMimeApp> app;
@@ -3097,10 +3100,10 @@
- return NS_OK;
+ // Unless it's KDE.
+ if( mMode != modeOpen || !nsKDEUtils::kdeSupport())
-+ return NS_OK;
++ return NS_OK;
}
- nsCAutoString filter, name;
+ nsAutoCString filter, name;
CopyUTF16toUTF8(aFilter, filter);
CopyUTF16toUTF8(aTitle, name);
@@ -3126,7 +3129,7 @@
g_main_context_iteration(nullptr, TRUE);
}
-@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -588,8 +595,235 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) {
mCallback->Done(result);
mCallback = nullptr;
@@ -3203,14 +3206,14 @@
+ }
+ }
+
-+ nsCAutoString directory;
++ nsAutoCString directory;
+ if (mDisplayDirectory) {
+ mDisplayDirectory->GetNativePath(directory);
+ } else if (mPrevDisplayDirectory) {
+ mPrevDisplayDirectory->GetNativePath(directory);
+ }
+
-+ nsCAutoString startdir;
++ nsAutoCString startdir;
+ if (!directory.IsEmpty()) {
+ startdir = directory;
+ }
@@ -3226,7 +3229,7 @@
+ if( startdir.IsEmpty())
+ startdir = ".";
+
-+ nsCAutoString filters;
++ nsAutoCString filters;
+ PRInt32 count = mFilters.Length();
+ if( count == 0 ) //just in case
+ filters = "*";
@@ -3241,12 +3244,12 @@
+ }
+
+ nsTArray<nsCString> command;
-+ command.AppendElement( nsCAutoString( arg ));
++ command.AppendElement( nsAutoCString( arg ));
+ command.AppendElement( startdir );
+ if( mMode != nsIFilePicker::modeGetFolder )
+ {
+ command.AppendElement( filters );
-+ nsCAutoString selected;
++ nsAutoCString selected;
+ selected.AppendInt( mSelectedType );
+ command.AppendElement( selected );
+ }
@@ -3256,7 +3259,7 @@
+ if( PRInt32 xid = windowToXid( mParentWidget ))
+ {
+ command.AppendElement( NS_LITERAL_CSTRING( "PARENT" ));
-+ nsCAutoString parent;
++ nsAutoCString parent;
+ parent.AppendInt( xid );
+ command.AppendElement( parent );
+ }
@@ -3344,7 +3347,7 @@
+ if( PRInt32 xid = windowToXid( mParentWidget ))
+ {
+ command.AppendElement( NS_LITERAL_CSTRING( "PARENT" ));
-+ nsCAutoString parent;
++ nsAutoCString parent;
+ parent.AppendInt( xid );
+ command.AppendElement( parent );
+ }
@@ -3532,7 +3535,7 @@
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
-@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -161,17 +161,17 @@ include $(topsrcdir)/ipc/chromium/chromi
DEFINES += -D_IMPL_NS_COM
ifeq ($(OS_ARCH),Linux)
@@ -3554,7 +3557,7 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -49,16 +49,17 @@
+@@ -50,16 +50,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
@@ -3572,7 +3575,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1760,44 +1761,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1752,44 +1753,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3586,7 +3589,7 @@
- if (!giovfs && !gnomevfs)
- return NS_ERROR_FAILURE;
-
-+ nsCAutoString url;
++ nsAutoCString url;
bool isDirectory;
if (NS_FAILED(IsDirectory(&isDirectory)))
return NS_ERROR_FAILURE;
@@ -3600,7 +3603,7 @@
+ url = mPath;
} else {
nsCOMPtr<nsIFile> parentDir;
- nsCAutoString dirPath;
+ nsAutoCString dirPath;
if (NS_FAILED(GetParent(getter_AddRefs(parentDir))))
return NS_ERROR_FAILURE;
if (NS_FAILED(parentDir->GetNativePath(dirPath)))
@@ -3638,7 +3641,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1823,16 +1831,23 @@ nsLocalFile::Launch()
+@@ -1815,16 +1823,23 @@ nsLocalFile::Launch()
if (nullptr == connection)
return NS_ERROR_FAILURE;
--- a/mozilla-language.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-language.patch Fri Oct 26 13:01:33 2012 +0200
@@ -1,14 +1,14 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 0d6917b8f28f6e0398dbf329dda4932ba4f997c2
+# Parent 97c6ae4c21e703a18e04f4d9fae9e2f06aeb13df
Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
--- a/intl/locale/src/nsLocaleService.cpp
+++ b/intl/locale/src/nsLocaleService.cpp
-@@ -160,16 +160,17 @@ nsLocaleService::nsLocaleService(void)
+@@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void)
nsRefPtr<nsLocale> resultLocale(new nsLocale());
- NS_ENSURE_TRUE(resultLocale, );
+ NS_ENSURE_TRUE_VOID(resultLocale);
#ifdef MOZ_WIDGET_QT
const char* lang = QLocale::system().name().toAscii();
@@ -24,7 +24,7 @@
for( i = 0; i < LocaleListLength; i++ ) {
nsresult result;
-@@ -188,16 +189,21 @@ nsLocaleService::nsLocaleService(void)
+@@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void)
} else {
CopyASCIItoUTF16(lang, platformLocale);
result = nsPosixLocale::GetXPLocale(lang, xpLocale);
--- a/mozilla-nongnome-proxies.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-nongnome-proxies.patch Fri Oct 26 13:01:33 2012 +0200
@@ -9,11 +9,11 @@
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -74,22 +74,28 @@ private:
- nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
- };
-
- NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
+@@ -50,22 +50,28 @@ nsUnixSystemProxySettings::GetMainThread
+ // dbus prevents us from being threadsafe, but this routine should not block anyhow
+ *aMainThreadOnly = true;
+ return NS_OK;
+ }
nsresult
nsUnixSystemProxySettings::Init()
--- a/mozilla-prefer_plugin_pref.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-prefer_plugin_pref.patch Fri Oct 26 13:01:33 2012 +0200
@@ -4,7 +4,7 @@
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -1588,17 +1588,51 @@ nsPluginHost::FindPluginForType(const ch
+@@ -1543,17 +1543,51 @@ nsPluginHost::FindPluginForType(const ch
if (!aMimeType) {
return nullptr;
}
@@ -14,7 +14,7 @@
InfallibleTArray<nsPluginTag*> matchingPlugins;
+ char *preferredPluginPath = NULL;
-+ nsCAutoString mimetypePrefString ("modules.plugins.mimetype.");
++ nsAutoCString mimetypePrefString ("modules.plugins.mimetype.");
+ mimetypePrefString.Append(aMimeType);
+ const char *mimetypePrefChar = mimetypePrefString.get();
+ nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar);
--- a/mozilla-shared-nss-db.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-shared-nss-db.patch Fri Oct 26 13:01:33 2012 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -7987,16 +7987,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8089,16 +8089,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -42,11 +42,11 @@
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
-@@ -90,12 +90,14 @@ DEFINES += \
- $(NULL)
+@@ -91,12 +91,14 @@ DEFINES += \
EXPORTS += \
nsNSSShutDown.h \
+ ScopedNSSTypes.h \
$(NULL)
# Use local includes because they are inserted before INCLUDES
@@ -83,7 +83,7 @@
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryService.h"
-@@ -1731,18 +1738,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1730,18 +1737,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -123,7 +123,7 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -443,17 +443,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -484,17 +484,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif
--- a/mozilla-sle11.patch Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-sle11.patch Fri Oct 26 13:01:33 2012 +0200
@@ -5,7 +5,7 @@
diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
--- a/xpcom/glue/SSE.cpp
+++ b/xpcom/glue/SSE.cpp
-@@ -44,26 +44,77 @@ namespace {
+@@ -12,26 +12,77 @@ namespace {
// SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION.
// We can't declare these functions in the header file, however, because
// <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to
@@ -80,7 +80,7 @@
+ return !!(unsigned(regs[reg]) & bit);
}
- #elif defined(_MSC_VER) && _MSC_VER >= 1400 && (defined(_M_IX86) || defined(_M_AMD64))
+ #elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64))
// MSVC 2005 or newer on x86-32 or x86-64
#include <intrin.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-webrtc.patch Fri Oct 26 13:01:33 2012 +0200
@@ -0,0 +1,103 @@
+# HG changeset patch
+# Parent 0b3f9d97af70d01863519daf4f57f8918b4bc17c
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+Bug 805549 - signaling_sipcc fails to compile because of unused variable
+
+diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp
+--- a/media/webrtc/signaling/signaling.gyp
++++ b/media/webrtc/signaling/signaling.gyp
+@@ -189,17 +189,16 @@
+ 'SIP_OS_LINUX',
+ '_GNU_SOURCE',
+ 'LINUX',
+ 'GIPS_VER=3510',
+ 'SECLIB_OPENSSL',
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+ 'include_dirs': [
+ ],
+ 'defines': [
+ 'SIP_OS_WINDOWS',
+ 'WIN32',
+@@ -217,18 +216,16 @@
+ ],
+ 'defines': [
+ 'SIP_OS_OSX',
+ 'OSX',
+ '_FORTIFY_SOURCE=2',
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
+ },
+
+ #
+ # SIPCC
+ #
+@@ -641,17 +638,16 @@
+ 'USE_TIMER_SELECT_BASED',
+ 'FULL_BUILD',
+ 'STUBBED_OUT',
+ 'USE_PRINTF'
+ 'LINUX',
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+ ],
+ }],
+ ['OS=="win"', {
+ 'include_dirs': [
+ ],
+
+ 'sources': [
+ # SIPSTACK
+@@ -760,18 +756,16 @@
+ 'FULL_BUILD',
+ 'STUBBED_OUT',
+ 'USE_PRINTF',
+ '_DARWIN_C_SOURCE',
+ 'NO_NSPR_10_SUPPORT',
+ ],
+
+ 'cflags_mozilla': [
+- '-Werror',
+- '-Wno-error=conversion'
+ ],
+ }],
+ ],
+
+ },
+ ],
+ }
+
+diff --git a/media/webrtc/signaling/src/sipcc/core/common/config_parser.c b/media/webrtc/signaling/src/sipcc/core/common/config_parser.c
+--- a/media/webrtc/signaling/src/sipcc/core/common/config_parser.c
++++ b/media/webrtc/signaling/src/sipcc/core/common/config_parser.c
+@@ -402,17 +402,16 @@ void config_set_ccm_ip_mac ()
+ /*
+ * config_setup_element
+ * Setup elements that once were downloaded from CUCM in an XML file.
+ * Settings are stored in config.h
+ */
+ void config_setup_elements (const char *sipUser, const char *sipPassword, const char *sipDomain)
+ {
+ unsigned int i;
+- char buf[MAX_SIP_URL_LENGTH] = {'\0'};
+ char ip[MAX_SIP_URL_LENGTH] = {'\0'};
+ char option[MAX_SIP_URL_LENGTH] = {'\0'};
+ int line = 0;
+ cc_boolean isSecure = FALSE, isValid = TRUE;
+ char macaddr[MAC_ADDR_SIZE];
+
+ compare_or_set_int_value(CFGID_MEDIA_PORT_RANGE_START, gStartMediaPort, (const unsigned char *) "startMediaPort");
+ compare_or_set_int_value(CFGID_MEDIA_PORT_RANGE_END, gStopMediaPort, (const unsigned char *) "stopMediaPort");
--- a/series Wed Oct 24 10:25:01 2012 +0200
+++ b/series Fri Oct 26 13:01:33 2012 +0200
@@ -18,6 +18,7 @@
mozilla-gstreamer-760140.patch
mozilla-ppc.patch
mozilla-idldir.patch
+mozilla-webrtc.patch
#mozilla-disable-neon-option.patch
# Firefox patches