summaryrefslogtreecommitdiff
path: root/www-client
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/Manifest.gzbin6200 -> 6203 bytes
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/files/chromium-112-swiftshader.patch52
-rw-r--r--www-client/firefox/Manifest4
-rw-r--r--www-client/firefox/firefox-112.0.1.ebuild17
5 files changed, 67 insertions, 8 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index aeb320a60436..9b6f5d3ad487 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
Binary files differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d756379f5e23..bf491dba0884 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,7 +8,7 @@ AUX chromium-112-gcc-mno-outline.patch 1203 BLAKE2B 82dcb024fbd4e032a998b0fbaf21
AUX chromium-112-libstdc++-1.patch 3045 BLAKE2B 195dd794a4a00fb0a354ca6e8c56c102112c672ffeb28363874788aff1f3ffbf620b23fa39f824923bf5c009424f6bf01050950d5d277abf59c9944159166aa1 SHA512 29f422a076120f0de98b6af6eb2936bf4a924fd9d5cc5c4fa5bda9f6cf51288f51ba32149233030f9cb5c1382330601a67cb824bdd33cddb5c26ea5cea16606b
AUX chromium-112-libstdc++.patch 2874 BLAKE2B f354b06944a761556b6d0465aee2a1dd701b18cdd272a1aa4aa68405ad05f575d1f0ef04ca2b05d5e65ce54efab31cfdf95e8963613ef7c811aaf343662e4b62 SHA512 b0307d10708b0ea9f94e941b9b734a16b4f74b7149e11cd6b30532835074e773c3499f954f38935bf7f16ebbda6dcf53695b513e56ff5bb0d810b4b1a6f4d3ac
AUX chromium-112-sql-relax.patch 2064 BLAKE2B 37f362da2af26481f15f705466ce1eb282759ddad0cdc34a967120e26a2894bd5a1f22b69f6b3749a84bd1b155c55cbaeffebb2b7405d5eb80c7c59124a90ba4 SHA512 83e852e6710a748030b001fccede282830c00db102f338dfd92a0a86865d0f25456ae9adc3ab5b33719b156b8f0274df347c18e4670c53e57568afdeaf874804
-AUX chromium-112-swiftshader.patch 3030 BLAKE2B 58add1fc66fbc2b81f075f382fb01d9412c92e0e4c8b6b3c1c6ffcc0d7ae0fd9c4dbf547f7669b8a2cbc1dcad0f39291bf5ce409170ae1eda87abc3bd2a281af SHA512 ee0c949eff70c8687d7491f4f78b6c5f6b7f55c7b693fbeaf18d618604e0c87793826246398aa4d896a07d4481a72824d64140237cd39750649dd61ecc0f2acc
+AUX chromium-112-swiftshader.patch 4852 BLAKE2B d1e5008b6d2f2150d7b86b8a4495532f5c8e458e6cdcdce565d8efde2d1f2c72409218bdaab02b56f451ca141df4f0ca7afca41c1dd0ffe83db2362675aa2c3b SHA512 62c18e64acbfc6d91b82a4501a01c86a59d2aa46eb446fa0cf036f42b73b7e91f6bc3603ccca8a06eaf3da9ffcbd052dc1d77f86148777cad709ee7eaadbfd7f
AUX chromium-98-gtk4-build.patch 3044 BLAKE2B 782dfd31a3a82d62dc0b8ffbb85cf2dbbef1c6cc47dbd8409dc0777be8d019c4ca082d75e6114b09f880f4f3e886d0f4b9631e66d46a3129e41468b70d71404c SHA512 e8acbf85274813ec81d575727b0e5d107749242d1df80e05035c9273ca0466d7358a8d7cece16c09f6996cb49ad3b1e0dcdf052af45023236f53fa6262b4e441
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
diff --git a/www-client/chromium/files/chromium-112-swiftshader.patch b/www-client/chromium/files/chromium-112-swiftshader.patch
index 5f703d919555..9d67841a1dea 100644
--- a/www-client/chromium/files/chromium-112-swiftshader.patch
+++ b/www-client/chromium/files/chromium-112-swiftshader.patch
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/904725
+https://bugs.gentoo.org/904850
From 451fb9470e4e1cd183ff05d5e171dc21bae6e47c Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jdapena@igalia.com>
@@ -29,8 +30,6 @@ Tested-by: Shahbaz Youssefi <syoussefi@google.com>
Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
---
-diff --git a/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h b/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
-index 620209b..d0a48e8 100644
--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
+++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
@@ -1415,9 +1415,9 @@
@@ -72,3 +71,52 @@ index 620209b..d0a48e8 100644
Result = Other.Result;
return *this;
}
+From e4dea744b7838470757f010fc2ff4b92f02b3fac Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Thu, 16 Mar 2023 13:29:54 +0100
+Subject: [PATCH] More C++20 fixes
+
+Partial backport of llvm-project patch:
+ commit 2ccf0b76bcaf0895e04f14e3ff53c59dd96f9f0f
+ Author: Evgeny Mandrikov <mandrikov@gmail.com>
+ Date: Thu Jan 6 17:01:05 2022 +0100
+
+ Fix build failure with GCC 11 in C++20 mode
+
+ See https://wg21.link/cwg2237
+
+ Reviewed By: shafik, dexonsmith
+
+ Differential Revision: https://reviews.llvm.org/D115355
+
+Bug: chromium:819294
+Change-Id: I90d58b6fc601f9a4f615e2f6edc13a73ce848e4f
+Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71089
+Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
+Tested-by: Shahbaz Youssefi <syoussefi@google.com>
+Kokoro-Result: kokoro <noreply+kokoro@google.com>
+Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
+---
+
+--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
+@@ -718,7 +718,7 @@
+ T *P;
+
+ public:
+- SingleLinkedListIterator<T>(T *P) : P(P) {}
++ SingleLinkedListIterator(T *P) : P(P) {}
+
+ SingleLinkedListIterator<T> &operator++() {
+ P = P->Next;
+--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h
++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h
+@@ -324,7 +324,7 @@
+ FixedStreamArrayIterator(const FixedStreamArray<T> &Array, uint32_t Index)
+ : Array(Array), Index(Index) {}
+
+- FixedStreamArrayIterator<T>(const FixedStreamArrayIterator<T> &Other)
++ FixedStreamArrayIterator(const FixedStreamArrayIterator<T> &Other)
+ : Array(Other.Array), Index(Other.Index) {}
+ FixedStreamArrayIterator<T> &
+ operator=(const FixedStreamArrayIterator<T> &Other) {
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3a18eb5b219a..40ac1d2d1c80 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -107,7 +107,7 @@ DIST firefox-102.10.0esr-zh-TW.xpi 614579 BLAKE2B f43efdbc63293629474fb02f5cae5c
DIST firefox-102.10.0esr.source.tar.xz 479026088 BLAKE2B b4d8eaa6d72b009d12b435781c360f043bca7554d8b069b8d858399ece03f20703d7e36427a3f92d0b801a94b1c3f132904f21e51ba4118116bbfa4e5668d651 SHA512 f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b
DIST firefox-102esr-patches-10j.tar.xz 21744 BLAKE2B 326f206dfcd5b6ea2f06f5f537505e23d358f6d7930f7e72fd8e54af88d97172170999c246af888278143810df42be9414541e47feb48b60732565a4ee38579e SHA512 5efa50b221abedbb84c1b3d19d8ac089ac5752448e8c90c6aed9f43bf3eee876b7e7050a1678bca65f6b23734c4945b016bf059a3921ad7290b0150538111bbd
DIST firefox-112-patches-02j.tar.xz 17296 BLAKE2B c47545a6eeec32c9a15aa0a5f9f4535e186a2b8e7c140b10f9e8665b90f9d1c74673dbbcd3e0e6e3a2232fe060f340884dbb431d755bf21537923efb4bb430e1 SHA512 d90c8cc81f5c885bce35d6872162eaefa529a37db905424eba2e223f3f02a22ecf63b503550df77d7e73b539573f2169b2f6c99e7a46623be1492467ee19782d
-DIST firefox-112-patches-04j.tar.xz 19448 BLAKE2B f93760e9c314f839d7db982b2b904cfe92de3bdd8006ba6fd783909c5fef2a7722fc60b22bdde0a9d833a956a7143b01663054d1c2a59b8c6a2151f9111c9f28 SHA512 30b27c0b1a66eb785654c624fc33ea148b587ba567b26dcb089603444b22b714052bf387c8c4e9288cc610456405b42b0c7e126bfaf37533bfbebad5f4349f28
+DIST firefox-112-patches-05j.tar.xz 20408 BLAKE2B 6ce921497a6d51d66d9f819a10c823a32090f81a77d5a7ec1c7f5f04c3dcd998c1999dcfbf512f2c028f99e49b41e44ba82dec0ea86d635f7e76904f460482b3 SHA512 56db4a7458bcbb000260ceef1dcabb9df9037dd6988cd710dcc98d63f9030baea411ce3f23eeede48dc87f0cc90689c26add328049d18f7061c5facf71b4e031
DIST firefox-112.0-ach.xpi 459577 BLAKE2B 3adb567d9b02f04e869236b7863d2f7425fe721f0c26bafd21aef30b0a761fc7dc0aedc7abf99429d6da19c6c33d4a7669edb1531526822e20d54d802f2bd92f SHA512 e3a0487ca57ba731bfbacf7628f497b623a68324d9464a73d18e36d3331dde434d05b73abe3d8864ce684d4bddd4d20b73ee53c397dfa9f665360dd612c7fc63
DIST firefox-112.0-af.xpi 423010 BLAKE2B 6f87c4cc3eab518c111793860845c34b3131d50500211b0e5b813b376c8a13d5aee071a40e9172e2482994234d4d5764e14a24bb68a9ae8b4b86e8bcb6f0b97a SHA512 000fd456377692eca76efde709d8526c599a38fb9839018cee726ca6359d3356f42f8620b892a9082cd8dcbad5c6be1346c7ef9bfed0b97910f7a343dc0e2cac
DIST firefox-112.0-an.xpi 503915 BLAKE2B 2e7e5fa8a7ade25e28edf32402a3132333019938d315483bacd3156c7c1cdeebae037d144f67a04d3dc16004012d0d855b5091249f83ebb55c84b680c903cce7 SHA512 45915bb76a712cfd437526f59bb56ce7b493bdc636f783cea1f7e4809d178189ac4622b733465147c82fece78cb49a5f81bb3ef91ee5c6f4ef55415bba55b672
@@ -309,6 +309,6 @@ DIST firefox-112.0.1-zh-TW.xpi 607189 BLAKE2B 95d3484406e81f2e82e3e6aa4530f3dfd7
DIST firefox-112.0.1.source.tar.xz 506649248 BLAKE2B 99f38d96cd3d2bc68835ee0fdbf2e9e3ab54324409092cd11ade096d8cf678e1fd69087897a4a4d9c4a30cdb08e0e14b881ef834028dec7598ee55eaae301f80 SHA512 23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50
DIST firefox-112.0.source.tar.xz 497250760 BLAKE2B 6233ee202d000ddd5b0a2eafff09226abf2cf097ea3e1184442ad34e92f6fd408f1891a2063e459d419ba074218596f48c95c860246d4c46d2a4fca3df27a78a SHA512 6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39
EBUILD firefox-102.10.0.ebuild 36945 BLAKE2B 7fa69a1943348e1dddb8143d3012a185054f66cb5d5147a9e69f502c7e29267c5e4ac06b6bad86e55122fb155c176912568fac3e8ef2daaac66ce4d9988a4575 SHA512 4f475808715fde3565fe415d0e8321ae38aba1c253824b6ee8f5fb1041beb935c516fe4ef034ca3ab736db968b99024ff2ee891d8cd30b5dd588e31439a0d6c2
-EBUILD firefox-112.0.1.ebuild 40295 BLAKE2B 37de28a9494525dcccbcdb772da358cee92296f6658cfd97d13a00377e3d31d91a2ecb62c8c8f040269bb0389266f02cfdc62517bb39f5bf0bbf278333bc9431 SHA512 3c08ec991b495f85453124a38cab332882126967c492075e76aa7c1aed3554483a22d8b9082e003f6eadaade933b330bce8e2520f4e706ee77b596f7db262ca8
+EBUILD firefox-112.0.1.ebuild 40683 BLAKE2B ef6baa60c362da114e541a27552b3760fb11fb805a9b36e5b512813553f3dfa0aa5866c3f7ac1a77f538ee567953a88d406f4c07cc64d5a76285063bb0d2cd34 SHA512 300434b037088b4fdf63a4ddd9219b46a2736f7db3e08ee3f07aa0c31337ded7c7baa38280abdb2179afa3a4659e13983ffb28aae242cefae1137c458062b052
EBUILD firefox-112.0.ebuild 40323 BLAKE2B caa6d90fe78953e687a6ec6ef08ee1a4ceb77e05788064797bcc16b26386d48c5de09e7cd56b5b76946e4b4c2f60d6bc711a567c50b3908c7c062386b754a1ed SHA512 4c699107ec5e65a234dcf97eaaa4ded39a9f07382a06f2b51ac98a9a9c7dd63f8cb2fcd5be1f1f7eb22013685e87de7f3bde535722df66d1885abfbcdee24828
MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-112.0.1.ebuild b/www-client/firefox/firefox-112.0.1.ebuild
index 5e54183d96e8..ca950d5be751 100644
--- a/www-client/firefox/firefox-112.0.1.ebuild
+++ b/www-client/firefox/firefox-112.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-FIREFOX_PATCHSET="firefox-112-patches-04j.tar.xz"
+FIREFOX_PATCHSET="firefox-112-patches-05j.tar.xz"
LLVM_MAX_SLOT=15
@@ -65,7 +65,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi +X"
+IUSE+=" telemetry wayland wifi +X"
# Firefox-only IUSE
IUSE+=" geckodriver +gmp-autoupdate screencast"
@@ -460,9 +460,11 @@ virtwl() {
debug-print "${FUNCNAME}: $@"
"$@"
+ local r=$?
[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
+ return $r
}
pkg_pretend() {
@@ -742,7 +744,9 @@ src_configure() {
mozconfig_add_options_ac '' --enable-project=browser
# Set Gentoo defaults
- export MOZILLA_OFFICIAL=1
+ if use telemetry; then
+ export MOZILLA_OFFICIAL=1
+ fi
mozconfig_add_options_ac 'Gentoo default' \
--allow-addon-sideload \
@@ -1051,6 +1055,13 @@ src_configure() {
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
fi
+ if ! use telemetry; then
+ mozconfig_add_options_mk '-telemetry setting' "MOZ_CRASHREPORTER=0"
+ mozconfig_add_options_mk '-telemetry setting' "MOZ_DATA_REPORTING=0"
+ mozconfig_add_options_mk '-telemetry setting' "MOZ_SERVICES_HEALTHREPORT=0"
+ mozconfig_add_options_mk '-telemetry setting' "MOZ_TELEMETRY_REPORTING=0"
+ fi
+
# Disable notification when build system has finished
export MOZ_NOSPAM=1
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 05:07:31 +0000