summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2017-04-19 13:46:50 +0200
committerMartin Stransky <stransky@redhat.com>2017-04-19 13:46:50 +0200
commitde895fe43051d80410d904ea4a926ebff7b76565 (patch)
treedc45be44a6a0854c6c18a1853c747b6eecf53169
parentMerge branch 'master' into f24 (diff)
parentAdded second arches build patch (diff)
downloadlibrewolf-fedora-ff-de895fe43051d80410d904ea4a926ebff7b76565.tar.gz
librewolf-fedora-ff-de895fe43051d80410d904ea4a926ebff7b76565.tar.bz2
librewolf-fedora-ff-de895fe43051d80410d904ea4a926ebff7b76565.zip
Merge branch 'master' into f24
-rw-r--r--firefox.spec2
-rw-r--r--mozilla-1335250.patch37
2 files changed, 39 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec
index c50187b..0cb97e0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -137,6 +137,7 @@ Patch19: xulrunner-24.0-s390-inlines.patch
Patch20: firefox-build-prbool.patch
Patch25: rhbz-1219542-s390-build.patch
Patch26: build-icu-big-endian.patch
+Patch27: mozilla-1335250.patch
# Fedora specific patches
# Unable to install addons from https pages
@@ -295,6 +296,7 @@ cd %{tarballdir}
%ifarch s390
%patch25 -p1 -b .rhbz-1219542-s390
%endif
+%patch27 -p1 -b .1335250
%patch3 -p1 -b .arm
diff --git a/mozilla-1335250.patch b/mozilla-1335250.patch
new file mode 100644
index 0000000..1680349
--- /dev/null
+++ b/mozilla-1335250.patch
@@ -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);
bgstack15