summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2019-07-25 08:11:28 +0200
committerMartin Stransky <stransky@redhat.com>2019-07-25 08:11:28 +0200
commit81d75249322c34fcc55eafa39f9286a876f79f58 (patch)
treea1251a205de7cdc96645dbeb1be7b2e098a10bc1
parentAdded node js wrapper to fix koji freezes (diff)
downloadlibrewolf-fedora-ff-81d75249322c34fcc55eafa39f9286a876f79f58.tar.gz
librewolf-fedora-ff-81d75249322c34fcc55eafa39f9286a876f79f58.tar.bz2
librewolf-fedora-ff-81d75249322c34fcc55eafa39f9286a876f79f58.zip
Updated mozbz#1512162 for ppc64le
-rw-r--r--firefox.spec3
-rw-r--r--mozilla-1512162.patch29
2 files changed, 26 insertions, 6 deletions
diff --git a/firefox.spec b/firefox.spec
index 3ef4fbd..4ab6025 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -345,7 +345,9 @@ This package contains results of tests executed during build.
%ifarch %{arm}
%patch415 -p1 -b .1238661
%endif
+%ifarch ppc64 ppc64le
%patch418 -p1 -b .1512162
+%endif
%patch419 -p1 -b .1568569
# Wayland specific upstream patches
@@ -929,6 +931,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Added fix for rhbz#1709840
- Added node js wrapper to fix koji freezes
(https://pagure.io/fedora-infrastructure/issue/8026)
+- Updated mozbz#1512162 for ppc64le
* Mon Jul 22 2019 Martin Stransky <stransky@redhat.com> - 68.0.1-1
- Updated to 68.0.1
diff --git a/mozilla-1512162.patch b/mozilla-1512162.patch
index a246a3e..99a0b14 100644
--- a/mozilla-1512162.patch
+++ b/mozilla-1512162.patch
@@ -1,7 +1,25 @@
-diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
---- a/js/xpconnect/src/XPCWrappedNative.cpp
-+++ b/js/xpconnect/src/XPCWrappedNative.cpp
-@@ -1157,6 +1157,10 @@
+diff -up firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162 firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp
+--- firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp.1512162 2019-07-17 22:51:30.000000000 +0200
++++ firefox-68.0.1/js/xpconnect/src/XPCWrappedNative.cpp 2019-07-25 08:08:18.512528313 +0200
+@@ -1092,7 +1092,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
+ MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
+ MutableHandleValue srcp) const;
+
+- MOZ_ALWAYS_INLINE bool GatherAndConvertResults();
++ bool GatherAndConvertResults();
+
+ MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
+
+@@ -1139,7 +1139,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
+
+ ~CallMethodHelper();
+
+- MOZ_ALWAYS_INLINE bool Call();
++ bool Call();
+
+ // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
+ void trace(JSTracer* aTrc);
+@@ -1157,6 +1157,10 @@ bool XPCWrappedNative::CallMethod(XPCCal
return helper.get().Call();
}
@@ -12,7 +30,7 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
bool CallMethodHelper::Call() {
mCallContext.SetRetVal(JS::UndefinedValue());
-@@ -1315,6 +1319,10 @@
+@@ -1315,6 +1319,10 @@ bool CallMethodHelper::GetOutParamSource
return true;
}
@@ -23,4 +41,3 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
bool CallMethodHelper::GatherAndConvertResults() {
// now we iterate through the native params to gather and convert results
uint8_t paramCount = mMethodInfo->GetParamCount();
-
bgstack15