From 0ebbded5ff621ace318ca2558fa7a4b2bcaf7b77 Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Tue, 27 Feb 2024 18:32:06 +0100
Subject: [PATCH] community/firefox: re-add stackwalk patch

---
 community/firefox/APKBUILD                    |  4 ++-
 community/firefox/disable-moz-stackwalk.patch | 34 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/community/firefox/APKBUILD b/community/firefox/APKBUILD
index 02bf698962a..600c8f5cc53 100644
--- a/community/firefox/APKBUILD
+++ b/community/firefox/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=firefox
 pkgver=123.0
 _releasedate=2024-02-20
-pkgrel=1
+pkgrel=2
 pkgdesc="Firefox web browser"
 url="https://www.firefox.com/"
 # s390x blocked by lld
@@ -77,6 +77,7 @@ riscv64) ;;
 esac
 source="$pkgname-$pkgver.tar.xz::https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
 	crash-reporting-ptrace.patch
+	disable-moz-stackwalk.patch
 	fix-fortify-system-wrappers.patch
 	fix-rust-target.patch
 	fix-webrtc-glibcisms.patch
@@ -755,6 +756,7 @@ intl() {
 sha512sums="
 a19567a13e1b663e538c4af17491146adad1f0ab977995e8da9ce9ed428008ad20902dee4efb82d54e1319a0e31768609696bc822563d75732b622760129d8bb  firefox-123.0.tar.xz
 0f7b741ea2fd492bc50256f3fcbd46c09e92211ad7a943474de99729245eddd063e4eca16a8e9a2d6919bfcfc81b739c6aa7b3463469608ebd4cb1e24d26abc1  crash-reporting-ptrace.patch
+eb49b791280a8d765e6b056816ad6d7ec20a3b13723ebe648a8ecd2c086a5bc83277a3b4c127a470e7bb7105cfa4ed7611c19ac683545140190cafaa880ad515  disable-moz-stackwalk.patch
 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969  fix-fortify-system-wrappers.patch
 cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556  fix-rust-target.patch
 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b  fix-webrtc-glibcisms.patch
diff --git a/community/firefox/disable-moz-stackwalk.patch b/community/firefox/disable-moz-stackwalk.patch
index b6bc756d2be..54990d799fc 100644
--- a/community/firefox/disable-moz-stackwalk.patch
+++ b/community/firefox/disable-moz-stackwalk.patch
@@ -1,18 +1,28 @@
+upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1882329
 diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
-index 7d62921..adcfa44 100644
+index 2fefc5b..57c56e6 100644
 --- a/mozglue/misc/StackWalk.cpp
 +++ b/mozglue/misc/StackWalk.cpp
-@@ -33,13 +33,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
- #endif
+@@ -46,5 +46,12 @@ using namespace mozilla;
  
--#if (defined(linux) &&                                            \
--     ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
++#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++#  define HAVE___LIBC_STACK_END 1
++#else
++#  define HAVE___LIBC_STACK_END 0
++#endif
++
+ #if (defined(linux) &&                                            \
+      ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
 -      defined(HAVE__UNWIND_BACKTRACE)))
--#  define MOZ_STACKWALK_SUPPORTS_LINUX 1
--#else
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 0
--#endif
++      defined(HAVE__UNWIND_BACKTRACE)) &&                         \
++     (HAVE___LIBC_STACK_END || ANDROID))
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+@@ -54,8 +61,2 @@ using namespace mozilla;
  
- #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
- #  define HAVE___LIBC_STACK_END 1
+-#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+-#  define HAVE___LIBC_STACK_END 1
+-#else
+-#  define HAVE___LIBC_STACK_END 0
+-#endif
+-
+ #if HAVE___LIBC_STACK_END