Merge branch 'master' into f24

This commit is contained in:
Martin Stransky 2017-04-19 13:46:50 +02:00
commit de895fe430
2 changed files with 39 additions and 0 deletions

View File

@ -137,6 +137,7 @@ Patch19: xulrunner-24.0-s390-inlines.patch
Patch20: firefox-build-prbool.patch Patch20: firefox-build-prbool.patch
Patch25: rhbz-1219542-s390-build.patch Patch25: rhbz-1219542-s390-build.patch
Patch26: build-icu-big-endian.patch Patch26: build-icu-big-endian.patch
Patch27: mozilla-1335250.patch
# Fedora specific patches # Fedora specific patches
# Unable to install addons from https pages # Unable to install addons from https pages
@ -295,6 +296,7 @@ cd %{tarballdir}
%ifarch s390 %ifarch s390
%patch25 -p1 -b .rhbz-1219542-s390 %patch25 -p1 -b .rhbz-1219542-s390
%endif %endif
%patch27 -p1 -b .1335250
%patch3 -p1 -b .arm %patch3 -p1 -b .arm

37
mozilla-1335250.patch Normal file
View File

@ -0,0 +1,37 @@
# HG changeset patch
# User Andrea Marchesini <amarchesini@mozilla.com>
# Parent b8b7103963d9f243b0a30c8bc0d9a0b37ed8a955
diff --git a/dom/media/webrtc/MediaEngine.h b/dom/media/webrtc/MediaEngine.h
--- a/dom/media/webrtc/MediaEngine.h
+++ b/dom/media/webrtc/MediaEngine.h
@@ -221,27 +221,27 @@ public:
class AllocationHandle
{
public:
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AllocationHandle);
protected:
~AllocationHandle() {}
public:
AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
- const ipc::PrincipalInfo& aPrincipalInfo,
+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
const MediaEnginePrefs& aPrefs,
const nsString& aDeviceId)
: mConstraints(aConstraints),
mPrincipalInfo(aPrincipalInfo),
mPrefs(aPrefs),
mDeviceId(aDeviceId) {}
public:
NormalizedConstraints mConstraints;
- ipc::PrincipalInfo mPrincipalInfo;
+ mozilla::ipc::PrincipalInfo mPrincipalInfo;
MediaEnginePrefs mPrefs;
nsString mDeviceId;
};
/* Release the device back to the system. */
virtual nsresult Deallocate(AllocationHandle* aHandle)
{
MOZ_ASSERT(aHandle);