update icecat ebuild to parity with parona-overlay

4 files changed, 70 insertions, 15 deletions

diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 2c598bb..c31fe69 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,7 +1,7 @@
 DIST firefox-139-loong-patches-02.tar.xz 3096 BLAKE2B 2e9c0f3dac780c808a13f70fe3808df9976898360b55113def97bf3594893166e0647c70ebc389b2d14fa2c2453fc1dd68aba20d92178670ef97d70c34205e1c SHA512 e1244007290e2e15d14cf519e3ade6a4da06abe41c416de60569a11396609661cb62fb5b592e763cc079406699dc33d6a34851f71068f4d09bdf34021b035a59
-DIST firefox-140esr-patches-04.tar.xz 124424 BLAKE2B 89fd2cedb67a9d82c339fed01b79c9c4b3f58051b68764121f982d4eba04d979c9d16238a7599fbab4f9d3965253f3ec4886f2da590b05116bc6ea0ee027e935 SHA512 b8c268fd5118007490edb7ef99f90148af4fa88ec7cdec03d028630476c85862e896b1ad3a6964215835f6f442aa71df96d6dd9aab632802773792bced8dc17b
 DIST firefox-140esr-patches-05.tar.xz 124432 BLAKE2B 9281214dcf3da5d2e288112a99dc1fbee44ee93c4b83e30d73e8383805bd9c8ad9b1918d11351398cd963fdc30ec3cb50d7f6b5c9905d7c1303d21fdef440fbe SHA512 70551bb7eea2a50bbd30418438a78a8ace07467fe852b7655c24373c651f816df89fceeb98b6fa6c7d95944b0c5deef76b89b3e742795a8ac04259f02bd25c10
-DIST icecat-140.6.0-1gnu1.tar.zst 915461781 BLAKE2B 8f8bcba4fda47eb894d7a63ec099389c4eb654597b482cba7bac83c8e523bee504d8d4905200f9ac193deb2f4811ab63e89d3fe6507c4584588d612cbcd49bcd SHA512 a934bc5bd529488149a0502d777c92edd80cdba7543d24ea1f3744803cbd4f139bd105bd95125206a528b281b20d32118df4fcbc35915475a109453e9475c901
-DIST icecat-140.7.0-1gnu1.tar.zst 724386528 BLAKE2B 704de3e01c26dcaf3d6ebe5781ebfcd5d00d3d0e0f0e70a4f2825cc953b5354fa05ae0bed97a8a76fe17ba934979af781f9973226a690970d6124f8a77a96179 SHA512 6a7c90fdb7db46bd27632d947fa715f9dcaef497f046ba04ea05fc192c6aa341e608e7d0b90a1328f98b36c3f5d3a1c947a41a21799d1515b216f1b4a8ff12a1
-DIST wasi-sdk-28.0-arm64-linux.tar.gz 121761064 BLAKE2B 044a93cf1790dd652a86927bd74cf2a8b081a8db1261c2879d7fa72d5efde6a1ef65be63ff94c94d1e39d179ab829eded95121e2f6fd6c8f83374690763d532a SHA512 5ed16fdcdfa573630a75986cddde5ddc6a7e010ad9ad20cfa939becb78c1cbb0740fd1a53064e3d358b929b7b9ef6264612644293a1840c54a3e1868b4c15d7b
-DIST wasi-sdk-28.0-x86_64-linux.tar.gz 121193888 BLAKE2B eaefdd7f0432b3a2432e09fce659282e1e1a515a0b31f63cc2d48953e180229fe494deff2e1019f60ab38179f7f93e6dd13d4763355b706e5f447efac1e5f08c SHA512 805412c73b4b2d3c9df9af25b95dd2ed7625dd1b4424bbf07286caf24fc87e54aee1fbb4fbe3904f180a7cca9decf00177915860ca216e87421d8c91a0693875
+DIST firefox-140esr-patches-07.tar.xz 125712 BLAKE2B df8cb80104d816966723de33c79aa56f2a0ff54bf1a8a0668b76c4bb1bf3a7fa181011850c3030c04c2b8abcd69bec2dc23d500cfb6a624704b0797b76af8062 SHA512 6735b7f00048a24f313f2a09a17c785d045b3ebc0e640c9b7932fd1e65b84284344adee73d058855aff6bf93384933323031799565838a6339b9d20684e162d4
+DIST icecat-140.7.1-1gnu1.tar.zst 726079419 BLAKE2B 08379aa8c95de7bce7ce39dd459514678ae989e039048a36939450848b1fd3d4fe6a0edc01a8e51bb109a6d0c48e759b65b0a5f02694ea94b4870ed02983b40b SHA512 e3e62360cfa4d7e62c0797f8323c713265110dadaf1843de68b08e7a534edfd652a160383967130655900d0d39ab03c23f7bc17284459a9f05289f393fa05d69
+DIST icecat-140.8.0-2gnu1.tar.zst 724677963 BLAKE2B d7f411f11147eb44b05ff88f037b389f1dc9a4830f45d7cbb59a64363d8286ec313f753ebe85ea23ce8f9ec949d34b56f62d8b3166d53ec763c82ca67559e7d1 SHA512 e1209dd8f2364246689a9245108bcd34cb4b32396b57703633016e697405214f1c42e0c2be4f4e8770d0f3eaeaa4c732811b61a09dfe2438c246444706f6e083
+DIST wasi-sdk-30.0-arm64-linux.tar.gz 119262670 BLAKE2B 59194c6459c98b0566522c97cceac61c68915629931546f8598856d726dff9f85742560afe9c86d6102a1faeb44c962b3935b8b6de326ea218158a32026319bc SHA512 ff794dd90c851b2c0b7ea2cb2ceddaf23cb4cb1c211e37ae3dcf12556e6a21e389c2b894ef52e68110ca085098ae3717b18a497a928b5d13b0a9dab61acb8b38
+DIST wasi-sdk-30.0-x86_64-linux.tar.gz 119449290 BLAKE2B 7286b9079eeb160b0e033b7802f703b08e089e452c6558f1feb6d9cf8cd240fabea7f9a39d44b13b2793e69a02c569f64520d677d76a577bc2e35ce07c722212 SHA512 9b8dc1cec71aa9e870840b30f2b7307d6b48f965d50b724926745780e4e76411f5eb97e443970ecdead90a4932669cc18ae506439f22a24d06e2e8fe44d220b3
diff --git a/www-client/icecat/files/icecat-140.7.1-glibc-2.43.patch b/www-client/icecat/files/icecat-140.7.1-glibc-2.43.patch
new file mode 100644
index 0000000..2661683
--- /dev/null
+++ b/www-client/icecat/files/icecat-140.7.1-glibc-2.43.patch
@@ -0,0 +1,48 @@
+Cleaned up patch based on
+https://github.com/xarblu/sysbits/blob/72296ccadaca4c245e713fcf5375a7449c2855d0/etc/portage/patches/mail-client/thunderbird/00-glibc-2.43.patch
+
+--- a/third_party/rust/glslopt/glsl-optimizer/include/c11/threads_posix.h.orig
++++ b/third_party/rust/glslopt/glsl-optimizer/include/c11/threads_posix.h
+@@ -51,7 +51,6 @@ Configuration macro:
+ #include <pthread.h>
+ 
+ /*---------------------------- macros ----------------------------*/
+-#define ONCE_FLAG_INIT PTHREAD_ONCE_INIT
+ #ifdef INIT_ONCE_STATIC_INIT
+ #define TSS_DTOR_ITERATIONS PTHREAD_DESTRUCTOR_ITERATIONS
+ #else
+@@ -66,7 +65,6 @@ typedef pthread_cond_t  cnd_t;
+ typedef pthread_t       thrd_t;
+ typedef pthread_key_t   tss_t;
+ typedef pthread_mutex_t mtx_t;
+-typedef pthread_once_t  once_flag;
+ 
+ 
+ /*
+@@ -88,15 +86,6 @@ impl_thrd_routine(void *p)
+ }
+ 
+ 
+-/*--------------- 7.25.2 Initialization functions ---------------*/
+-// 7.25.2.1
+-static inline void
+-call_once(once_flag *flag, void (*func)(void))
+-{
+-    pthread_once(flag, func);
+-}
+-
+-
+ /*------------- 7.25.3 Condition variable functions -------------*/
+ // 7.25.3.1
+ static inline int
+--- a/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h.orig
++++ b/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -214,8 +214,4 @@ struct seccomp_notif_addfd {
+ #define SECCOMP_RET_INVALID 0x00010000U  // Illegal return value
+ #endif
+ 
+-#ifndef SYS_SECCOMP
+-#define SYS_SECCOMP                   1
+-#endif
+-
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
diff --git a/www-client/icecat/icecat-140.6.0.ebuild b/www-client/icecat/icecat-140.7.1.ebuild
index 3634daf..0a517e3 100644
--- a/www-client/icecat/icecat-140.6.0.ebuild
+++ b/www-client/icecat/icecat-140.7.1.ebuild
@@ -6,7 +6,7 @@
 EAPI=8
 
 # Using Gentoos firefox patches as system libraries and lto are quite nice
-FIREFOX_PATCHSET="firefox-140esr-patches-04.tar.xz"
+FIREFOX_PATCHSET="firefox-140esr-patches-05.tar.xz"
 FIREFOX_LOONG_PATCHSET="firefox-139-loong-patches-02.tar.xz"
 
 LLVM_COMPAT=( 19 20 21 )
@@ -23,7 +23,7 @@ VIRTUALX_REQUIRED="manual"
 
 # Information about the bundled wasi toolchain from
 # https://github.com/WebAssembly/wasi-sdk/
-WASI_SDK_VER=28.0
+WASI_SDK_VER=30.0
 WASI_SDK_LLVM_VER=21
 
 inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
@@ -53,7 +53,7 @@ SRC_URI="
 S="${WORKDIR}/${PN}-${PV%_*}"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 IUSE="+clang dbus debug hardened hwaccel jack libproxy pgo pulseaudio selinux sndio"
 IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx"
@@ -104,7 +104,6 @@ BDEPEND="${PYTHON_DEPS}
 	)"
 COMMON_DEPEND="${FF_ONLY_DEPEND}
 	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/libffi:=
 	>=dev-libs/nss-3.112.2
@@ -551,8 +550,12 @@ src_prepare() {
 	eapply "${WORKDIR}/firefox-patches"
 	use loong && eapply "${WORKDIR}/firefox-loong-patches"
 
+	if has_version ">=sys-libs/glibc-2.43"; then
+		eapply "${FILESDIR}/icecat-140.7.1-glibc-2.43.patch"
+	fi
+
 	if use system-icu && has_version ">=dev-libs/icu-78.1"; then
-		eapply "${FILESDIR}/firefox-146.0.1-icu78.patch" # in 147, bug #967261
+		eapply "${FILESDIR}/firefox-146.0.1-icu78.patch" # in 147, bug #967261, bgo#967261
 	fi
 
 	# Allow user to apply any additional patches without modifing ebuild
@@ -630,6 +633,8 @@ src_prepare() {
 
 	# Clear checksums from cargo crates we've manually patched.
 	# moz_clear_vendor_checksums xyz
+	# glibc-2.43
+	moz_clear_vendor_checksums glslopt
 
 	# Respect choice for "jumbo-build"
 	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431
diff --git a/www-client/icecat/icecat-140.7.0.ebuild b/www-client/icecat/icecat-140.8.0.ebuild
index 80460e6..8252a7c 100644
--- a/www-client/icecat/icecat-140.7.0.ebuild
+++ b/www-client/icecat/icecat-140.8.0.ebuild
@@ -6,7 +6,7 @@
 EAPI=8
 
 # Using Gentoos firefox patches as system libraries and lto are quite nice
-FIREFOX_PATCHSET="firefox-140esr-patches-05.tar.xz"
+FIREFOX_PATCHSET="firefox-140esr-patches-07.tar.xz"
 FIREFOX_LOONG_PATCHSET="firefox-139-loong-patches-02.tar.xz"
 
 LLVM_COMPAT=( 19 20 21 )
@@ -23,7 +23,7 @@ VIRTUALX_REQUIRED="manual"
 
 # Information about the bundled wasi toolchain from
 # https://github.com/WebAssembly/wasi-sdk/
-WASI_SDK_VER=28.0
+WASI_SDK_VER=30.0
 WASI_SDK_LLVM_VER=21
 
 inherit check-reqs desktop flag-o-matic gnome2-utils linux-info llvm-r1 multiprocessing \
@@ -38,7 +38,7 @@ PATCH_URIS=(
 
 # Icecat tarball generated from https://cgit.git.savannah.gnu.org/cgit/gnuzilla.git
 # Script modified to output zstd tarballs due to size and unpacking speed considerations.
-ICECAT_REV="1gnu1"
+ICECAT_REV="2gnu1"
 
 SRC_URI="
 	https://gitlab.com/api/v4/projects/32909921/packages/generic/${PN}/${PV}-${ICECAT_REV}/${P}-${ICECAT_REV}.tar.zst
@@ -53,7 +53,7 @@ SRC_URI="
 S="${WORKDIR}/${PN}-${PV%_*}"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 IUSE="+clang dbus debug hardened hwaccel jack libproxy pgo pulseaudio selinux sndio"
 IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx"
@@ -106,7 +106,7 @@ COMMON_DEPEND="${FF_ONLY_DEPEND}
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	dev-libs/glib:2
 	dev-libs/libffi:=
-	>=dev-libs/nss-3.112.2
+	>=dev-libs/nss-3.112.3
 	>=dev-libs/nspr-4.36
 	media-libs/alsa-lib
 	media-libs/fontconfig
@@ -629,6 +629,8 @@ src_prepare() {
 
 	# Clear checksums from cargo crates we've manually patched.
 	# moz_clear_vendor_checksums xyz
+	# glslopt: bgo#969412
+	moz_clear_vendor_checksums glslopt
 
 	# Respect choice for "jumbo-build"
 	# Changing the value for FILES_PER_UNIFIED_FILE may not work, see #905431