From: Duncaen <Duncaen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] chromium: update to 108.0.5359.62.
Date: Sun, 04 Dec 2022 14:26:56 +0100 [thread overview]
Message-ID: <20221204132656.tb-tWkWc_kIsG0j_9nEw3gQCe_dnqmhq7n3-XL6QIxs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40848@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-108
https://github.com/void-linux/void-packages/pull/40848
chromium: update to 108.0.5359.62.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/40848.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-108-40848.patch --]
[-- Type: text/x-diff, Size: 15517 bytes --]
From 9c75285312a61bef96979f1019660bc064278757 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 29 Nov 2022 22:16:09 +0100
Subject: [PATCH] chromium: update to 108.0.5359.94.
---
.../musl-patches/xxx-ppc64le-support.patch | 9 ++-
.../chromium/patches/fix-resolver-musl.patch | 22 +++----
srcpkgs/chromium/patches/old-clang.patch | 11 ++++
.../patches/sandbox-sched_getparam.patch | 21 ------
.../patches/use-ffile-compilation-dir.patch | 66 -------------------
.../use-ffile-compilation-dir.patch.args | 1 -
.../chromium/patches/xxx-ppc64le-libvpx.patch | 14 ++--
.../patches/xxx-ppc64le-support.patch | 32 ++-------
srcpkgs/chromium/template | 13 ++--
9 files changed, 46 insertions(+), 143 deletions(-)
create mode 100644 srcpkgs/chromium/patches/old-clang.patch
delete mode 100644 srcpkgs/chromium/patches/sandbox-sched_getparam.patch
delete mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
delete mode 100644 srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
diff --git a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
index c893d9b078fb..555f69c072c8 100644
--- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
@@ -41,13 +41,12 @@ index d53a7ff56..c290f0e92 100644
}
#endif
SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
---- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h.orig
-+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
-
+--- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
++++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
+@@ -22,6 +22,7 @@
// The following platforms have an implementation of a hardware counter.
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
+ defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || defined(__riscv) || \
defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
diff --git a/srcpkgs/chromium/patches/fix-resolver-musl.patch b/srcpkgs/chromium/patches/fix-resolver-musl.patch
index 6bb7aaabb76c..567d74174ede 100644
--- a/srcpkgs/chromium/patches/fix-resolver-musl.patch
+++ b/srcpkgs/chromium/patches/fix-resolver-musl.patch
@@ -29,17 +29,17 @@
}
bool ScopedResState::IsValid() const {
---- a/net/dns/host_resolver_manager.cc.orig
-+++ b/net/dns/host_resolver_manager.cc
-@@ -3015,7 +3015,7 @@
- if (system_dns_config_notifier_)
- system_dns_config_notifier_->AddObserver(this);
+--- a/net/dns/host_resolver_system_task.cc.orig
++++ b/net/dns/host_resolver_system_task.cc
+@@ -311,7 +311,7 @@
+
+ void EnsureSystemHostResolverCallReady() {
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
- !BUILDFLAG(IS_ANDROID)
+ !BUILDFLAG(IS_ANDROID) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
EnsureDnsReloaderInit();
- #endif
-
+ #elif BUILDFLAG(IS_WIN)
+ EnsureWinsockInit();
--- a/net/dns/dns_reloader.cc.orig
+++ b/net/dns/dns_reloader.cc
@@ -7,7 +7,8 @@
@@ -52,9 +52,9 @@
#include <resolv.h>
---- a/net/dns/host_resolver_proc.cc.orig
-+++ b/net/dns/host_resolver_proc.cc
-@@ -177,7 +177,8 @@
+--- a/net/dns/host_resolver_system_task.cc
++++ b/net/dns/host_resolver_system_task.cc
+@@ -397,7 +397,8 @@
base::BlockingType::WILL_BLOCK);
#if BUILDFLAG(IS_POSIX) && \
@@ -63,4 +63,4 @@
+ (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__)))
DnsReloaderMaybeReload();
#endif
- absl::optional<AddressInfo> ai;
+ auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network);
diff --git a/srcpkgs/chromium/patches/old-clang.patch b/srcpkgs/chromium/patches/old-clang.patch
new file mode 100644
index 000000000000..b773d09fbd7d
--- /dev/null
+++ b/srcpkgs/chromium/patches/old-clang.patch
@@ -0,0 +1,11 @@
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1288,7 +1288,7 @@
+ } else {
+ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+ # and -fcoverage-compilation-dir=.
+- cflags += [ "-ffile-compilation-dir=." ]
++ cflags += [ "-fdebug-compilation-dir=." ]
+ swiftflags += [ "-file-compilation-dir=." ]
+ }
+ if (!is_win) {
diff --git a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
deleted file mode 100644
index dfe0bd8f8235..000000000000
--- a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Allow SYS_sched_getparam and SYS_sched_getscheduler
-musl uses them for pthread_getschedparam()
-
-source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
-
---- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-@@ -102,11 +102,11 @@
- #if defined(__arm__) || defined(__aarch64__)
- case __NR_getcpu:
- #endif
-- return Allow();
-- case __NR_sched_getaffinity:
- case __NR_sched_getparam:
- case __NR_sched_getscheduler:
- case __NR_sched_setscheduler:
-+ return Allow();
-+ case __NR_sched_getaffinity:
- return RestrictSchedTarget(GetPolicyPid(), sysno);
- case __NR_prlimit64:
- // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
deleted file mode 100644
index f0ce44c0a487..000000000000
--- a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
-From: Zequan Wu <zequanwu@google.com>
-Date: Tue, 20 Jul 2021 14:13:50 +0000
-Subject: [PATCH] Use -ffile-compilation-dir= instead of
- -fdebug-compilation-dir=
-
-Bug: 1010267
-Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
-Auto-Submit: Zequan Wu <zequanwu@google.com>
-Commit-Queue: Nico Weber <thakis@chromium.org>
-Reviewed-by: Nico Weber <thakis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#903456}
----
- build/config/compiler/BUILD.gn | 18 ++++++++++++------
- build/config/compiler/compiler.gni | 7 ++-----
- 2 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ede07d111c..6db16c1cdd 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1216,12 +1216,19 @@ config("compiler_deterministic") {
- # different build directory like "out/feature_a" and "out/feature_b" if
- # we build same files with same compile flag.
- # Other paths are already given in relative, no need to normalize them.
-- cflags += [
-- "-Xclang",
-- "-fdebug-compilation-dir",
-- "-Xclang",
-- ".",
-- ]
-+ if (is_nacl) {
-+ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
-+ cflags += [
-+ "-Xclang",
-+ "-fdebug-compilation-dir",
-+ "-Xclang",
-+ ".",
-+ ]
-+ } else {
-+ # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
-+ # and -fcoverage-compilation-dir=.
-+ cflags += [ "-ffile-compilation-dir=." ]
-+ }
- if (!is_win) {
- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
- asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
-diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
-index 8c259c360a..642319b4f4 100644
---- a/build/config/compiler/compiler.gni
-+++ b/build/config/compiler/compiler.gni
-@@ -225,11 +225,8 @@ declare_args() {
- # deterministic builds to reduce compile times, so this is less relevant for
- # official builders.
- strip_absolute_paths_from_debug_symbols_default =
-- # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
-- # dependency to absolute path of source files.
-- !use_clang_coverage &&
-- (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
-- is_chromeos || (is_apple && !enable_dsyms))
-+ is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
-+ is_chromeos || (is_apple && !enable_dsyms)
-
- # If the platform uses stripped absolute paths by default, then we don't expose
- # it as a configuration option. If this is causing problems, please file a bug.
diff --git a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args b/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/use-ffile-compilation-dir.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
index 05384cd360ba..0c03ad4a65eb 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
@@ -13,19 +13,19 @@ diff --git a/third_party/libvpx/generate_gni.sh b/third_party/libvpx/generate_gn
index 7429080..43ee29a 100755
--- a/third_party/libvpx/generate_gni.sh
+++ b/third_party/libvpx/generate_gni.sh
-@@ -374,7 +374,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
- gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
- gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+@@ -405,7 +405,7 @@
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
+ gen_config_files linux/loongarch \
+ "--target=loongarch64-linux-gcc ${all_platforms}"
-gen_config_files linux/ppc64 "--target=ppc64le-linux-gcc ${all_platforms}"
+gen_config_files linux/ppc64 "--target=generic-gnu ${all_platforms}"
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
- gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -430,7 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
- gen_rtcd_header linux/arm64-highbd armv8
+ gen_config_files win/arm64 \
+ "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+@@ -468,7 +468,7 @@
gen_rtcd_header linux/mipsel mipsel
gen_rtcd_header linux/mips64el mips64el
+ gen_rtcd_header linux/loongarch loongarch
-gen_rtcd_header linux/ppc64 ppc
+gen_rtcd_header linux/ppc64 generic
gen_rtcd_header linux/generic generic
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 9c9d1a39a4e9..0bc505358916 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3453,24 +3453,6 @@ index bdac4d784..51e0f2cac 100644
typedef vector float v4sf;
# define SIMD_SZ 4
# define VZERO() ((vector float) vec_splat_u8(0))
-diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sksl/SkSLString.cpp
-index ec3e56964..4cf8999a2 100644
---- a/third_party/skia/src/sksl/SkSLString.cpp
-+++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -37,7 +37,12 @@ String to_string(double value) {
- if (needsDotZero) {
- buffer << ".0";
- }
-- return buffer.str();
-+
-+ std::string ret(buffer.str());
-+ if (std::signbit(value) && ret[0] == '.') {
-+ ret[0] = '-';
-+ }
-+ return ret;
- }
-
- bool stod(const StringFragment& s, SKSL_FLOAT* value) {
diff --git a/third_party/sqlite/src/amalgamation/sqlite3.c b/third_party/sqlite/src/amalgamation/sqlite3.c
index 6b4a7899d..b8c7fe414 100644
--- a/third_party/sqlite/src/amalgamation/sqlite3.c
@@ -3566,16 +3548,14 @@ index f39529a3a..e84fc449e 100644
} else if (host_byteorder == "big") {
defines += [ "V8_TARGET_ARCH_PPC_BE" ]
if (current_os == "aix") {
-diff --git a/ui/gl/features.gni b/ui/gl/features.gni
-index 5fda9b6..3d2dd8b 100644
--- a/ui/gl/features.gni
+++ b/ui/gl/features.gni
-@@ -32,5 +32,5 @@
- (target_cpu == "x86" || target_cpu == "x64" ||
- target_cpu == "arm" || target_cpu == "arm64" ||
- target_cpu == "mipsel" || target_cpu == "mips64el" ||
-- target_cpu == "riscv64")
-+ target_cpu == "riscv64" || target_cpu == "ppc64")
+@@ -33,5 +33,5 @@
+ is_chromeos_ash || is_fuchsia) &&
+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm" ||
+ target_cpu == "arm64" || target_cpu == "mipsel" ||
+- target_cpu == "mips64el" || target_cpu == "riscv64")
++ target_cpu == "mips64el" || target_cpu == "riscv64" || target_cpu == "ppc64")
}
diff --git a/v8/test/BUILD.gn b/v8/test/BUILD.gn
index fb872ad39..45fc585dd 100644
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 7ca956340ea0..de4c890de98a 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=107.0.5304.87
+version=108.0.5359.94
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=6c0e00c186e22a1be29177ea410ba40ff0bf65f3ded67a345eb5b17f76c93c59
+checksum=0607518481a8a5b993fb371eec544f7d20e43c2eb706ca7bf40ef584496cb6fe
lib32disabled=yes
@@ -32,7 +32,7 @@ makedepends="libpng-devel gtk+3-devel nss-devel pciutils-devel
minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
ffmpeg-devel libva-devel xcb-proto libcurl-devel
- libxshmfence-devel
+ libxshmfence-devel libavif-devel
$(vopt_if pipewire pipewire-devel) $(vopt_if sndio sndio-devel)"
depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils"
@@ -100,8 +100,8 @@ _setup_clang() {
export CXX=clang++
export AR=llvm-ar
export NM=llvm-nm
- export CFLAGS="-Wno-unknown-warning-option"
- export CXXFLAGS="-Wno-unknown-warning-option"
+ export CFLAGS="-Wno-unknown-warning-option -fdebug-prefix-map=$wrksrc=."
+ export CXXFLAGS="-Wno-unknown-warning-option -fdebug-prefix-map=$wrksrc=."
export LDFLAGS=""
export BUILD_CC=clang
export BUILD_CXX=clang++
@@ -174,6 +174,7 @@ do_configure() {
flac
fontconfig
freetype
+ libavif
libdrm
libevent
libjpeg
@@ -236,7 +237,7 @@ do_configure() {
'enable_hangout_services_extension=true'
'use_system_harfbuzz=false'
- 'use_system_libwayland_server=true'
+ 'use_system_libwayland=true'
'use_system_wayland_scanner=true'
'use_qt=false'
next prev parent reply other threads:[~2022-12-04 13:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 21:17 [PR PATCH] " Duncaen
2022-11-30 22:19 ` [PR PATCH] [Updated] " Duncaen
2022-12-04 13:26 ` Duncaen [this message]
2022-12-04 13:27 ` Duncaen
2022-12-11 22:19 ` Duncaen
2022-12-11 22:31 ` Duncaen
2022-12-23 14:59 ` Duncaen
2022-12-23 22:14 ` Duncaen
2022-12-24 0:07 ` Duncaen
2022-12-24 0:08 ` [PR PATCH] [Merged]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221204132656.tb-tWkWc_kIsG0j_9nEw3gQCe_dnqmhq7n3-XL6QIxs@z \
--to=duncaen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).