* [PR PATCH] chromium: update to 114.0.5735.106.
@ 2023-06-06 11:38 Duncaen
2023-06-06 11:44 ` [PR PATCH] [Updated] " Duncaen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Duncaen @ 2023-06-06 11:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-114
https://github.com/void-linux/void-packages/pull/44295
chromium: update to 114.0.5735.106.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/44295.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-114-44295.patch --]
[-- Type: text/x-diff, Size: 16305 bytes --]
From 3a8417ee37497a4221b9983e7af31b35be700cd2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 13:34:57 +0200
Subject: [PATCH] chromium: update to 114.0.5735.106.
---
...g-for-std-strlen-in-web_view_impl.cc.patch | 29 -------
...typename-s-that-are-required-in-C-17.patch | 45 +++++++++++
...karound_clang_bug-structured_binding.patch | 32 --------
...karound_clang_bug-structured_binding.patch | 81 +++++++++++++++++++
.../patches/cursed^Uscoped_file.patch | 18 +++--
srcpkgs/chromium/template | 20 ++---
6 files changed, 144 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
create mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index 6648fab5719d..000000000000
--- a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
---
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
-
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 000000000000..35b7152cbbdb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+ RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result) {
++ typename std::remove_reference<T>::type... result) {
+ auto found_callbacks_map = saved_callbacks.find(remote_id);
+ if (found_callbacks_map == saved_callbacks.end())
+ return; // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+ template <class... T>
+ void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result);
++ typename std::remove_reference<T>::type... result);
+
+ // Test support for client ID management.
+ static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
deleted file mode 100644
index c3e87c9f589a..000000000000
--- a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
-workaround llvm15 compiler bug
-diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-05-03 16:30:34.244612573 +0200
-+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-03 16:37:36.732278590 +0200
-@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData();
-+
-+ auto& workaround_clang_bug = sizing_tree->CreateSizingData();
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- NGGridSizingTree* sizing_tree) const {
- DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
-
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->At(current_grid_index);
-+ auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..af8e737059c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+ : BuildGridSizingTree(&oof_children);
+
+ LayoutUnit intrinsic_block_size;
+- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& tree_size = t_s;
+
+ if (IsBreakInside(BreakToken())) {
+ // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+ row_auto_repetitions);
+
+ bool has_nested_subgrid = false;
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ if (!must_ignore_children) {
+ // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+ NGGridSizingTree sizing_tree;
+
+ if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree.CreateSizingData();
++ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const auto& node = Node();
+ grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+ const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+ InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
diff --git a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
index 2e5433f7abce..321f6486a5dd 100644
--- a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
+++ b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
@@ -1,18 +1,22 @@
---- a/base/files/scoped_file_linux.cc.orig
+--- a/base/files/scoped_file_linux.cc
+++ b/base/files/scoped_file_linux.cc
-@@ -77,15 +77,3 @@
+@@ -94,19 +94,3 @@
+ return reinterpret_cast<LibcCloseFuncPtr>(dlsym(RTLD_NEXT, "close"));
+ #endif
}
-
- } // namespace base
-
-extern "C" {
-
--int __close(int);
--
+-NO_SANITIZE("cfi-icall")
-__attribute__((visibility("default"), noinline)) int close(int fd) {
+- static LibcCloseFuncPtr libc_close = LoadCloseSymbol();
- if (base::IsFDOwned(fd) && g_is_ownership_enforced)
- CrashOnFdOwnershipViolation();
-- return __close(fd);
+- if (libc_close == nullptr) {
+- RAW_LOG(ERROR, "close symbol missing\n");
+- base::ImmediateCrash();
+- }
+- return libc_close(fd);
-}
-
-} // extern "C"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index cafc2fe324c6..b4a39dfd3815 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,12 +1,11 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=113.0.5672.92
+version=114.0.5735.106
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
- $(vopt_if js_optimize openjdk)
bison git gperf hwids ninja nodejs perl pkg-config python3
libatomic-devel libepoxy-devel libevent-devel libglib-devel"
makedepends="
@@ -17,8 +16,8 @@ makedepends="
libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
- pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel libffi-devel
+ pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -28,15 +27,14 @@ 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=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
+checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
lib32disabled=yes
-build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
+build_options="clang debug vaapi pulseaudio sndio pipewire"
build_options_default="clang vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
-desc_option_js_optimize="Optimize the JS used for Chromium's UI"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
if [ "$XBPS_LIBC" = musl ]; then
@@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
$(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
- libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
- mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
+ libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
+ mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
fi
@@ -158,7 +156,6 @@ do_configure() {
libxml
libxslt
opus
- re2
snappy
"
@@ -219,9 +216,6 @@ do_configure() {
# deprecated
'use_gnome_keyring=false'
- # https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
- "enable_js_type_check=$(vopt_if js_optimize true false)"
-
"use_pulseaudio=$(vopt_if pulseaudio true false)"
"link_pulseaudio=$(vopt_if pulseaudio true false)"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 114.0.5735.106.
2023-06-06 11:38 [PR PATCH] chromium: update to 114.0.5735.106 Duncaen
@ 2023-06-06 11:44 ` Duncaen
2023-06-07 16:44 ` Duncaen
2023-06-13 11:35 ` [PR PATCH] [Closed]: " Duncaen
2 siblings, 0 replies; 4+ messages in thread
From: Duncaen @ 2023-06-06 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-114
https://github.com/void-linux/void-packages/pull/44295
chromium: update to 114.0.5735.106.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/44295.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-114-44295.patch --]
[-- Type: text/x-diff, Size: 15977 bytes --]
From a14e010c3995fa88e921f48e1913842735849432 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 13:34:57 +0200
Subject: [PATCH] chromium: update to 114.0.5735.106.
---
...g-for-std-strlen-in-web_view_impl.cc.patch | 29 -------
...typename-s-that-are-required-in-C-17.patch | 45 +++++++++++
...karound_clang_bug-structured_binding.patch | 32 --------
...karound_clang_bug-structured_binding.patch | 81 +++++++++++++++++++
.../patches/cursed^Uscoped_file.patch | 18 -----
srcpkgs/chromium/template | 20 ++---
6 files changed, 133 insertions(+), 92 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
create mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
delete mode 100644 srcpkgs/chromium/patches/cursed^Uscoped_file.patch
diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index 6648fab5719d..000000000000
--- a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
---
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
-
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 000000000000..35b7152cbbdb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+ RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result) {
++ typename std::remove_reference<T>::type... result) {
+ auto found_callbacks_map = saved_callbacks.find(remote_id);
+ if (found_callbacks_map == saved_callbacks.end())
+ return; // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+ template <class... T>
+ void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result);
++ typename std::remove_reference<T>::type... result);
+
+ // Test support for client ID management.
+ static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
deleted file mode 100644
index c3e87c9f589a..000000000000
--- a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
-workaround llvm15 compiler bug
-diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-05-03 16:30:34.244612573 +0200
-+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-03 16:37:36.732278590 +0200
-@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData();
-+
-+ auto& workaround_clang_bug = sizing_tree->CreateSizingData();
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- NGGridSizingTree* sizing_tree) const {
- DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
-
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->At(current_grid_index);
-+ auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..af8e737059c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+ : BuildGridSizingTree(&oof_children);
+
+ LayoutUnit intrinsic_block_size;
+- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& tree_size = t_s;
+
+ if (IsBreakInside(BreakToken())) {
+ // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+ row_auto_repetitions);
+
+ bool has_nested_subgrid = false;
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ if (!must_ignore_children) {
+ // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+ NGGridSizingTree sizing_tree;
+
+ if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree.CreateSizingData();
++ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const auto& node = Node();
+ grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+ const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+ InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
diff --git a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
deleted file mode 100644
index 2e5433f7abce..000000000000
--- a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/base/files/scoped_file_linux.cc.orig
-+++ b/base/files/scoped_file_linux.cc
-@@ -77,15 +77,3 @@
- }
-
- } // namespace base
--
--extern "C" {
--
--int __close(int);
--
--__attribute__((visibility("default"), noinline)) int close(int fd) {
-- if (base::IsFDOwned(fd) && g_is_ownership_enforced)
-- CrashOnFdOwnershipViolation();
-- return __close(fd);
--}
--
--} // extern "C"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index cafc2fe324c6..b4a39dfd3815 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,12 +1,11 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=113.0.5672.92
+version=114.0.5735.106
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
- $(vopt_if js_optimize openjdk)
bison git gperf hwids ninja nodejs perl pkg-config python3
libatomic-devel libepoxy-devel libevent-devel libglib-devel"
makedepends="
@@ -17,8 +16,8 @@ makedepends="
libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
- pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel libffi-devel
+ pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -28,15 +27,14 @@ 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=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
+checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
lib32disabled=yes
-build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
+build_options="clang debug vaapi pulseaudio sndio pipewire"
build_options_default="clang vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
-desc_option_js_optimize="Optimize the JS used for Chromium's UI"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
if [ "$XBPS_LIBC" = musl ]; then
@@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
$(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
- libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
- mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
+ libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
+ mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
fi
@@ -158,7 +156,6 @@ do_configure() {
libxml
libxslt
opus
- re2
snappy
"
@@ -219,9 +216,6 @@ do_configure() {
# deprecated
'use_gnome_keyring=false'
- # https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
- "enable_js_type_check=$(vopt_if js_optimize true false)"
-
"use_pulseaudio=$(vopt_if pulseaudio true false)"
"link_pulseaudio=$(vopt_if pulseaudio true false)"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 114.0.5735.106.
2023-06-06 11:38 [PR PATCH] chromium: update to 114.0.5735.106 Duncaen
2023-06-06 11:44 ` [PR PATCH] [Updated] " Duncaen
@ 2023-06-07 16:44 ` Duncaen
2023-06-13 11:35 ` [PR PATCH] [Closed]: " Duncaen
2 siblings, 0 replies; 4+ messages in thread
From: Duncaen @ 2023-06-07 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-114
https://github.com/void-linux/void-packages/pull/44295
chromium: update to 114.0.5735.106.
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/44295.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-114-44295.patch --]
[-- Type: text/x-diff, Size: 51783 bytes --]
From f76459fbfaaab554108cd4d144558e7b4a01d8a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:06:35 -0400
Subject: [PATCH 01/26] New package: python3-lazy_loader-0.2
---
srcpkgs/python3-lazy_loader/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-lazy_loader/template
diff --git a/srcpkgs/python3-lazy_loader/template b/srcpkgs/python3-lazy_loader/template
new file mode 100644
index 000000000000..492c98124834
--- /dev/null
+++ b/srcpkgs/python3-lazy_loader/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-lazy_loader'
+pkgname=python3-lazy_loader
+version=0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="Populate Python namespace without incurring immediate import costs"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/scientific-python/lazy_loader"
+changelog="https://raw.githubusercontent.com/scientific-python/lazy_loader/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/l/lazy_loader/lazy_loader-${version}.tar.gz"
+checksum=0edc7a5175c400acb108f283749951fefdadedeb00adcec6e88b974a9254f18a
+
+post_install() {
+ vlicense LICENSE.md
+}
From 0ea7125c1a2b8cf8805f016b23d549d31874bf64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:06:36 -0400
Subject: [PATCH 02/26] New package: python3-pyproject-metadata-0.7.1
---
srcpkgs/python3-pyproject-metadata/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-pyproject-metadata/template
diff --git a/srcpkgs/python3-pyproject-metadata/template b/srcpkgs/python3-pyproject-metadata/template
new file mode 100644
index 000000000000..fcf5c5d22593
--- /dev/null
+++ b/srcpkgs/python3-pyproject-metadata/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproject-metadata'
+pkgname=python3-pyproject-metadata
+version=0.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core python3-wheel"
+depends="python3-packaging"
+short_desc="PEP 621 metadata parsing"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://pep621.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/FFY00/python-pyproject-metadata/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyproject-metadata/pyproject-metadata-${version}.tar.gz"
+checksum=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67
+make_check=no # tarball includes no tests
+
+post_install() {
+ vlicense LICENSE
+}
From 9a73ca39502ca952f63a71d7314746af62cbd4ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:48:57 -0400
Subject: [PATCH 03/26] New package: python3-meson-python-0.13.1
---
srcpkgs/python3-meson-python/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-meson-python/template
diff --git a/srcpkgs/python3-meson-python/template b/srcpkgs/python3-meson-python/template
new file mode 100644
index 000000000000..57f3b808c83e
--- /dev/null
+++ b/srcpkgs/python3-meson-python/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-meson-python'
+pkgname=python3-meson-python
+version=0.13.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="meson python3-pyproject-metadata"
+depends="meson python3-pyproject-metadata patchelf"
+short_desc="Meson PEP 517 Python build backend"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://meson-python.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/mesonbuild/meson-python/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/m/meson_python/meson_python-${version}.tar.gz"
+checksum=63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618
+# tests require custom-built executables, need reconciliation with xbps-src env
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 8342faf5f853303045375e0139825690a2e20e7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:09:26 -0400
Subject: [PATCH 04/26] python3-scikit-image: update to 0.21.0.
---
.../patches/meson-cross.patch | 93 +++++++++++++++++++
.../patches/numpy-version.patch | 14 +++
srcpkgs/python3-scikit-image/template | 59 +++++++++---
3 files changed, 151 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/python3-scikit-image/patches/meson-cross.patch
create mode 100644 srcpkgs/python3-scikit-image/patches/numpy-version.patch
diff --git a/srcpkgs/python3-scikit-image/patches/meson-cross.patch b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
new file mode 100644
index 000000000000..8807a612f665
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
@@ -0,0 +1,93 @@
+From 8789a3365282a4f5604e090a10c960e710d240b9 Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh@sideband.org>
+Date: Tue, 6 Jun 2023 10:05:25 -0400
+Subject: [PATCH] meson: allow proper selection of NumPy, Pythran in cross
+ builds
+
+---
+ skimage/meson.build | 62 +++++++++++++++++++++++++++------------------
+ 1 file changed, 38 insertions(+), 24 deletions(-)
+
+diff --git a/skimage/meson.build b/skimage/meson.build
+index 28c831312..c168389d7 100644
+--- a/skimage/meson.build
++++ b/skimage/meson.build
+@@ -29,37 +29,51 @@ if is_windows
+ endif
+ endif
+
+-# NumPy include directory - needed in all submodules
+-incdir_numpy = run_command(py3,
+- [
+- '-c',
+- 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
+- ],
+- check: true
+-).stdout().strip()
++# Both NumPy and Pythran require header files that may differ between the build
++# system and the host system in a cross-compilation environment. To accommodate
++# these cases, we can query user-defined properties that can be specified in
++# the 'properties' section of a Meson cross file:
++#
++# [properties]
++# numpy-include-dir = '/path/to/numpy/includes'
++# pythran-include-dir = '/path/to/pythran/includes'
++#
++# In the absence of explicitly configured paths, just run the build Python and
++# try to query the Python packages for their paths directly.
++
++# NumPy include directory
++incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
++if incdir_numpy == 'not-given'
++ # If not specified, try to query NumPy from the build python
++ incdir_numpy = run_command(py3,
++ [
++ '-c',
++ 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
++ ],
++ check: true
++ ).stdout().strip()
++endif
+
+ inc_np = include_directories(incdir_numpy)
+
+ cc = meson.get_compiler('c')
+
+-# Pythran include directory and build flags
+-use_pythran = run_command(py3,
+- [
+- '-c',
+- 'import os; print(os.environ.get("SCIPY_USE_PYTHRAN", 1))'
+- ],
+- check: true
+-).stdout().strip() == '1'
+-
+-incdir_pythran = run_command(py3,
+- [
+- '-c',
+- 'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
+- ],
+- check: true
+-).stdout().strip()
++# Pythran include directory
++incdir_pythran = meson.get_external_property('pythran-include-dir', 'not-given')
++if incdir_pythran == 'not-given'
++ # If not specified, try to query Pythran from the build python
++ incdir_pythran = run_command(py3,
++ [
++ '-c',
++ 'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
++ ],
++ check: true
++ ).stdout().strip()
++endif
++
+ inc_pythran = include_directories(incdir_pythran)
+
++# Pythran build flags
+ cpp_args_pythran = [
+ '-DENABLE_PYTHON_MODULE',
+ '-D__PYTHRAN__=3',
+--
+2.41.0
+
diff --git a/srcpkgs/python3-scikit-image/patches/numpy-version.patch b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
new file mode 100644
index 000000000000..9d3a96588edd
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
@@ -0,0 +1,14 @@
+There doesn't seem to be a valid reason for this restriction, and it doesn't
+impede building anyway.
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -145,7 +145,7 @@
+ "numpy==1.21.1; python_version=='3.8' and platform_python_implementation != 'PyPy'",
+ "numpy==1.21.1; python_version=='3.9' and platform_python_implementation != 'PyPy'",
+ "numpy==1.21.6; python_version=='3.10' and platform_system != 'Windows' and platform_python_implementation != 'PyPy'",
+- "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
++ "numpy>=1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
+ "numpy; python_version>='3.12'",
+ "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'",
+ ]
diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index c3b403fdef61..e800ed4f00f6 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,28 +1,57 @@
# Template file for 'python3-scikit-image'
pkgname=python3-scikit-image
-version=0.19.3
-revision=2
-_pkgname="${pkgname#python3-}"
-build_style=python3-module
-build_helper="numpy"
-hostmakedepends="python3-Cython python3-wheel python3-numpy
- python3-packaging python3-setuptools pythran"
-makedepends="python3-devel"
-depends="python3-scipy python3-numpy python3-imageio python3-matplotlib
- python3-networkx python3-tifffile python3-pywt python3-packaging"
+version=0.21.0
+revision=1
+build_style=meson
+build_helper="python3"
+hostmakedepends="python3-build python3-installer python3-meson-python
+ python3-wheel python3-setuptools python3-packaging python3-Cython pythran
+ python3-lazy_loader python3-numpy pkg-config"
+makedepends="python3-devel python3-numpy pythran"
+depends="python3-numpy python3-scipy python3-networkx python3-Pillow
+ python3-imageio python3-tifffile python3-pywt python3-packaging
+ python3-lazy_loader"
short_desc="Image processing in Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, MIT"
homepage="https://scikit-image.org/"
-distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=4eb877c98d1395769daef5bc2ba8a7efd3f736c87086aecb3775a9174593398b
+distfiles="https://github.com/scikit-image/scikit-image/archive/v${version}.tar.gz"
+checksum=53a82a9dbd3ed608d2ad3876269a271a7e922b12e228388eac996b508aadd652
# Tests require data files and unpackaged dependencies
make_check=no
-pre_build() {
- make_build_args+=" ${makejobs}"
+if [ "${CROSS_BUILD}" ]; then
+ configure_args="--cross-file=python.cross"
+fi
+
+pre_patch() {
+ if [ "${CROSS_BUILD}" ]; then
+ # Meson can't tolerate $CC with arguments as set by build helper
+ CC="${XBPS_CROSS_TRIPLET}-gcc"
+ # CXX needs to know where to find Python headers
+ CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+ fi
+}
+
+post_patch() {
+ if [ "${CROSS_BUILD}" ]; then
+ local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}"
+ cat > python.cross <<-EOF
+ [properties]
+ numpy-include-dir = '${_xpy}/numpy/core/include'
+ pythran-include-dir = '${_xpy}/pythran'
+ EOF
+ fi
+}
+
+do_build() {
+ # Use the build directory already configured by xbps-src for meson
+ python3 -m build --no-isolation --wheel \
+ -Cbuilddir="./build" -Ccompile-args="${makejobs}" .
}
-post_install() {
+do_install() {
+ python3 -m installer --destdir "${DESTDIR}" \
+ --no-compile-bytecode dist/*.whl
vlicense LICENSE.txt
}
From 8cc8693cd09478241b7ad3989a824919234fd8be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:12:58 -0400
Subject: [PATCH 05/26] python3-MarkupSafe: update to 2.1.3.
---
srcpkgs/python3-MarkupSafe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index e164956b0e2c..ce9f7dc13108 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
# Template file for 'python3-MarkupSafe'
pkgname=python3-MarkupSafe
-version=2.1.2
+version=2.1.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://palletsprojects.com/p/markupsafe/"
distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d
+checksum=af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad
post_install() {
vlicense LICENSE.rst
From abefd83a58b34dcc5d22ae3223036ef7744e125e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:14:59 -0400
Subject: [PATCH 06/26] python3-cryptography_vectors: update to 41.0.1.
---
srcpkgs/python3-cryptography_vectors/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 8a900ad9d118..122780dbe152 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography_vectors'
pkgname=python3-cryptography_vectors
-version=41.0.0
+version=41.0.1
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=7c77787f6f1e3065aed0af9b0113d3736f2d0a80e0ed1ddbd296cf5ac638df00
+checksum=23b08c39777ec7b2774a11f945d1746301b1e88ecff2e5326d7f50ea0f42d580
post_install() {
vlicense LICENSE
From b61d016fed4dcb4f148c83cad99bf6e7f92e7923 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:16:54 -0400
Subject: [PATCH 07/26] python3-cryptography: update to 41.0.1.
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index f5a45e5277a5..ed5d26a87413 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
-version=41.0.0
+version=41.0.1
revision=1
build_style=python3-module
build_helper="rust"
@@ -17,7 +17,7 @@ license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78
+checksum=d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From dd4e3a1c010d6192df29b10891aebb19171c6dc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:17:42 -0400
Subject: [PATCH 08/26] python3-imageio: update to 2.31.0.
---
srcpkgs/python3-imageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index ad3e419c67fd..859954e3973c 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-imageio'
pkgname=python3-imageio
-version=2.30.0
+version=2.31.0
revision=1
build_style=python3-module
# tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-2-Clause"
homepage="https://github.com/imageio/imageio"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=15e8ae8a63575040253a772cb476b7ce4e4d762200fb6086e08802784c7d394b
+checksum=2833a9e648a7d95d3dbbe74d3488283de59722463c67fa4d0481185f7de29ed6
post_install() {
vlicense LICENSE
From ddda38c319a3b540fabb0f1f2843675e8e72bde1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:30:28 -0400
Subject: [PATCH 09/26] python3-cvxopt: fix dist-info versioning
---
srcpkgs/python3-cvxopt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 92e33c022bae..7e85f1c5628b 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,9 +1,9 @@
# Template file for 'python3-cvxopt'
pkgname=python3-cvxopt
version=1.3.1
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel SuiteSparse-devel gsl-devel glpk-devel fftw-devel
$(vopt_if openblas 'openblas-devel' 'lapack-devel')"
depends="python3"
From b36c33b64f59315fef694e96941b8cea95e81472 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:23:31 +0200
Subject: [PATCH 10/26] xrdb: update to 1.2.2.
---
srcpkgs/xrdb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index e786702c8d80..bc72395160e7 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -1,6 +1,6 @@
# Template file for 'xrdb'
pkgname=xrdb
-version=1.2.1
+version=1.2.2
revision=1
build_style=gnu-configure
configure_args="--with-cpp=/usr/bin/cpp,/usr/bin/clang-cpp,/usr/bin/mcpp"
@@ -11,8 +11,8 @@ short_desc="X server resource database utility"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4
post_install() {
vlicense COPYING
From 61578607c3dcf74d9b6527cef4d3dba413b4b83c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Jun 2023 17:38:11 +0200
Subject: [PATCH 11/26] reptyr: update to 0.10.0.
---
srcpkgs/reptyr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/reptyr/template b/srcpkgs/reptyr/template
index b1cad3c1d477..5190ebf8b816 100644
--- a/srcpkgs/reptyr/template
+++ b/srcpkgs/reptyr/template
@@ -1,6 +1,6 @@
# Template file for 'reptyr'
pkgname=reptyr
-version=0.9.0
+version=0.10.0
revision=1
build_style=gnu-makefile
make_install_args="BASHCOMPDIR=/usr/share/bash-completion/completions"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/nelhage/reptyr"
distfiles="https://github.com/nelhage/reptyr/archive/${pkgname}-${version}.tar.gz"
-checksum=b442fbb80a1003b1985974c6fc9eeb8124a43a9bf014ae6af8cde0ca5e587731
+checksum=c6ffbc34a511ac00d072219bda30699e51f2f4eb483cbae9e32e981d49e8b380
post_install() {
vlicense COPYING LICENSE
From ad0690adf86f5837d4f8ebc75d927bf707877ffc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:06:49 +0200
Subject: [PATCH 12/26] xorgproto: update to 2023.1.
---
srcpkgs/xorgproto/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 342be095872f..02905d7aabb0 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
# Template file for 'xorgproto'
pkgname=xorgproto
-version=2022.2
+version=2023.1
revision=1
build_style=meson
configure_args="-Dlegacy=true"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.xz"
-checksum=5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e
+checksum=6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13
replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0
From 5ca3dc45a31d4fb9ad0aaff3844f5470345fa8cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:07:25 +0200
Subject: [PATCH 13/26] ugrep: update to 3.12.1.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index eb60f284250b..df9ae32837ff 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.12.0
+version=3.12.1
revision=1
build_style=gnu-configure
makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=f69330b74a2d2e46c878c19da3453e97d92ae960d0e1a92a853481cb889fca3e
+checksum=a442ac9c0961746374d0627e6ec52d5c6250541640aeb9a698eb40382d0ec44c
post_install() {
vlicense LICENSE.txt LICENSE
From 8a2cb232c63b6f58abdb0c40fc4a6fe43f7ff1e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 22:57:19 +0200
Subject: [PATCH 14/26] syncthing: update to 1.23.5.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 58a95827922d..1c704f3d6eed 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.23.4
+version=1.23.5
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=4b68cee85b63fbb197a4e5401b3983a2a2358e1098ff91755f47925a1ee17f58
+checksum=d87f02b3e970c0f08c59166851b40ee5c647efcb2d70b5f0410416987cd42294
pre_build() {
GOARCH= go generate \
From 47fc37e6d7bdf330b4b10da3ccef6bd498c78c10 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:28:53 +0200
Subject: [PATCH 15/26] terragrunt: update to 0.46.2.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fe7569f377f3..fc654aa02f70 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.46.1
+version=0.46.2
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=f3b99f6de74ce6d2af87a01cb0ca6ff8d6357e506fbc69252f821820d3c5c0bf
+checksum=0d8bb4e98276e68c76d770e662bb434fb5c89f8fc06c3c00e14e717417123ec5
post_install() {
vlicense LICENSE.txt
From 4517a2b6141f3e00eda5ba047c480e6ffed056e2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:29:51 +0200
Subject: [PATCH 16/26] hugo: update to 0.113.0.
---
srcpkgs/hugo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d80e676fd44d..d5c4cfeca19a 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
# Template file for 'hugo'
pkgname=hugo
-version=0.112.7
+version=0.113.0
revision=1
build_style=go
build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://gohugo.io"
distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa
+checksum=0bea01f37d7d04e6262844ff3070b76e5fb9f5fe2330a1367bd1c35c77098161
post_install() {
vdoc README.md
From 61b4764baf989681ab3f53ba82791f722bbf280e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:02 +0200
Subject: [PATCH 17/26] drumkv1: update to 0.9.31.
---
srcpkgs/drumkv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index dee163016be3..90373aa8ef95 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
# Template file for 'drumkv1'
pkgname=drumkv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://drumkv1.sourceforge.io/"
changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=75b0c50705fe2a81d578e739700bbbabcdb359d153f76b9475016c8572d64ec1
+checksum=d42b09322a4135964afdd5246a8d6863d8aa20886b47ba8b58f345d23aa68033
From fb97383f5d7dfbee4f721d28086a7fc7d1288d03 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:05 +0200
Subject: [PATCH 18/26] padthv1: update to 0.9.31.
---
srcpkgs/padthv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 33a217131082..2c4b5a50bff7 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
# Template file for 'padthv1'
pkgname=padthv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://padthv1.sourceforge.io/"
changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
distfiles="${SOURCEFORGE_SITE}/padthv1/padthv1-${version}.tar.gz"
-checksum=704b94d41d5daca3dbd9eaca93b8228e8f6e447a8c86f1f695fd92f16e7e6add
+checksum=305f45be4c923bcfa671463b01ef212d8fde4ae37ea687581a8046187b9315c7
From bda7ee21da6e33d1512455477ddbc6e934c11f19 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 19/26] samplv1: update to 0.9.31.
---
srcpkgs/samplv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index d4d17baa57c3..0d299884926b 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
# Template file for 'samplv1'
pkgname=samplv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://samplv1.sourceforge.io/"
changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
distfiles="${SOURCEFORGE_SITE}/samplv1/samplv1-${version}.tar.gz"
-checksum=f32fcccfa0395757b66351816e841e2b5c0459ce9161aba36d23ff9db58955a5
+checksum=9d4eb430709e5ed53d28c8dd9c01f07fc042be569b72a248bd766d2256a50bcb
From 3d904851619eb4f22ab5ef46e96952b8fa4ab582 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 20/26] synthv1: update to 0.9.31.
---
srcpkgs/synthv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index 7d20b505baea..126cd0600682 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
# Template file for 'synthv1'
pkgname=synthv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
homepage="https://synthv1.sourceforge.io/"
changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
distfiles="${SOURCEFORGE_SITE}/synthv1/synthv1-${version}.tar.gz"
-checksum=235cf1035f91a24743d01fcd1efa5274db94f2395734f33519ca672ac64af4d5
+checksum=9304a03adcfc51d4c83e6acdbbd4ef8e4418c996a1e23f8c5f9eabd62d8fce1b
From fccb442fa0e227e007f594f5dfabcee7f6c63464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:05:38 -0400
Subject: [PATCH 21/26] python3-meson-python: fix update-check
---
srcpkgs/python3-meson-python/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/python3-meson-python/update
diff --git a/srcpkgs/python3-meson-python/update b/srcpkgs/python3-meson-python/update
new file mode 100644
index 000000000000..60b9eebd42f4
--- /dev/null
+++ b/srcpkgs/python3-meson-python/update
@@ -0,0 +1 @@
+pattern="meson_python-\K[0-9.]+(?=.tar)"
From 4e232bff5b8c1919f49d1d5a6e67b3979eb3a097 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:09:23 -0400
Subject: [PATCH 22/26] cpp-utilities: update to 5.23.0.
---
.../patches/fix-32bit-sendfile.patch | 26 -------------------
srcpkgs/cpp-utilities/template | 4 +--
2 files changed, 2 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
diff --git a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch b/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
deleted file mode 100644
index 0c8cc562f866..000000000000
--- a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 92757f253113515e96bb4ddbb4627b314ada6b58 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Thu, 6 Apr 2023 11:33:41 -0400
-Subject: [PATCH] Fix use of `sendfile()` on 32-bit systems
-
----
- io/copy.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/io/copy.h b/io/copy.h
-index 4abbe8d..0635a8e 100644
---- a/io/copy.h
-+++ b/io/copy.h
-@@ -155,7 +155,8 @@ void CopyHelper<bufferSize>::callbackCopy(NativeFileStream &input, NativeFileStr
- output.flush();
- const auto totalBytes = static_cast<std::streamoff>(count);
- while (count) {
-- const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, std::min(count, bufferSize));
-+ const auto bytesToCopy = static_cast<std::size_t>(std::min(count, static_cast<std::uint64_t>(bufferSize)));
-+ const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, bytesToCopy);
- if (bytesCopied < 0) {
- throw std::ios_base::failure(argsToString("sendfile64() failed: ", std::strerror(errno)));
- }
---
-2.40.0
-
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d4d2d10eb9a8..4e164a09fac5 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
# Template file for 'cpp-utilities'
pkgname=cpp-utilities
-version=5.22.0
+version=5.23.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/cpp-utilities"
distfiles="https://github.com/Martchus/cpp-utilities/archive/v${version}.tar.gz"
-checksum=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
+checksum=2a0564afb3c5c2f9119ef4ea434001d4ee67a88a99484c412253b3f9ae4147bc
cpp-utilities-devel_package() {
short_desc+=" - development files"
From 398acda9db727f18b7aab7e6ee0d91f5fd26db55 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:10:23 -0400
Subject: [PATCH 23/26] qtutilities: update to 6.12.1.
---
srcpkgs/qtutilities/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 027d35c37179..06cc1b888bd8 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
# Template file for 'qtutilities'
pkgname=qtutilities
-version=6.12.0
+version=6.12.1
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/qtutilities"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=d3b8bc68c82d195cfeb4aa8d599c020774322aea7faebf5243e139088d89a82c
+checksum=83a68a39a2edbd1ba3ec2e50b9b4c84ed5a54c30fb3cb1bc3088e8d0290989c2
pre_check() {
ninja -C build tests
From 3dc29db624a217efd9a5e7adeb310d72cb3aff46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:15:08 -0400
Subject: [PATCH 24/26] tagparser: update to 12.0.0.
---
common/shlibs | 2 +-
srcpkgs/tagparser/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 042a1d23492e..e34e372b84f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3925,7 +3925,7 @@ libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.29 libqpdf-11.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
-libtagparser.so.11 tagparser-11.0.0_1
+libtagparser.so.12 tagparser-12.0.0_1
libqtutilities.so.6 qtutilities-6.0.4_1
libkdsoap.so.2 KDSoap-2.0.0_1
libkdsoap-server.so.2 KDSoap-2.0.0_1
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index c0ce54c985f9..5577aaa67c0a 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
# Template file for 'tagparser'
pkgname=tagparser
-version=11.6.0
+version=12.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tagparser"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=298ff927e14860e97e5b75057ff50fe64e0e0521ca7253e8624be6db6ac77261
+checksum=94ded89093beb67d95816c4ba700cb50f64b4f4fdc7748ccfbb61946246b635e
tagparser-devel_package() {
short_desc+=" - development files"
From e7e99df59d907a307a82069be6e2e7801862359f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:16:28 -0400
Subject: [PATCH 25/26] tageditor: update to 3.8.0.
---
srcpkgs/tageditor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 8b18b4f825bb..26b4421b4396 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
# Template file for 'tageditor'
pkgname=tageditor
-version=3.7.9
+version=3.8.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tageditor"
distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz"
-checksum=987101e9a259db79b28b872c778e9818f12618ce5a12ab7558b6262c7621b217
+checksum=9ab25924be61b1ddd12510c2fa90a9fd9ebae1b634764e50415f47c1e0be28ab
build_options="qt webengine webkit script"
build_options_default="qt"
From daf939e81a180a94f825e5b9df745ea4b07d50cb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 13:34:57 +0200
Subject: [PATCH 26/26] chromium: update to 114.0.5735.106.
---
...g-for-std-strlen-in-web_view_impl.cc.patch | 29 -------
...typename-s-that-are-required-in-C-17.patch | 45 +++++++++++
...karound_clang_bug-structured_binding.patch | 32 --------
...karound_clang_bug-structured_binding.patch | 81 +++++++++++++++++++
.../patches/cursed^Uscoped_file.patch | 18 -----
srcpkgs/chromium/template | 20 ++---
6 files changed, 133 insertions(+), 92 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
create mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
delete mode 100644 srcpkgs/chromium/patches/cursed^Uscoped_file.patch
diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index 6648fab5719d..000000000000
--- a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
---
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
-
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 000000000000..35b7152cbbdb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+ RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result) {
++ typename std::remove_reference<T>::type... result) {
+ auto found_callbacks_map = saved_callbacks.find(remote_id);
+ if (found_callbacks_map == saved_callbacks.end())
+ return; // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+ template <class... T>
+ void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result);
++ typename std::remove_reference<T>::type... result);
+
+ // Test support for client ID management.
+ static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
deleted file mode 100644
index c3e87c9f589a..000000000000
--- a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
-workaround llvm15 compiler bug
-diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-05-03 16:30:34.244612573 +0200
-+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-03 16:37:36.732278590 +0200
-@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData();
-+
-+ auto& workaround_clang_bug = sizing_tree->CreateSizingData();
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- NGGridSizingTree* sizing_tree) const {
- DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
-
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->At(current_grid_index);
-+ auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..af8e737059c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+ : BuildGridSizingTree(&oof_children);
+
+ LayoutUnit intrinsic_block_size;
+- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& tree_size = t_s;
+
+ if (IsBreakInside(BreakToken())) {
+ // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+ row_auto_repetitions);
+
+ bool has_nested_subgrid = false;
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ if (!must_ignore_children) {
+ // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+ NGGridSizingTree sizing_tree;
+
+ if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree.CreateSizingData();
++ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const auto& node = Node();
+ grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+ const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+ InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
diff --git a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
deleted file mode 100644
index 2e5433f7abce..000000000000
--- a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/base/files/scoped_file_linux.cc.orig
-+++ b/base/files/scoped_file_linux.cc
-@@ -77,15 +77,3 @@
- }
-
- } // namespace base
--
--extern "C" {
--
--int __close(int);
--
--__attribute__((visibility("default"), noinline)) int close(int fd) {
-- if (base::IsFDOwned(fd) && g_is_ownership_enforced)
-- CrashOnFdOwnershipViolation();
-- return __close(fd);
--}
--
--} // extern "C"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index cafc2fe324c6..b4a39dfd3815 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,12 +1,11 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=113.0.5672.92
+version=114.0.5735.106
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
- $(vopt_if js_optimize openjdk)
bison git gperf hwids ninja nodejs perl pkg-config python3
libatomic-devel libepoxy-devel libevent-devel libglib-devel"
makedepends="
@@ -17,8 +16,8 @@ makedepends="
libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
- pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel libffi-devel
+ pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -28,15 +27,14 @@ 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=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
+checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
lib32disabled=yes
-build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
+build_options="clang debug vaapi pulseaudio sndio pipewire"
build_options_default="clang vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
-desc_option_js_optimize="Optimize the JS used for Chromium's UI"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
if [ "$XBPS_LIBC" = musl ]; then
@@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
$(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
- libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
- mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
+ libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
+ mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
fi
@@ -158,7 +156,6 @@ do_configure() {
libxml
libxslt
opus
- re2
snappy
"
@@ -219,9 +216,6 @@ do_configure() {
# deprecated
'use_gnome_keyring=false'
- # https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
- "enable_js_type_check=$(vopt_if js_optimize true false)"
-
"use_pulseaudio=$(vopt_if pulseaudio true false)"
"link_pulseaudio=$(vopt_if pulseaudio true false)"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: chromium: update to 114.0.5735.106.
2023-06-06 11:38 [PR PATCH] chromium: update to 114.0.5735.106 Duncaen
2023-06-06 11:44 ` [PR PATCH] [Updated] " Duncaen
2023-06-07 16:44 ` Duncaen
@ 2023-06-13 11:35 ` Duncaen
2 siblings, 0 replies; 4+ messages in thread
From: Duncaen @ 2023-06-13 11:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
There's a closed pull request on the void-packages repository
chromium: update to 114.0.5735.106.
https://github.com/void-linux/void-packages/pull/44295
Description:
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-13 11:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-06 11:38 [PR PATCH] chromium: update to 114.0.5735.106 Duncaen
2023-06-06 11:44 ` [PR PATCH] [Updated] " Duncaen
2023-06-07 16:44 ` Duncaen
2023-06-13 11:35 ` [PR PATCH] [Closed]: " Duncaen
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).