From 77928afb83ceefbf87a24899c29df4fc7ad70dff Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Mon, 26 Feb 2024 19:56:58 +0100
Subject: [PATCH] testing/firefox-developer-edition: upgrade to 124.0_beta4

---
 testing/firefox-developer-edition/APKBUILD      | 12 ++++++------
 .../firefox-developer-edition/res_nquery.patch  | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 testing/firefox-developer-edition/res_nquery.patch

diff --git a/testing/firefox-developer-edition/APKBUILD b/testing/firefox-developer-edition/APKBUILD
index 22a4fbdb74c..35d5cc6701a 100644
--- a/testing/firefox-developer-edition/APKBUILD
+++ b/testing/firefox-developer-edition/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=firefox-developer-edition
-pkgver=123.0_beta3
+pkgver=124.0_beta4
 _pkgver=${pkgver/_beta/b}
-_releasedate=2024-01-26
-pkgrel=1
+_releasedate=2024-02-26
+pkgrel=0
 pkgdesc="Firefox web browser"
 url="https://www.firefox.com/"
 # s390x and riscv64 blocked by rust and cargo
@@ -58,7 +58,6 @@ makedepends="
 	zip
 	"
 source="https://ftp.mozilla.org/pub/firefox/releases/$_pkgver/source/firefox-$_pkgver.source.tar.xz
-	disable-moz-stackwalk.patch
 	fix-fortify-system-wrappers.patch
 	fix-rust-target.patch
 	fix-webrtc-glibcisms.patch
@@ -66,6 +65,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_pkgver/source/firefox-$_p
 	lfs64.patch
 	no-ccache-stats.patch
 	python-deps.patch
+	res_nquery.patch
 	rust-lto-thin.patch
 	sandbox-fork.patch
 	sandbox-largefile.patch
@@ -254,8 +254,7 @@ package() {
 }
 
 sha512sums="
-86f63006e59be7a5da21a6441340f517a0dc0f25da6ea1385c9d8a92f6a6cc97aa14158f64f4eeb4f828ed5e87215f3c1e05576e0a650e7f4dfa42a18d54adf9  firefox-123.0b3.source.tar.xz
-454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c  disable-moz-stackwalk.patch
+a5904bbf41951db33b570a70cdb7923b85ea67f83aa926d5e6f16f2045fd9384957e932a23f0127882dfc130c0737e7d92b74f6d176757a8562ea3575c86d63b  firefox-124.0b4.source.tar.xz
 3c28e243c1c74a9bd1ea13729926b1cae3ee35843b14be92ff3287a8cd745e95954e1bc842f2add165923d159bb8d2a7bcd92ba8fb2f4017ba1aef892d77aecf  fix-fortify-system-wrappers.patch
 cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556  fix-rust-target.patch
 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b  fix-webrtc-glibcisms.patch
@@ -263,6 +262,7 @@ ff471e5160e313a9657bcbb767a6a581bab9da053cced02bde38d1ef03349472ad3602dba026c10d
 5fa9382c692e4bd6a2634308f24a6526fd12a60a2563d2090056d43a60505df3ec9881bbf54562e69394467529b3b0dc45955afca46ed329af03cea074fff070  lfs64.patch
 64b6458099baa225b346b40e3080cea3a5c73a834e39fa4a438af77701e6ded84e2fb0d6fffff8c2533cc43b898fe9f411be023e875acebec452aa2379861f04  no-ccache-stats.patch
 56454b30bed9ce079a06b9d3803030912629d3e0feef49321f1404ab5d004528c446231584a6d89ca69e0bb2ee037664287186975405b048ea3ce06d729a7912  python-deps.patch
+f635243e587b5be2c82e96d8ad11e93f99e3130765e4b9e329ff7424f685d8f7bf385de66ca2698084e95da422d55192053a45412e75915423b327f2415f581d  res_nquery.patch
 1c6918dd6655d3a1251bfd4af2e1c561cbb00d540a883b4c1ebf7f5de530d754d9ac07b4b5f56cdab6c511d25c8910ec94043f5733e97501a67abffe1bafaeb1  rust-lto-thin.patch
 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609  sandbox-fork.patch
 b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e  sandbox-largefile.patch
diff --git a/testing/firefox-developer-edition/res_nquery.patch b/testing/firefox-developer-edition/res_nquery.patch
new file mode 100644
index 00000000000..1b6474a926d
--- /dev/null
+++ b/testing/firefox-developer-edition/res_nquery.patch
@@ -0,0 +1,17 @@
+musl doesn't have res_nquery - fall back to res_query
+--- a/netwerk/dns/PlatformDNSUnix.cpp
++++ b/netwerk/dns/PlatformDNSUnix.cpp
+@@ -32,11 +32,11 @@
+   rv = packet.FillBuffer(
+       [&](unsigned char response[DNSPacket::MAX_SIZE]) -> int {
+         int len = 0;
+-#if defined(XP_LINUX)
++#if defined(__GLIBC__)
+         len = res_nquery(&_res, host.get(), ns_c_in,
+                          nsIDNSService::RESOLVE_TYPE_HTTPSSVC, response,
+                          DNSPacket::MAX_SIZE);
+-#elif defined(XP_MACOSX)
++#elif defined(XP_LINUX) || defined(XP_MACOSX)
+         len =
+             res_query(host.get(), ns_c_in, nsIDNSService::RESOLVE_TYPE_HTTPSSVC,
+                       response, DNSPacket::MAX_SIZE);