FF.spec: Tidy up s390x patches a bit

openSUSE · Jun 16, 2020 · 2333fcf · 2333fcf
1 parent 3bb757f
commit 2333fcf
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 7 deletions.
diff --git a/firefox/MozillaFirefox.spec b/firefox/MozillaFirefox.spec
@@ -184,6 +184,7 @@ Patch2:         mozilla-kde.patch
 Patch3:         mozilla-ntlm-full-path.patch
 Patch4:         mozilla-aarch64-startup-crash.patch
 Patch5:         mozilla-bmo1463035.patch
+Patch6:         mozilla-sandbox-fips.patch
 Patch7:         mozilla-fix-aarch64-libopus.patch
 Patch8:         mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch
 Patch9:         mozilla-s390-context.patch
@@ -200,9 +201,12 @@ Patch20:        mozilla-fix-top-level-asm.patch
 Patch21:        mozilla-bmo1504834-part4.patch
 Patch22:        mozilla-bmo849632.patch
 Patch23:        mozilla-pipewire-0-3.patch
-Patch50:        WIP-decoders.patch
-Patch51:        WIP-skia-gradient.patch
-Patch53:        mozilla-s390x-sqlite.patch
+Patch24:        mozilla-bmo1602730.patch
+Patch25:        mozilla-bmo998749.patch
+Patch26:        mozilla-bmo1626236.patch
+Patch27:        mozilla-s390x-skia-gradient.patch
+Patch28:        mozilla-bmo1619231.patch
+Patch29:        mozilla-bmo1643282.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -321,6 +325,7 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -339,9 +344,12 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
 %if %{with pipewire3}
 %patch23 -p1
 %endif
-%patch50 -p1
-%patch51 -p1
-%patch53 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1

diff --git a/firefox/mozilla-bmo1602730.patch b/firefox/mozilla-bmo1602730.patch
@@ -0,0 +1 @@
+../mozilla-bmo1602730.patch
diff --git a/firefox/mozilla-bmo1619231.patch b/firefox/mozilla-bmo1619231.patch
@@ -0,0 +1 @@
+../mozilla-bmo1619231.patch
diff --git a/firefox/mozilla-bmo1626236.patch b/firefox/mozilla-bmo1626236.patch
@@ -0,0 +1 @@
+../mozilla-bmo1626236.patch
diff --git a/firefox/mozilla-bmo1643282.patch b/firefox/mozilla-bmo1643282.patch
@@ -0,0 +1 @@
+../mozilla-bmo1643282.patch
diff --git a/firefox/mozilla-bmo998749.patch b/firefox/mozilla-bmo998749.patch
@@ -0,0 +1 @@
+../mozilla-bmo998749.patch
diff --git a/firefox/mozilla-s390x-skia-gradient.patch b/firefox/mozilla-s390x-skia-gradient.patch
@@ -0,0 +1 @@
+../mozilla-s390x-skia-gradient.patch
diff --git a/firefox/mozilla-s390x-sqlite.patch b/firefox/mozilla-s390x-sqlite.patch
diff --git a/firefox/mozilla-sandbox-fips.patch b/firefox/mozilla-sandbox-fips.patch
@@ -0,0 +1 @@
+../mozilla-sandbox-fips.patch
diff --git a/mozilla-bmo1602730.patch b/mozilla-bmo1602730.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User msirringhaus@suse.de
+# Date 1582805890 -3600
+#      Thu Feb 27 13:18:10 2020 +0100
+# Node ID 457cbe5705f2a3759d3da36a05c0ed66ec61ea12
+# Parent  7440f4b6bab85068ca2f84e9c48e0706d04330e8
+imported patch mozilla-bmo1602730-FF73.patch
+
+diff -r 7440f4b6bab8 -r 457cbe5705f2 gfx/layers/composite/CompositableHost.cpp
+--- a/gfx/layers/composite/CompositableHost.cpp	Thu Feb 27 13:17:56 2020 +0100
++++ b/gfx/layers/composite/CompositableHost.cpp	Thu Feb 27 13:18:10 2020 +0100
+@@ -92,9 +92,11 @@
+   }
+   MOZ_ASSERT(source);
+
+-  RefPtr<EffectMask> effect =
+-      new EffectMask(source, source->GetSize(), aTransform);
+-  aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
++  // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
++  // if the typed URL is too long for the textbox (automatic scrolling needed)
++  //RefPtr<EffectMask> effect =
++  //    new EffectMask(source, source->GetSize(), aTransform);
++  //aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
+   return true;
+ }
+
diff --git a/mozilla-s390x-sqlite.patch → mozilla-bmo1619231.patch b/mozilla-s390x-sqlite.patch → mozilla-bmo1619231.patch
diff --git a/firefox/WIP-decoders.patch → mozilla-bmo1626236.patch b/firefox/WIP-decoders.patch → mozilla-bmo1626236.patch
diff --git a/mozilla-bmo1643282.patch b/mozilla-bmo1643282.patch
@@ -0,0 +1,11 @@
+diff -r 173e2e6757ae widget/gtk/MozContainerWayland.h
+--- a/widget/gtk/MozContainerWayland.h	Thu May 28 13:42:58 2020 +0000
++++ b/widget/gtk/MozContainerWayland.h	Thu Jun 04 09:31:17 2020 +0200
+@@ -10,6 +10,7 @@
+
+ #include <gtk/gtk.h>
+ #include <vector>
++#include <functional>
+ #include "mozilla/Mutex.h"
+
+ /*
diff --git a/mozilla-bmo998749.patch b/mozilla-bmo998749.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User msirringhaus@suse.de
+# Date 1583738770 -3600
+#      Mon Mar 09 08:26:10 2020 +0100
+# Node ID 34676feac1a542e409e22acf5b98735f8313b1ce
+# Parent  506857dace0a08d1c9685e3ac264646590b3e27f
+[mq]: mozilla-bmo998749.patch
+
+diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h
+--- a/gfx/2d/FilterProcessing.h	Fri Feb 28 12:31:51 2020 +0100
++++ b/gfx/2d/FilterProcessing.h	Mon Mar 09 08:26:10 2020 +0100
+@@ -13,10 +13,17 @@
+ namespace mozilla {
+ namespace gfx {
+
++#if MOZ_BIG_ENDIAN()
++const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 3;
++const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 2;
++const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 1;
++const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 0;
++#else
+ const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 0;
+ const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 1;
+ const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 2;
+ const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 3;
++#endif
+
+ class FilterProcessing {
+  public:
diff --git a/firefox/WIP-skia-gradient.patch → mozilla-s390x-skia-gradient.patch b/firefox/WIP-skia-gradient.patch → mozilla-s390x-skia-gradient.patch
diff --git a/mozilla-sandbox-fips.patch b/mozilla-sandbox-fips.patch
@@ -0,0 +1,16 @@
+From: meissner@suse.com
+Subject: allow Firefox to access addtional process information
+Reference: http://bugzilla.suse.com/show_bug.cgi?id=1167132
+
+Index: firefox-74.0/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+===================================================================
+--- firefox-74.0.orig/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
++++ firefox-74.0/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+@@ -276,6 +276,7 @@ SandboxBrokerPolicyFactory::SandboxBroke
+
+   // Read permissions
+   policy->AddPath(rdonly, "/dev/urandom");
++  policy->AddPath(rdonly, "/proc/sys/crypto/fips_enabled");
+   policy->AddPath(rdonly, "/proc/cpuinfo");
+   policy->AddPath(rdonly, "/proc/meminfo");
+   policy->AddDir(rdonly, "/sys/devices/cpu");