From 0515cb4011bc6f3beca9f850884f403c96401993 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <hughesjr@doogie-n3.rdu2.centos.org>
Date: Feb 15 2022 17:21:28 +0000
Subject: Manual CentOS Debranding


---

diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
new file mode 100644
index 0000000..6dfe2ad
--- /dev/null
+++ b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
@@ -0,0 +1,12 @@
+diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
+--- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661	2018-04-27 08:55:38.848241768 +0200
++++ firefox-60.0/mfbt/LinuxSignal.h	2018-04-27 09:06:47.946769859 +0200
+@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
+                                              void* aContext) {
+   asm volatile("nop; nop; nop; nop" : : : "memory");
+ 
+-  asm volatile("b %0" : : "X"(H) : "memory");
++  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
+ }
+ 
+ #  define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
new file mode 100644
index 0000000..3f84f95
--- /dev/null
+++ b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
@@ -0,0 +1,35 @@
+From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Sat, 1 Jun 2019 09:06:01 +0900
+Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
+ user_vfp_exc.
+
+---
+ js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f8478..383c380f04c 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
+ #endif
+ 
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#  include <sys/user.h>
++struct user_vfp {
++  unsigned long long fpregs[32];
++  unsigned long fpscr;
++};
++
++struct user_vfp_exc {
++  unsigned long fpexc;
++  unsigned long fpinst;
++  unsigned long fpinst2;
++};
+ #endif
+ 
+ #if defined(ANDROID)
+-- 
+2.20.1
+
diff --git a/SOURCES/thunderbird-centos-default-prefs.js.el7 b/SOURCES/thunderbird-centos-default-prefs.js.el7
new file mode 100644
index 0000000..c27d9d3
--- /dev/null
+++ b/SOURCES/thunderbird-centos-default-prefs.js.el7
@@ -0,0 +1,36 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+/* Allow users to set custom colors*/
+/* pref("browser.display.use_system_colors",   true);*/
+pref("general.useragent.vendor", "CentOS");
+pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+
+/* Disable global indexing by default*/
+pref("mailnews.database.global.indexer.enabled", false);
+
+/* Do not switch to Smart Folders after upgrade to 3.0b4 */
+pref("mail.folder.views.version", "1");
+pref("extensions.shownSelectionUI", true);
+pref("extensions.autoDisableScopes", 0);
+
+/* For rhbz#1024232 */
+pref("ui.SpellCheckerUnderlineStyle",       1);
+
+/* Workaround for rhbz#1753011 */
+pref("spellchecker.dictionary_path", "/usr/share/myspell");
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit",      false);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+/* Disable telemetry */
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 7db41a1..572cd54 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -167,7 +167,7 @@ Source21:       thunderbird.sh.in
 Source24:       mozilla-api-key
 Source27:       google-api-key
 Source28:       node-stdout-nonblocking-wrapper
-Source701:      thunderbird-redhat-default-prefs.js.rhel7
+Source701:      thunderbird-centos-default-prefs.js.el7
 
 Source403:      nss-3.67.0-7.el8_1.src.rpm
 Source401:      nss-setup-flags-env.inc
@@ -203,6 +203,9 @@ Patch513:        mozilla-bmo998749.patch
 Patch514:        mozilla-s390x-skia-gradient.patch
 Patch515:        mozilla-bmo1626236.patch
 
+Patch10000:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch10001:       Bug-1526653---fix_user_vfp_armv7.patch
+
 %if %{?system_nss}
 %if !0%{?bundle_nss}
 BuildRequires:  pkgconfig(nspr) >= %{nspr_version}
@@ -441,6 +444,11 @@ echo "use_rustts            %{?use_rustts}"
   %endif
 %endif
 
+%ifarch %{arm}
+%patch10000 -p1 -b .mozilla-1238661
+%patch10001 -p1 -b .mozilla-15266
+%endif
+
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 # Modify mozconfig file