* [PR PATCH] zoxide: update to 0.9.1
@ 2023-05-07 17:20 RAR27
2023-05-11 20:11 ` [PR PATCH] [Updated] " RAR27
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: RAR27 @ 2023-05-07 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
There is a new pull request by RAR27 against master on the void-packages repository
https://github.com/RAR27/void-packages zoxide
https://github.com/void-linux/void-packages/pull/43792
zoxide: update to 0.9.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zoxide-43792.patch --]
[-- Type: text/x-diff, Size: 1053 bytes --]
From e0f7dec2b98ce3d4bcfd5e6b634901027d512028 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH] zoxide: update to 0.9.1
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.9.0
+version=0.9.1
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] zoxide: update to 0.9.1
2023-05-07 17:20 [PR PATCH] zoxide: update to 0.9.1 RAR27
@ 2023-05-11 20:11 ` RAR27
2023-05-11 20:18 ` RAR27
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: RAR27 @ 2023-05-11 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by RAR27 against master on the void-packages repository
https://github.com/RAR27/void-packages zoxide
https://github.com/void-linux/void-packages/pull/43792
zoxide: update to 0.9.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zoxide-43792.patch --]
[-- Type: text/x-diff, Size: 1053 bytes --]
From e0f7dec2b98ce3d4bcfd5e6b634901027d512028 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH] zoxide: update to 0.9.1
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.9.0
+version=0.9.1
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] zoxide: update to 0.9.1
2023-05-07 17:20 [PR PATCH] zoxide: update to 0.9.1 RAR27
2023-05-11 20:11 ` [PR PATCH] [Updated] " RAR27
@ 2023-05-11 20:18 ` RAR27
2023-05-11 20:24 ` RAR27
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: RAR27 @ 2023-05-11 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by RAR27 against master on the void-packages repository
https://github.com/RAR27/void-packages zoxide
https://github.com/void-linux/void-packages/pull/43792
zoxide: update to 0.9.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zoxide-43792.patch --]
[-- Type: text/x-diff, Size: 1053 bytes --]
From e0f7dec2b98ce3d4bcfd5e6b634901027d512028 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH] zoxide: update to 0.9.1
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.9.0
+version=0.9.1
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] zoxide: update to 0.9.1
2023-05-07 17:20 [PR PATCH] zoxide: update to 0.9.1 RAR27
2023-05-11 20:11 ` [PR PATCH] [Updated] " RAR27
2023-05-11 20:18 ` RAR27
@ 2023-05-11 20:24 ` RAR27
2023-05-11 20:26 ` RAR27
2023-06-09 7:48 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: RAR27 @ 2023-05-11 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by RAR27 against master on the void-packages repository
https://github.com/RAR27/void-packages zoxide
https://github.com/void-linux/void-packages/pull/43792
zoxide: update to 0.9.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zoxide-43792.patch --]
[-- Type: text/x-diff, Size: 472829 bytes --]
From e0f7dec2b98ce3d4bcfd5e6b634901027d512028 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH 01/94] zoxide: update to 0.9.1
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.9.0
+version=0.9.1
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
post_install() {
vlicense LICENSE
From 0d48565b8ef517d4d79fc0745214c4dc5c272c5b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 3 May 2023 22:27:40 +0200
Subject: [PATCH 02/94] chromium: update to 113.0.5672.63.
---
.../musl-patches/quiche-arena-size.patch | 15 ------
...g-for-std-strlen-in-web_view_impl.cc.patch | 29 +++++++++++
...karound_clang_bug-structured_binding.patch | 32 +++++++++++++
.../patches/download-bubble-typename.patch | 42 ++++++++++++++++
...-constraints-on-VirtualCursor-layout.patch | 48 -------------------
.../chromium/patches/webauthn-variant.patch | 14 ++++++
srcpkgs/chromium/template | 4 +-
7 files changed, 119 insertions(+), 65 deletions(-)
delete mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
create mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
create mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
create mode 100644 srcpkgs/chromium/patches/download-bubble-typename.patch
delete mode 100644 srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch
create mode 100644 srcpkgs/chromium/patches/webauthn-variant.patch
diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
deleted file mode 100644
index 4d17c41b56d5..000000000000
--- a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: https://git.alpinelinux.org/aports/plain/community/chromium/quiche-arena-size.patch
-back in the day when net_unittests were ran, the block arena size was not big
-enough for some reason. should look at this again
---
---- a/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
-+++ b/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
-@@ -69,7 +69,7 @@
-
- // QuicConnections currently use around 1KB of polymorphic types which would
- // ordinarily be on the heap. Instead, store them inline in an arena.
--using QuicConnectionArena = QuicOneBlockArena<1280>;
-+using QuicConnectionArena = QuicOneBlockArena<1504>;
-
- } // namespace quic
-
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
new file mode 100644
index 000000000000..6648fab5719d
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
@@ -0,0 +1,29 @@
+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/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..c3e87c9f589a
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,32 @@
+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/download-bubble-typename.patch b/srcpkgs/chromium/patches/download-bubble-typename.patch
new file mode 100644
index 000000000000..8edb46974a5b
--- /dev/null
+++ b/srcpkgs/chromium/patches/download-bubble-typename.patch
@@ -0,0 +1,42 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/download-bubble-typename.patch
+--
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
+index 13460309d0e..a18d2f8a272 100644
+--- a/chrome/browser/download/bubble/download_bubble_update_service.cc
++++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
+@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) {
+ // Helper to get an iterator to the last element in the cache. The cache
+ // must not be empty.
+ template <typename Item>
+-SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
++typename SortedItems<Item>::iterator GetLastIter(SortedItems<Item>& cache) {
+ CHECK(!cache.empty());
+ auto it = cache.end();
+ return std::prev(it);
+@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl(
+ }
+
+ template <typename Id, typename Item>
+-SortedItems<Item>::iterator
++typename SortedItems<Item>::iterator
+ DownloadBubbleUpdateService::RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map) {
+ CHECK(iter != cache.end());
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h
+index 4c3c0bc1193..38048873aa9 100644
+--- a/chrome/browser/download/bubble/download_bubble_update_service.h
++++ b/chrome/browser/download/bubble/download_bubble_update_service.h
+@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService
+
+ // Removes item if we already have the iterator to it. Returns next iterator.
+ template <typename Id, typename Item>
+- SortedItems<Item>::iterator RemoveItemFromCacheByIter(
+- SortedItems<Item>::iterator iter,
++ typename SortedItems<Item>::iterator RemoveItemFromCacheByIter(
++ typename SortedItems<Item>::iterator iter,
+ SortedItems<Item>& cache,
+ IterMap<Id, Item>& iter_map);
+
diff --git a/srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch b/srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch
deleted file mode 100644
index d1e65ee1561c..000000000000
--- a/srcpkgs/chromium/patches/sql-relax-constraints-on-VirtualCursor-layout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001
-From: Elly Fong-Jones <ellyjones@chromium.org>
-Date: Thu, 2 Mar 2023 00:15:11 +0000
-Subject: [PATCH] sql: relax constraints on VirtualCursor layout
-
-VirtualCursor::FromSqliteCursor required that VirtualCursor had a
-standard layout, but in fact VirtualCursor shouldn't have a standard
-layout, and the fact that it does with libc++ is a deviation from the
-C++ standard. This change:
-
-1. Relaxes the requirement that VirtualCursor has a standard layout, and
-2. Relaxes the requirement that the sqlite_cursor_ field has to be at
- offset 0
-
-by use of offsetof() and pointer subtraction. This change both improves
-standards compliance and makes this code build with libstdc++.
-
-Bug: 1380656
-Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313
-Reviewed-by: Austin Sullivan <asully@chromium.org>
-Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1111925}
----
- sql/recover_module/cursor.h | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index 1970bdca8c6..4cb06557009 100644
---- a/sql/recover_module/cursor.h
-+++ b/sql/recover_module/cursor.h
-@@ -63,12 +63,10 @@ class VirtualCursor {
- // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
- static inline VirtualCursor* FromSqliteCursor(
- sqlite3_vtab_cursor* sqlite_cursor) {
-- static_assert(std::is_standard_layout<VirtualCursor>::value,
-- "needed for the reinterpret_cast below");
-- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,
-- "sqlite_cursor_ must be the first member of the class");
-- VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);
-- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
-+ VirtualCursor* result = reinterpret_cast<VirtualCursor*>(
-+ (reinterpret_cast<char*>(sqlite_cursor) -
-+ offsetof(VirtualCursor, sqlite_cursor_)));
-+ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
- return result;
- }
-
diff --git a/srcpkgs/chromium/patches/webauthn-variant.patch b/srcpkgs/chromium/patches/webauthn-variant.patch
new file mode 100644
index 000000000000..2ee02f5e5fe1
--- /dev/null
+++ b/srcpkgs/chromium/patches/webauthn-variant.patch
@@ -0,0 +1,14 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/webauthn-variant.patch
+--
+diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h
+index f4992a74bd6..45cabe39974 100644
+--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h
++++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
+@@ -7,6 +7,7 @@
+
+ #include <memory>
+ #include <string>
++#include <variant>
+ #include <vector>
+
+ #include "base/containers/span.h"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index e50c739d3ee7..c3a1cd59eafe 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=112.0.5615.49
+version=113.0.5672.63
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
@@ -28,7 +28,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=ddfd37373c1fa0f433a6ac11f0baa2b1f3fdfb9c7b5867e32a4300f2eb5aff41
+checksum=76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e
lib32disabled=yes
From a8953a3046bdf07b4e216135082b3b169f1d6702 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 21 Jan 2023 17:27:15 +0100
Subject: [PATCH 03/94] aterm: remove package
> aterm is deprecated and in a maintenance mode only; there will be no further updates. Use rxvt-unicode instead.
last release is from 2007
Closes: #41774 [via git-merge-pr]
---
srcpkgs/aterm/patches/fix-pty-musl.patch | 11 -----------
srcpkgs/aterm/template | 18 ------------------
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 29 deletions(-)
delete mode 100644 srcpkgs/aterm/patches/fix-pty-musl.patch
delete mode 100644 srcpkgs/aterm/template
diff --git a/srcpkgs/aterm/patches/fix-pty-musl.patch b/srcpkgs/aterm/patches/fix-pty-musl.patch
deleted file mode 100644
index 1f95be4d1a43..000000000000
--- a/srcpkgs/aterm/patches/fix-pty-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/command.c 2016-03-05 22:06:06.710989576 +0000
-+++ b/src/command.c 2016-03-05 22:06:36.743614116 +0000
-@@ -556,7 +556,7 @@
- ptydev = ttydev = _getpty(&fd, O_RDWR | O_NDELAY, 0622, 0);
- if (ptydev == NULL)
- goto Failed;
--#elif defined (__svr4__) || defined(__CYGWIN32__) || defined(__lnx21__)
-+#elif defined (__svr4__) || defined(__CYGWIN32__) || defined(__lnx21__) || defined(__linux__)
- {
- extern char *ptsname();
-
diff --git a/srcpkgs/aterm/template b/srcpkgs/aterm/template
deleted file mode 100644
index cf474ff86dec..000000000000
--- a/srcpkgs/aterm/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'aterm'
-pkgname=aterm
-version=1.0.1
-revision=4
-build_style=gnu-configure
-configure_args="--enable-transparency --enable-greek --enable-thai"
-hostmakedepends="pkg-config"
-makedepends="libXt-devel libXext-devel"
-short_desc="AfterStepX Terminal Emulator"
-maintainer="pancake <pancake@nopcode.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.afterstep.org/aterm.php"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce
-
-pre_build() {
- sed -i '/INSTALL_PROGRAM/s,-c -s,-c ,g' src/Makefile
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 20453e71a7d8..9d87a81fde56 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -33,6 +33,7 @@ replaces="
appmenu-gtk-module<=0.7.6_1
arm-mem-git<=20131108_2
arptables<=0.0.4_3
+ aterm<=1.0.1_4
atom<=1.44.0_1
avogadro-devel<=1.2.0_8
avogadro<=1.2.0_9
From 9071949b5e20e101829759fd78337e645cd17029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 21 Jan 2023 19:27:26 +0000
Subject: [PATCH 04/94] iptables: update to 1.8.9.
Closes: #41779 [via git-merge-pr]
---
...tions-add-check-to-the-phony-targets.patch | 30 -------------------
srcpkgs/iptables/template | 8 +++--
2 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch
diff --git a/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch b/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch
deleted file mode 100644
index 6721ee010fe7..000000000000
--- a/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 35ddfd15b4742f73fd677ea6fb1a6bfa5fa709a9 Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Mon, 15 Feb 2021 13:24:04 +0100
-Subject: [PATCH] extentions makefile: add check to the phony targets
-
-check-recurse from the top level makefile errors out when descenting
-into the extentions directory, since the makefile there doesn't include
-a check target.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- extensions/GNUmakefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git extensions/GNUmakefile.in extensions/GNUmakefile.in
-index 956ccb3..78ce2ee 100644
---- a/extensions/GNUmakefile.in
-+++ b/extensions/GNUmakefile.in
-@@ -79,7 +79,7 @@ targets_install :=
-
- .SECONDARY:
-
--.PHONY: all install uninstall clean distclean FORCE
-+.PHONY: all install uninstall check clean distclean FORCE
-
- all: ${targets}
-
---
-2.30.1
-
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index a55003cc07ac..28c2f5ad5ca7 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,18 +1,19 @@
# Template file for 'iptables'
pkgname=iptables
-version=1.8.7
+version=1.8.9
revision=1
build_style=gnu-configure
configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
hostmakedepends="pkg-config flex"
makedepends="libpcap-devel libfl-devel libmnl-devel libnfnetlink-devel
libnetfilter_conntrack-devel libnftnl-devel"
+checkdepends="python3"
short_desc="Linux IPv[46] packet filtering ruleset"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.netfilter.org/"
-distfiles="https://www.netfilter.org/projects/iptables/files/iptables-${version}.tar.bz2"
-checksum=c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0
+distfiles="https://www.netfilter.org/projects/iptables/files/iptables-${version}.tar.xz"
+checksum=ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f
alternatives="
iptables:ip6tables:/usr/bin/xtables-legacy-multi
iptables:ip6tables-restore:/usr/bin/xtables-legacy-multi
@@ -20,6 +21,7 @@ alternatives="
iptables:iptables:/usr/bin/xtables-legacy-multi
iptables:iptables-restore:/usr/bin/xtables-legacy-multi
iptables:iptables-save:/usr/bin/xtables-legacy-multi"
+make_check=no #/etc/ethertypes is missing
pre_build() {
rm include/linux/types.h
From 86b081d7b3f64d6b343da03ac8e8c4b38471dcdc Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 31 Dec 2022 21:08:23 +0530
Subject: [PATCH 05/94] New package: python3-cwcwidth-0.1.8
---
srcpkgs/python3-cwcwidth/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/python3-cwcwidth/template
diff --git a/srcpkgs/python3-cwcwidth/template b/srcpkgs/python3-cwcwidth/template
new file mode 100644
index 000000000000..d0da829d0408
--- /dev/null
+++ b/srcpkgs/python3-cwcwidth/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-cwcwidth'
+pkgname=python3-cwcwidth
+version=0.1.8
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-Cython python3-setuptools python3-wheel"
+makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for wc(s)width"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://github.com/sebastinas/cwcwidth"
+changelog="https://raw.githubusercontent.com/sebastinas/cwcwidth/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/c/cwcwidth/cwcwidth-${version}.tar.gz"
+checksum=5adc034b7c90e6a8586bd046bcbf6004e35e16b0d7e31de395513a50d729bbf6
+
+pre_check() {
+ python3 setup.py build_ext --inplace
+}
+
+post_install() {
+ vlicense LICENSE
+}
From d20c6ec2f27107ec2fc23323f00b6cd1b7d72748 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 31 Dec 2022 21:08:08 +0530
Subject: [PATCH 06/94] python3-curtsies: update to 0.4.1.
Closes: #41387 [via git-merge-pr]
---
.../python3-curtsies/patches/fix-setup.py.patch | 11 -----------
srcpkgs/python3-curtsies/template | 16 +++++++++-------
2 files changed, 9 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/python3-curtsies/patches/fix-setup.py.patch
diff --git a/srcpkgs/python3-curtsies/patches/fix-setup.py.patch b/srcpkgs/python3-curtsies/patches/fix-setup.py.patch
deleted file mode 100644
index e182f3bc28de..000000000000
--- a/srcpkgs/python3-curtsies/patches/fix-setup.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ def get_long_description():
- install_requires = [
- 'blessings>=1.5',
- 'wcwidth>=0.1.4',
-- 'typing',
-+ 'typing;python_version<"3.5"',
- ],
- tests_require = [
- 'mock',
diff --git a/srcpkgs/python3-curtsies/template b/srcpkgs/python3-curtsies/template
index 220094840f09..84b55c9eb5cb 100644
--- a/srcpkgs/python3-curtsies/template
+++ b/srcpkgs/python3-curtsies/template
@@ -1,16 +1,18 @@
# Template file for 'python3-curtsies'
pkgname=python3-curtsies
-version=0.3.0
-revision=6
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-blessings python3-wcwidth"
+version=0.4.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-blessed python3-cwcwidth"
+checkdepends="${depends} python3-pyte python3-pytest"
short_desc="Curses-like terminal wrapper, with colored strings (Python3)"
maintainer="Maurizio Porrato <maurizio.porrato@gmail.com>"
license="MIT"
-homepage="https://github.com/thomasballinger/curtsies"
+homepage="https://github.com/bpython/curtsies"
+changelog="https://raw.githubusercontent.com/bpython/curtsies/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/c/curtsies/curtsies-${version}.tar.gz"
-checksum=89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9
+checksum=62d10f349c553845306556a7f2663ce96b098d8c5bbc40daec7a6eedde1622b0
post_install() {
vlicense LICENSE
From bf1a8b74e6cf5d706f4b2ace356b4246223e5cf7 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Sun, 22 Jan 2023 06:50:01 +0100
Subject: [PATCH 07/94] mergerfs: update to 2.34.1.
Closes: #41793 [via git-merge-pr]
---
srcpkgs/mergerfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template
index eaa0c4e9bee2..7fe8662d3816 100644
--- a/srcpkgs/mergerfs/template
+++ b/srcpkgs/mergerfs/template
@@ -1,6 +1,6 @@
# Template file for 'mergerfs'
pkgname=mergerfs
-version=2.33.5
+version=2.34.1
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -11,7 +11,7 @@ maintainer="Pulux <pulux@pf4sh.eu>"
license="ISC"
homepage="https://github.com/trapexit/mergerfs"
distfiles="https://github.com/trapexit/mergerfs/releases/download/${version}/mergerfs-${version}.tar.gz"
-checksum=dcfbc3faf241567fdf4da0ffd87a89833db18ddd176f20962f05751552780e54
+checksum=57e09ed53dc2cd591d7e6a0b291588ba0917ccaddd1226371c99630dc7de795c
pre_build() {
# we build from source, spoof release tarball
From e21315f9ed4a7be58dddb07c859533ca37e2773a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 29 Apr 2023 14:40:29 +1000
Subject: [PATCH 08/94] wine: install man page for wine executable
---
srcpkgs/wine/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 56196ee592db..6c0b6ea93578 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=8.7
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
@@ -112,6 +112,11 @@ post_install() {
ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
;;
esac
+
+ # install man page for wine executable
+ for f in loader/wine*.man; do
+ vman "$f" "${f//man/1}"
+ done
}
libwine_package() {
From 9d2d5bbbdda9a8d5d5f8b104215d669a918e7e7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 May 2023 00:37:05 +0200
Subject: [PATCH 09/94] New package: electron24-24.2.0
---
.../musl-patches/chromium-musl-sandbox.patch | 125 +++
.../chromium-musl-tid-caching.patch | 86 ++
.../chromium-no-res-ninit-nclose.patch | 33 +
.../chromium-quiche-arena-size.patch | 15 +
...ERT-roll-src-third_party-ffmpeg-m102.patch | 333 +++++++
...oll-src-third_party-ffmpeg-m102.patch.args | 1 +
...ERT-roll-src-third_party-ffmpeg-m106.patch | 55 ++
...oll-src-third_party-ffmpeg-m106.patch.args | 1 +
.../chromium-angle-wayland-include.patch | 39 +
.../patches/chromium-browser-size_t.patch | 10 +
.../chromium-chromium-93-ffmpeg-4.4.patch | 36 +
...mium-chromium-i686-vaapi-fpermissive.patch | 23 +
...-chromium-revert-drop-of-system-java.patch | 15 +
.../chromium-chromium-system-nodejs.patch | 20 +
.../files/patches/chromium-cross-build.patch | 65 ++
.../chromium-cursed^Uscoped_file.patch | 18 +
.../patches/chromium-fc-cache-version.patch | 13 +
...x-aarch64-musl-memory-tagging-macros.patch | 29 +
...romium-fix-argument_spec-isnan-isinf.patch | 11 +
.../chromium-fix-constexpr-narrowing.patch | 21 +
.../patches/chromium-fix-dawn-platform.patch | 62 ++
.../chromium-fix-libc-version-include.patch | 15 +
...fix-missing-TEMP_FAILURE_RETRY-macro.patch | 21 +
...ium-fix-missing-cstdint-include-musl.patch | 10 +
...um-fix-musl-missing-unistd_h-include.patch | 10 +
...mium-fix-perfetto-GetThreadName-musl.patch | 22 +
...ium-fix-swiftshader-llvm-musl-config.patch | 0
.../files/patches/chromium-libc_malloc.patch | 34 +
.../patches/chromium-musl-no-execinfo.patch | 94 ++
.../patches/chromium-musl-no-mallinfo.patch | 125 +++
.../chromium-musl-partition-atfork.patch | 11 +
...-v8-monotonic-pthread-cont_timedwait.patch | 24 +
.../patches/chromium-no-getcontext.patch | 27 +
.../files/patches/chromium-old-clang.patch | 11 +
.../chromium-reenable-linux-i686-builds.patch | 19 +
.../chromium-remove-sys-cdefs-includes.patch | 39 +
.../files/patches/chromium-riscv-angle.patch | 27 +
.../patches/chromium-riscv-crashpad.patch | 777 ++++++++++++++++
.../files/patches/chromium-riscv-dav1d.patch | 43 +
.../patches/chromium-sandbox-membarrier.patch | 10 +
.../files/patches/chromium-sndio.patch | 877 ++++++++++++++++++
...-constraints-on-VirtualCursor-layout.patch | 48 +
.../files/patches/chromium-systypes.patch | 11 +
...undle-ffmpeg-av_stream_get_first_dts.patch | 12 +
.../chromium-unbundled-cross-toolchain.patch | 12 +
.../patches/chromium-webrtc-size_t.patch | 10 +
...a-script-to-list-patch-targets.patch.patch | 42 +
.../patches/electron-Build-fixes.patch.patch | 12 +
...lectron-exclude-content-test-patches.patch | 10 +
.../files/patches/electron-git-stuff.patch | 11 +
.../patches/electron-no-need-for-husky.patch | 10 +
.../electron-std-vector-non-const.patch | 109 +++
.../sndio-files/audio_manager_openbsd.cc | 148 +++
.../files/sndio-files/audio_manager_openbsd.h | 65 ++
.../files/sndio-files/sndio_input.cc | 200 ++++
.../files/sndio-files/sndio_input.h | 91 ++
.../files/sndio-files/sndio_output.cc | 183 ++++
.../files/sndio-files/sndio_output.h | 86 ++
...a_audio_linux_audio_manager_linux.cc.patch | 43 +
...src_3rdparty_chromium_media_BUILD.gn.patch | 12 +
...dparty_chromium_media_audio_BUILD.gn.patch | 23 +
...ty_chromium_media_media__options.gni.patch | 12 +
srcpkgs/electron24/template | 441 +++++++++
srcpkgs/electron24/update | 2 +
64 files changed, 4800 insertions(+)
create mode 100644 srcpkgs/electron24/files/musl-patches/chromium-musl-sandbox.patch
create mode 100644 srcpkgs/electron24/files/musl-patches/chromium-musl-tid-caching.patch
create mode 100644 srcpkgs/electron24/files/musl-patches/chromium-no-res-ninit-nclose.patch
create mode 100644 srcpkgs/electron24/files/musl-patches/chromium-quiche-arena-size.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch.args
create mode 100644 srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch.args
create mode 100644 srcpkgs/electron24/files/patches/chromium-angle-wayland-include.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-browser-size_t.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-chromium-93-ffmpeg-4.4.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-chromium-i686-vaapi-fpermissive.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-chromium-revert-drop-of-system-java.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-chromium-system-nodejs.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-cross-build.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-cursed^Uscoped_file.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fc-cache-version.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-argument_spec-isnan-isinf.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-constexpr-narrowing.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-dawn-platform.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-libc-version-include.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-missing-cstdint-include-musl.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-musl-missing-unistd_h-include.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-libc_malloc.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-musl-no-execinfo.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-musl-no-mallinfo.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-musl-partition-atfork.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-no-getcontext.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-old-clang.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-reenable-linux-i686-builds.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-remove-sys-cdefs-includes.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-riscv-angle.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-riscv-crashpad.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-riscv-dav1d.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-sandbox-membarrier.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-sndio.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-sql-relax-constraints-on-VirtualCursor-layout.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-systypes.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-unbundled-cross-toolchain.patch
create mode 100644 srcpkgs/electron24/files/patches/chromium-webrtc-size_t.patch
create mode 100644 srcpkgs/electron24/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
create mode 100644 srcpkgs/electron24/files/patches/electron-Build-fixes.patch.patch
create mode 100644 srcpkgs/electron24/files/patches/electron-exclude-content-test-patches.patch
create mode 100644 srcpkgs/electron24/files/patches/electron-git-stuff.patch
create mode 100644 srcpkgs/electron24/files/patches/electron-no-need-for-husky.patch
create mode 100644 srcpkgs/electron24/files/patches/electron-std-vector-non-const.patch
create mode 100644 srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.cc
create mode 100644 srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.h
create mode 100644 srcpkgs/electron24/files/sndio-files/sndio_input.cc
create mode 100644 srcpkgs/electron24/files/sndio-files/sndio_input.h
create mode 100644 srcpkgs/electron24/files/sndio-files/sndio_output.cc
create mode 100644 srcpkgs/electron24/files/sndio-files/sndio_output.h
create mode 100644 srcpkgs/electron24/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
create mode 100644 srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
create mode 100644 srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
create mode 100644 srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
create mode 100644 srcpkgs/electron24/template
create mode 100644 srcpkgs/electron24/update
diff --git a/srcpkgs/electron24/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron24/files/musl-patches/chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..22d865aa42f5
--- /dev/null
+++ b/srcpkgs/electron24/files/musl-patches/chromium-musl-sandbox.patch
@@ -0,0 +1,125 @@
+Source: https://git.alpinelinux.org/aports/tree/community/chromium/musl-sandbox.patch
+musl uses different syscalls from glibc for some functions, so the sandbox has
+to account for that
+--
+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+index ff5a1c0..da56b9b 100644
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -139,21 +139,11 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+ const Arg<unsigned long> flags(0);
+-
+- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+- CLONE_SIGHAND | CLONE_THREAD |
+- CLONE_SYSVSEM;
+- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
+-
+- const uint64_t kGlibcPthreadFlags =
+- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
+- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
+- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
+-
+- const BoolExpr android_test =
+- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
+- flags == kGlibcPthreadFlags);
++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++ CLONE_THREAD | CLONE_SYSVSEM;
++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++ CLONE_DETACHED;
++ const BoolExpr thread_clone_ok = (flags&~safe)==required;
+
+ // The following two flags are the two important flags in any vfork-emulating
+ // clone call. EPERM any clone call that contains both of them.
+@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+ AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
+ (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
+
+- return If(IsAndroid() ? android_test : glibc_test, Allow())
++ return If(thread_clone_ok, Allow())
+ .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+ .Else(CrashSIGSYSClone());
+ }
+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+index d9d1882..0567557 100644
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #if defined(__i386__)
+ case __NR_waitpid:
+ #endif
++ case __NR_set_tid_address:
+ return true;
+ case __NR_clone: // Should be parameter-restricted.
+ case __NR_setns: // Privileged.
+@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+ case __NR_set_thread_area:
+ #endif
+- case __NR_set_tid_address:
+ case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+ case __NR_vfork:
+@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+ case __NR_mlock:
+ case __NR_munlock:
+ case __NR_munmap:
++ case __NR_mremap:
++ case __NR_membarrier:
+ return true;
+ case __NR_madvise:
+ case __NR_mincore:
+@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+ case __NR_modify_ldt:
+ #endif
+ case __NR_mprotect:
+- case __NR_mremap:
+ case __NR_msync:
+ case __NR_munlockall:
+ case __NR_readahead:
+diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h
+index 2b78a0c..b6fedb5 100644
+--- a/sandbox/linux/system_headers/linux_syscalls.h
++++ b/sandbox/linux/system_headers/linux_syscalls.h
+@@ -10,6 +10,7 @@
+ #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+
+ #include "build/build_config.h"
++#include <sys/syscall.h>
+
+ #if defined(__x86_64__)
+ #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
+--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -94,6 +94,9 @@
+ case __NR_pwrite64:
+ case __NR_sched_get_priority_max:
+ case __NR_sched_get_priority_min:
++ case __NR_sched_getparam:
++ case __NR_sched_getscheduler:
++ case __NR_sched_setscheduler:
+ case __NR_sysinfo:
+ case __NR_times:
+ case __NR_uname:
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -225,10 +225,15 @@
+ if (sysno == __NR_getpriority || sysno ==__NR_setpriority)
+ return RestrictGetSetpriority(current_pid);
+
++ // XXX: hacks for musl sandbox, calls needed?
++ if (sysno == __NR_sched_getparam || sysno == __NR_sched_getscheduler ||
++ sysno == __NR_sched_setscheduler) {
++ return Allow();
++ }
++
+ // The scheduling syscalls are used in threading libraries and also heavily in
+ // abseil. See for example https://crbug.com/1370394.
+- if (sysno == __NR_sched_getaffinity || sysno == __NR_sched_getparam ||
+- sysno == __NR_sched_getscheduler || sysno == __NR_sched_setscheduler) {
++ if (sysno == __NR_sched_getaffinity) {
+ return RestrictSchedTarget(current_pid, sysno);
+ }
+
diff --git a/srcpkgs/electron24/files/musl-patches/chromium-musl-tid-caching.patch b/srcpkgs/electron24/files/musl-patches/chromium-musl-tid-caching.patch
new file mode 100644
index 000000000000..52bbe775ad2a
--- /dev/null
+++ b/srcpkgs/electron24/files/musl-patches/chromium-musl-tid-caching.patch
@@ -0,0 +1,86 @@
+Source: https://git.alpinelinux.org/aports/plain/community/chromium/musl-tid-caching.patch
+the sandbox caching of thread id's only works with glibc
+see: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/32356
+see: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13579
+--
+--- a/sandbox/linux/services/namespace_sandbox.cc
++++ b/sandbox/linux/services/namespace_sandbox.cc
+@@ -209,6 +209,70 @@
+ return base::LaunchProcess(argv, launch_options_copy);
+ }
+
++#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__)
++#define TLS_ABOVE_TP
++#endif
++
++struct musl_pthread
++{
++ /* Part 1 -- these fields may be external or
++ * internal (accessed via asm) ABI. Do not change. */
++ struct pthread *self;
++#ifndef TLS_ABOVE_TP
++ uintptr_t *dtv;
++#endif
++ struct pthread *prev, *next; /* non-ABI */
++ uintptr_t sysinfo;
++#ifndef TLS_ABOVE_TP
++#ifdef CANARY_PAD
++ uintptr_t canary_pad;
++#endif
++ uintptr_t canary;
++#endif
++
++/* Part 2 -- implementation details, non-ABI. */
++ int tid;
++ int errno_val;
++ volatile int detach_state;
++ volatile int cancel;
++ volatile unsigned char canceldisable, cancelasync;
++ unsigned char tsd_used:1;
++ unsigned char dlerror_flag:1;
++ unsigned char *map_base;
++ size_t map_size;
++ void *stack;
++ size_t stack_size;
++ size_t guard_size;
++ void *result;
++ struct __ptcb *cancelbuf;
++ void **tsd;
++ struct {
++ volatile void *volatile head;
++ long off;
++ volatile void *volatile pending;
++ } robust_list;
++ int h_errno_val;
++ volatile int timer_id;
++ locale_t locale;
++ volatile int killlock[1];
++ char *dlerror_buf;
++ void *stdio_locks;
++
++ /* Part 3 -- the positions of these fields relative to
++ * the end of the structure is external and internal ABI. */
++#ifdef TLS_ABOVE_TP
++ uintptr_t canary;
++ uintptr_t *dtv;
++#endif
++};
++
++void MaybeUpdateMuslTidCache()
++{
++ pid_t real_tid = sys_gettid();
++ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
++ *cached_tid_location = real_tid;
++}
++
+ // static
+ pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
+ const pid_t pid =
+@@ -226,6 +290,7 @@
+ #if defined(LIBC_GLIBC)
+ MaybeUpdateGlibcTidCache();
+ #endif
++ MaybeUpdateMuslTidCache();
+ return 0;
+ }
+
diff --git a/srcpkgs/electron24/files/musl-patches/chromium-no-res-ninit-nclose.patch b/srcpkgs/electron24/files/musl-patches/chromium-no-res-ninit-nclose.patch
new file mode 100644
index 000000000000..6884039efb88
--- /dev/null
+++ b/srcpkgs/electron24/files/musl-patches/chromium-no-res-ninit-nclose.patch
@@ -0,0 +1,33 @@
+Source: https://git.alpinelinux.org/aports/plain/community/chromium/no-res-ninit-nclose.patch
+similar to dns-resolver.patch, musl doesn't have res_ninit and so on
+--
+--- a/net/dns/public/scoped_res_state.cc
++++ b/net/dns/public/scoped_res_state.cc
+@@ -13,7 +13,7 @@
+ namespace net {
+
+ ScopedResState::ScopedResState() {
+-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
+ // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+ // res_init behaves the same way.
+ memset(&_res, 0, sizeof(_res));
+@@ -25,16 +25,8 @@
+ }
+
+ ScopedResState::~ScopedResState() {
+-#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
+-
+- // Prefer res_ndestroy where available.
+-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
+- res_ndestroy(&res_);
+-#else
+- res_nclose(&res_);
+-#endif // BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
+-
+-#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
++ // musl res_init() doesn't actually do anything
++ // no destruction is necessary as no memory has been allocated
+ }
+
+ bool ScopedResState::IsValid() const {
diff --git a/srcpkgs/electron24/files/musl-patches/chromium-quiche-arena-size.patch b/srcpkgs/electron24/files/musl-patches/chromium-quiche-arena-size.patch
new file mode 100644
index 000000000000..4d17c41b56d5
--- /dev/null
+++ b/srcpkgs/electron24/files/musl-patches/chromium-quiche-arena-size.patch
@@ -0,0 +1,15 @@
+Source: https://git.alpinelinux.org/aports/plain/community/chromium/quiche-arena-size.patch
+back in the day when net_unittests were ran, the block arena size was not big
+enough for some reason. should look at this again
+--
+--- a/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
++++ b/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
+@@ -69,7 +69,7 @@
+
+ // QuicConnections currently use around 1KB of polymorphic types which would
+ // ordinarily be on the heap. Instead, store them inline in an arena.
+-using QuicConnectionArena = QuicOneBlockArena<1280>;
++using QuicConnectionArena = QuicOneBlockArena<1504>;
+
+ } // namespace quic
+
diff --git a/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch
new file mode 100644
index 000000000000..e739b40a2733
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch
@@ -0,0 +1,333 @@
+From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001
+From: Dale Curtis <dalecurtis@chromium.org>
+Date: Sat, 2 Apr 2022 05:13:53 +0000
+Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125
+ commits)
+
+https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526
+
+Created with:
+ roll-dep src/third_party/ffmpeg
+
+Fixed: 1293918
+Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng
+Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647
+Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
+Reviewed-by: Dan Sanders <sandersd@chromium.org>
+Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#988253}
+---
+ .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++---------
+ media/ffmpeg/ffmpeg_common.cc | 11 +++----
+ media/filters/audio_file_reader.cc | 9 +++---
+ media/filters/audio_file_reader_unittest.cc | 6 ++--
+ .../filters/audio_video_metadata_extractor.cc | 11 +++++--
+ .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++--
+ ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +-
+ media/filters/ffmpeg_audio_decoder.cc | 13 +++++----
+ 8 files changed, 51 insertions(+), 37 deletions(-)
+
+diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+index e4fc3f460e2..9b1ad9f7675 100644
+--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
++++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext(
+ codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
+ }
+
+- codec_context->channels = config.channel_count;
++ codec_context->ch_layout.nb_channels = config.channel_count;
+ codec_context->sample_rate = config.samples_per_second;
+
+ if (config.extra_data) {
+@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format,
+ case cdm::kAudioFormatPlanarS16:
+ case cdm::kAudioFormatPlanarF32: {
+ const int decoded_size_per_channel =
+- decoded_audio_size / av_frame.channels;
+- for (int i = 0; i < av_frame.channels; ++i) {
++ decoded_audio_size / av_frame.ch_layout.nb_channels;
++ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
+ memcpy(output_buffer, av_frame.extended_data[i],
+ decoded_size_per_channel);
+ output_buffer += decoded_size_per_channel;
+@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize(
+ // Success!
+ decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
+ samples_per_second_ = config.samples_per_second;
+- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
++ bytes_per_frame_ =
++ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
+ output_timestamp_helper_ =
+ std::make_unique<AudioTimestampHelper>(config.samples_per_second);
+ is_initialized_ = true;
+
+ // Store initial values to guard against midstream configuration changes.
+- channels_ = codec_context_->channels;
++ channels_ = codec_context_->ch_layout.nb_channels;
+ av_sample_format_ = codec_context_->sample_fmt;
+
+ return true;
+@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
+ for (auto& frame : audio_frames) {
+ int decoded_audio_size = 0;
+ if (frame->sample_rate != samples_per_second_ ||
+- frame->channels != channels_ || frame->format != av_sample_format_) {
++ frame->ch_layout.nb_channels != channels_ ||
++ frame->format != av_sample_format_) {
+ DLOG(ERROR) << "Unsupported midstream configuration change!"
+ << " Sample Rate: " << frame->sample_rate << " vs "
+- << samples_per_second_ << ", Channels: " << frame->channels
+- << " vs " << channels_ << ", Sample Format: " << frame->format
+- << " vs " << av_sample_format_;
++ << samples_per_second_
++ << ", Channels: " << frame->ch_layout.nb_channels << " vs "
++ << channels_ << ", Sample Format: " << frame->format << " vs "
++ << av_sample_format_;
+ return cdm::kDecodeError;
+ }
+
+ decoded_audio_size = av_samples_get_buffer_size(
+- nullptr, codec_context_->channels, frame->nb_samples,
++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
+ codec_context_->sample_fmt, 1);
+ if (!decoded_audio_size)
+ continue;
+@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame(
+ size_t* total_size,
+ std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
+ AVFrame* frame) {
+- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
+- frame->nb_samples,
+- codec_context_->sample_fmt, 1);
++ *total_size += av_samples_get_buffer_size(
++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
++ codec_context_->sample_fmt, 1);
+ audio_frames->emplace_back(av_frame_clone(frame));
+ return true;
+ }
+diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
+index 87ca8969626..76f03d6608e 100644
+--- a/media/ffmpeg/ffmpeg_common.cc
++++ b/media/ffmpeg/ffmpeg_common.cc
+@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
+ codec_context->sample_fmt, codec_context->codec_id);
+
+ ChannelLayout channel_layout =
+- codec_context->channels > 8
++ codec_context->ch_layout.nb_channels > 8
+ ? CHANNEL_LAYOUT_DISCRETE
+- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
+- codec_context->channels);
++ : ChannelLayoutToChromeChannelLayout(
++ codec_context->ch_layout.u.mask,
++ codec_context->ch_layout.nb_channels);
+
+ int sample_rate = codec_context->sample_rate;
+ switch (codec) {
+@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
+ extra_data, encryption_scheme, seek_preroll,
+ codec_context->delay);
+ if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
+- config->SetChannelsForDiscrete(codec_context->channels);
++ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
+
+ #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
+ // These are bitstream formats unknown to ffmpeg, so they don't have
+@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config,
+
+ // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
+ // said information to decode.
+- codec_context->channels = config.channels();
++ codec_context->ch_layout.nb_channels = config.channels();
+ codec_context->sample_rate = config.samples_per_second();
+
+ if (config.extra_data().empty()) {
+diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
+index 5f257bdfaa6..e1be5aa9a5b 100644
+--- a/media/filters/audio_file_reader.cc
++++ b/media/filters/audio_file_reader.cc
+@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() {
+
+ // Verify the channel layout is supported by Chrome. Acts as a sanity check
+ // against invalid files. See http://crbug.com/171962
+- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
+- codec_context_->channels) ==
++ if (ChannelLayoutToChromeChannelLayout(
++ codec_context_->ch_layout.u.mask,
++ codec_context_->ch_layout.nb_channels) ==
+ CHANNEL_LAYOUT_UNSUPPORTED) {
+ return false;
+ }
+
+ // Store initial values to guard against midstream configuration changes.
+- channels_ = codec_context_->channels;
++ channels_ = codec_context_->ch_layout.nb_channels;
+ audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
+ sample_rate_ = codec_context_->sample_rate;
+ av_sample_format_ = codec_context_->sample_fmt;
+@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame(
+ if (frames_read < 0)
+ return false;
+
+- const int channels = frame->channels;
++ const int channels = frame->ch_layout.nb_channels;
+ if (frame->sample_rate != sample_rate_ || channels != channels_ ||
+ frame->format != av_sample_format_) {
+ DLOG(ERROR) << "Unsupported midstream configuration change!"
+diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc
+index 2aba7927a31..1f45a50cace 100644
+--- a/media/filters/audio_file_reader_unittest.cc
++++ b/media/filters/audio_file_reader_unittest.cc
+@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test {
+ EXPECT_FALSE(reader_->Open());
+ }
+
+- void RunTestFailingDecode(const char* fn) {
++ void RunTestFailingDecode(const char* fn, int expect_read = 0) {
+ Initialize(fn);
+ EXPECT_TRUE(reader_->Open());
+ std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
+- EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
++ EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
+ }
+
+ void RunTestPartialDecode(const char* fn) {
+@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
+ }
+
+ TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
+- RunTestFailingDecode("midstream_config_change.mp3");
++ RunTestFailingDecode("midstream_config_change.mp3", 42624);
+ }
+ #endif
+
+diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc
+index 185819eb936..69ff508c221 100644
+--- a/media/filters/audio_video_metadata_extractor.cc
++++ b/media/filters/audio_video_metadata_extractor.cc
+@@ -113,6 +113,15 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source,
+ if (!stream)
+ continue;
+
++ void* display_matrix =
++ av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
++ if (display_matrix) {
++ rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
++ static_cast<int32_t*>(display_matrix))
++ .rotation;
++ info.tags["rotate"] = base::NumberToString(rotation_);
++ }
++
+ // Extract dictionary from streams also. Needed for containers that attach
+ // metadata to contained streams instead the container itself, like OGG.
+ ExtractDictionary(stream->metadata, &info.tags);
+@@ -255,8 +264,6 @@ void AudioVideoMetadataExtractor::ExtractDictionary(AVDictionary* metadata,
+ if (raw_tags->find(tag->key) == raw_tags->end())
+ (*raw_tags)[tag->key] = tag->value;
+
+- if (ExtractInt(tag, "rotate", &rotation_))
+- continue;
+ if (ExtractString(tag, "album", &album_))
+ continue;
+ if (ExtractString(tag, "artist", &artist_))
+diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc
+index 6f231c85729..ca5e5fb927d 100644
+--- a/media/filters/ffmpeg_aac_bitstream_converter.cc
++++ b/media/filters/ffmpeg_aac_bitstream_converter.cc
+@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) {
+ if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
+ audio_profile_ != stream_codec_parameters_->profile ||
+ sample_rate_index_ != sample_rate_index ||
+- channel_configuration_ != stream_codec_parameters_->channels ||
++ channel_configuration_ !=
++ stream_codec_parameters_->ch_layout.nb_channels ||
+ frame_length_ != header_plus_packet_size) {
+ header_generated_ =
+ GenerateAdtsHeader(stream_codec_parameters_->codec_id,
+ 0, // layer
+ stream_codec_parameters_->profile, sample_rate_index,
+ 0, // private stream
+- stream_codec_parameters_->channels,
++ stream_codec_parameters_->ch_layout.nb_channels,
+ 0, // originality
+ 0, // home
+ 0, // copyrighted_stream
+@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) {
+ codec_ = stream_codec_parameters_->codec_id;
+ audio_profile_ = stream_codec_parameters_->profile;
+ sample_rate_index_ = sample_rate_index;
+- channel_configuration_ = stream_codec_parameters_->channels;
++ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
+ frame_length_ = header_plus_packet_size;
+ }
+
+diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+index 1fd4c5ccd7d..f59bcd8fdaf 100644
+--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
++++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test {
+ memset(&test_parameters_, 0, sizeof(AVCodecParameters));
+ test_parameters_.codec_id = AV_CODEC_ID_AAC;
+ test_parameters_.profile = FF_PROFILE_AAC_MAIN;
+- test_parameters_.channels = 2;
++ test_parameters_.ch_layout.nb_channels = 2;
+ test_parameters_.extradata = extradata_header_;
+ test_parameters_.extradata_size = sizeof(extradata_header_);
+ }
+diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
+index 6a56c675f7d..4615fdeb3fb 100644
+--- a/media/filters/ffmpeg_audio_decoder.cc
++++ b/media/filters/ffmpeg_audio_decoder.cc
+@@ -28,7 +28,7 @@ namespace media {
+
+ // Return the number of channels from the data in |frame|.
+ static inline int DetermineChannels(AVFrame* frame) {
+- return frame->channels;
++ return frame->ch_layout.nb_channels;
+ }
+
+ // Called by FFmpeg's allocation routine to allocate a buffer. Uses
+@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer,
+ // Translate unsupported into discrete layouts for discrete configurations;
+ // ffmpeg does not have a labeled discrete configuration internally.
+ ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
+- codec_context_->channel_layout, codec_context_->channels);
++ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
+ if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
+ config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
+ channel_layout = CHANNEL_LAYOUT_DISCRETE;
+@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
+ // Success!
+ av_sample_format_ = codec_context_->sample_fmt;
+
+- if (codec_context_->channels != config.channels()) {
++ if (codec_context_->ch_layout.nb_channels != config.channels()) {
+ MEDIA_LOG(ERROR, media_log_)
+ << "Audio configuration specified " << config.channels()
+ << " channels, but FFmpeg thinks the file contains "
+- << codec_context_->channels << " channels";
++ << codec_context_->ch_layout.nb_channels << " channels";
+ ReleaseFFmpegResources();
+ state_ = DecoderState::kUninitialized;
+ return false;
+@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s,
+ if (frame->nb_samples <= 0)
+ return AVERROR(EINVAL);
+
+- if (s->channels != channels) {
++ if (s->ch_layout.nb_channels != channels) {
+ DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
+ return AVERROR(EINVAL);
+ }
+@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s,
+ ChannelLayout channel_layout =
+ config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
+ ? CHANNEL_LAYOUT_DISCRETE
+- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
++ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
++ s->ch_layout.nb_channels);
+
+ if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
+ DLOG(ERROR) << "Unsupported channel layout.";
diff --git a/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch.args b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m102.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch
new file mode 100644
index 000000000000..b2a113791734
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch
@@ -0,0 +1,55 @@
+From ded379824f5de39357b6b1894578101aba5cdf05 Mon Sep 17 00:00:00 2001
+From: Eugene Zemtsov <eugene@chromium.org>
+Date: Fri, 29 Jul 2022 04:41:04 +0000
+Subject: [PATCH] Roll src/third_party/ffmpeg/ 880df5ede..b71ecd02b (279
+ commits)
+
+https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/880df5ede50a..b71ecd02b479
+
+$ git log 880df5ede..b71ecd02b --date=short --no-merges --format='%ad %ae %s'
+2022-07-27 eugene Roll for M106
+2022-07-25 andreas.rheinhardt avcodec/x86/pngdsp: Remove obsolete ff_add_bytes_l2_mmx()
+2022-07-22 andreas.rheinhardt avcodec/hevcdec: Output MD5-message in one piece
+2022-07-24 epirat07 configure: properly require libx264 if enabled
+2022-07-24 zane avformat/argo_cvg: expose loop/reverb/checksum via metadata
+(...)
+2022-05-03 leo.izen avcodec/libjxldec: properly tag output colorspace
+2022-06-25 ffmpeg avfilter/Makefile: always make colorspace.o
+2022-03-02 brad avutil/ppc/cpu: Use proper header for OpenBSD PPC CPU detection
+2022-06-24 jamrial avformat/http: include version.h
+2022-05-16 mbonda-at-nvidia.com AV1 VDPAU hwaccel Decode support
+
+Created with:
+ roll-dep src/third_party/ffmpeg
+
+ffmpeg usage fix:
+ Switch from AVFrame::pkt_duration to AVFrame::duration,
+ AVFrame::pkt_duration is deprecated
+
+Bug: 1344646
+Change-Id: Iaa3abf48ef81dae6d282bca8f0fa2a8dffeeba25
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3788638
+Reviewed-by: Will Cassella <cassew@chromium.org>
+Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1029623}
+---
+ media/filters/audio_file_reader.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
+index e1be5aa9a5b..951c003956f 100644
+--- a/media/filters/audio_file_reader.cc
++++ b/media/filters/audio_file_reader.cc
+@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
+ // silence from being output. In the case where we are also discarding some
+ // portion of the packet (as indicated by a negative pts), we further want to
+ // adjust the duration downward by however much exists before zero.
+- if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
++ if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
+ const base::TimeDelta pkt_duration = ConvertFromTimeBase(
+ glue_->format_context()->streams[stream_index_]->time_base,
+- frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
++ frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
+ const base::TimeDelta frame_duration =
+ base::Seconds(frames_read / static_cast<double>(sample_rate_));
+
diff --git a/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch.args b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch.args
new file mode 100644
index 000000000000..8bbbbe948363
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-REVERT-roll-src-third_party-ffmpeg-m106.patch.args
@@ -0,0 +1 @@
+-RNp1
diff --git a/srcpkgs/electron24/files/patches/chromium-angle-wayland-include.patch b/srcpkgs/electron24/files/patches/chromium-angle-wayland-include.patch
new file mode 100644
index 000000000000..65770b9439c5
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-angle-wayland-include.patch
@@ -0,0 +1,39 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/a353833a5a731abfaa465b658f61894a516aa49b/trunk/angle-wayland-include-protocol.patch
+diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn
+--- a/third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000
++++ b/third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000
+@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") {
+ if (angle_enable_vulkan && angle_use_wayland &&
+ defined(vulkan_wayland_include_dirs)) {
+ include_dirs = vulkan_wayland_include_dirs
++ } else if (angle_enable_vulkan && angle_use_wayland) {
++ include_dirs = [
++ "$wayland_gn_dir/src/src",
++ "$wayland_gn_dir/include/src",
++ "$wayland_gn_dir/include/protocol",
++ ]
+ }
+ }
+
+@@ -1073,6 +1079,7 @@ if (angle_use_wayland) {
+ include_dirs = [
+ "$wayland_dir/egl",
+ "$wayland_dir/src",
++ "$wayland_gn_dir/include/protocol",
+ ]
+ }
+
+diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn
+--- a/third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000
++++ b/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000
+@@ -21,6 +21,9 @@ source_set("volk") {
+ configs += [ "$angle_root:angle_no_cfi_icall" ]
+ public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
+ if (angle_use_wayland) {
+- include_dirs = [ "$wayland_dir/src" ]
++ include_dirs = [
++ "$wayland_dir/src",
++ "$wayland_gn_dir/include/protocol",
++ ]
+ }
+ }
diff --git a/srcpkgs/electron24/files/patches/chromium-browser-size_t.patch b/srcpkgs/electron24/files/patches/chromium-browser-size_t.patch
new file mode 100644
index 000000000000..36af0ec6c4a7
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-browser-size_t.patch
@@ -0,0 +1,10 @@
+--- a/chrome/browser/search/background/ntp_backgrounds.h 2020-08-10 20:39:20.000000000 +0200
++++ b/chrome/browser/search/background/ntp_backgrounds.h 2020-09-04 13:48:22.640023256 +0200
+@@ -6,6 +6,7 @@
+ #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
+
+ #include <array>
++#include <cstddef>
+
+ class GURL;
+
diff --git a/srcpkgs/electron24/files/patches/chromium-chromium-93-ffmpeg-4.4.patch b/srcpkgs/electron24/files/patches/chromium-chromium-93-ffmpeg-4.4.patch
new file mode 100644
index 000000000000..f0ec736f98bc
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-chromium-93-ffmpeg-4.4.patch
@@ -0,0 +1,36 @@
+diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
+index ac4713b07268..492a9a37d096 100644
+--- a/media/filters/ffmpeg_demuxer.cc
++++ b/media/filters/ffmpeg_demuxer.cc
+@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ scoped_refptr<DecoderBuffer> buffer;
+
+ if (type() == DemuxerStream::TEXT) {
+- size_t id_size = 0;
++ int id_size = 0;
+ uint8_t* id_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
+
+- size_t settings_size = 0;
++ int settings_size = 0;
+ uint8_t* settings_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
+
+@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
+ side_data.data(), side_data.size());
+ } else {
+- size_t side_data_size = 0;
++ int side_data_size = 0;
+ uint8_t* side_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
+
+@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ packet->size - data_offset);
+ }
+
+- size_t skip_samples_size = 0;
++ int skip_samples_size = 0;
+ const uint32_t* skip_samples_ptr =
+ reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
diff --git a/srcpkgs/electron24/files/patches/chromium-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/electron24/files/patches/chromium-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..77c0b58c94e1
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,23 @@
+--- a/media/gpu/vaapi/BUILD.gn.orig
++++ b/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,12 @@
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+
++config("vaapi_permissive") {
++ if (target_cpu == "x86") {
++ cflags = [ "-fpermissive" ]
++ }
++}
++
+ generate_stubs("libva_stubs") {
+ extra_header = "va_stub_header.fragment"
+ sigs = [ "va.sigs" ]
+@@ -90,6 +96,7 @@
+ configs += [
+ "//build/config/linux/libva",
+ "//third_party/libvpx:libvpx_config",
++ ":vaapi_permissive",
+ ]
+
+ deps = [
diff --git a/srcpkgs/electron24/files/patches/chromium-chromium-revert-drop-of-system-java.patch b/srcpkgs/electron24/files/patches/chromium-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..117a50f8e4f6
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200
++++ b/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200
+@@ -13,8 +13,9 @@
+
+
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+
+ class Compiler(object):
+ """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/electron24/files/patches/chromium-chromium-system-nodejs.patch b/srcpkgs/electron24/files/patches/chromium-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..83e8b93b9fcf
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/third_party/node/node.py
++++ b/third_party/node/node.py
+@@ -13,11 +13,12 @@
+ def GetBinaryPath():
+ darwin_name = ('node-darwin-arm64' if platform.machine() == 'arm64' else
+ 'node-darwin-x64')
+- return os_path.join(os_path.dirname(__file__), *{
+- 'Darwin': ('mac', darwin_name, 'bin', 'node'),
+- 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+- 'Windows': ('win', 'node.exe'),
+- }[platform.system()])
++ #return os_path.join(os_path.dirname(__file__), *{
++ # 'Darwin': ('mac', darwin_name, 'bin', 'node'),
++ # 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++ # 'Windows': ('win', 'node.exe'),
++ #}[platform.system()])
++ return "/usr/bin/node"
+
+
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/electron24/files/patches/chromium-cross-build.patch b/srcpkgs/electron24/files/patches/chromium-cross-build.patch
new file mode 100644
index 000000000000..53df490bac97
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-cross-build.patch
@@ -0,0 +1,65 @@
+--- a/build/config/compiler/BUILD.gn.orig
++++ b/build/config/compiler/BUILD.gn
+@@ -55,6 +55,10 @@
+ }
+
+ declare_args() {
++ is_musl = false
++}
++
++declare_args() {
+ # Normally, Android builds are lightly optimized, even for debug builds, to
+ # keep binary size down. Setting this flag to true disables such optimization
+ android_full_debug = false
+@@ -917,8 +917,13 @@
+ } else if (current_cpu == "arm64") {
+ if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
+ !(is_chromeos_lacros && is_chromeos_device)) {
+- cflags += [ "--target=aarch64-linux-gnu" ]
+- ldflags += [ "--target=aarch64-linux-gnu" ]
++ if (is_musl) {
++ cflags += [ "--target=aarch64-linux-musl" ]
++ ldflags += [ "--target=aarch64-linux-musl" ]
++ } else {
++ cflags += [ "--target=aarch64-linux-gnu" ]
++ ldflags += [ "--target=aarch64-linux-gnu" ]
++ }
+ }
+ if (is_android) {
+ # Outline atomics crash on Exynos 9810. http://crbug.com/1272795
+--- a/build/toolchain/linux/unbundle/BUILD.gn.orig
++++ b/build/toolchain/linux/unbundle/BUILD.gn
+@@ -39,3 +39,22 @@
+ current_os = host_os
+ }
+ }
++
++gcc_toolchain("v8_snapshot_cross") {
++ cc = getenv("BUILD_CC")
++ cxx = getenv("BUILD_CXX")
++ ar = getenv("BUILD_AR")
++ nm = getenv("BUILD_NM")
++ ld = cxx
++
++ extra_cflags = getenv("BUILD_CFLAGS")
++ extra_cppflags = getenv("BUILD_CPPFLAGS")
++ extra_cxxflags = getenv("BUILD_CXXFLAGS")
++ extra_ldflags = getenv("BUILD_LDFLAGS")
++
++ toolchain_args = {
++ current_cpu = host_cpu
++ current_os = host_os
++ v8_current_cpu = target_cpu
++ }
++}
+--- a/build/config/linux/pkg_config.gni.orig
++++ b/build/config/linux/pkg_config.gni
+@@ -91,7 +91,7 @@
+ assert(defined(invoker.packages),
+ "Variable |packages| must be defined to be a list in pkg_config.")
+ config(target_name) {
+- if (host_toolchain == current_toolchain) {
++ if (current_cpu != target_cpu) {
+ args = common_pkg_config_args + host_pkg_config_args + invoker.packages
+ } else {
+ args = common_pkg_config_args + pkg_config_args + invoker.packages
diff --git a/srcpkgs/electron24/files/patches/chromium-cursed^Uscoped_file.patch b/srcpkgs/electron24/files/patches/chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..2e5433f7abce
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- 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/electron24/files/patches/chromium-fc-cache-version.patch b/srcpkgs/electron24/files/patches/chromium-fc-cache-version.patch
new file mode 100644
index 000000000000..3b768978a43d
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fc-cache-version.patch
@@ -0,0 +1,13 @@
+instead of hardcoding the version, use the defined macro.
+--
+--- a/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
++++ b/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
+@@ -56,7 +56,7 @@
+ FcFini();
+
+ // Check existence of intended fontconfig cache file.
+- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9";
++ auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION;
+ bool cache_exists = access(cache.c_str(), F_OK) == 0;
+ return !cache_exists;
+ }
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/electron24/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch
new file mode 100644
index 000000000000..afcdae179850
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-aarch64-musl-memory-tagging-macros.patch
@@ -0,0 +1,29 @@
+--- a/base/allocator/partition_allocator/tagging.cc
++++ b/base/allocator/partition_allocator/tagging.cc
+@@ -28,13 +28,25 @@
+ #endif
+ #endif
+
+-#ifndef HAS_PR_MTE_MACROS
++#ifndef PR_MTE_TCF_SHIFT
+ #define PR_MTE_TCF_SHIFT 1
++#endif
++#ifndef PR_MTE_TCF_NONE
+ #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_SYNC
+ #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_ASYNC
+ #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_MASK
+ #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TAG_SHIFT
+ #define PR_MTE_TAG_SHIFT 3
++#endif
++#ifndef PR_MTE_TAG_MASK
+ #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
+ #endif
+ #endif
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-argument_spec-isnan-isinf.patch b/srcpkgs/electron24/files/patches/chromium-fix-argument_spec-isnan-isinf.patch
new file mode 100644
index 000000000000..837a0312dcbc
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-argument_spec-isnan-isinf.patch
@@ -0,0 +1,11 @@
+--- a/extensions/renderer/bindings/argument_spec.cc
++++ b/extensions/renderer/bindings/argument_spec.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cmath>
++
+ #include "extensions/renderer/bindings/argument_spec.h"
+
+ #include "base/check.h"
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-constexpr-narrowing.patch b/srcpkgs/electron24/files/patches/chromium-fix-constexpr-narrowing.patch
new file mode 100644
index 000000000000..570ca6e69a80
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-constexpr-narrowing.patch
@@ -0,0 +1,21 @@
+--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc.orig
++++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+@@ -3881,15 +3881,15 @@
+ const T&... values) {
+ std::string strkey = std::string(key);
+
+- if constexpr (Flags & kEncrypted) {
++ if constexpr (Flags & kEncrypted != 0) {
+ if (is_encrypted_)
+ UmaFunction(strkey + ".EME", values...);
+ }
+
+- if constexpr (Flags & kTotal)
++ if constexpr (Flags & kTotal != 0)
+ UmaFunction(strkey + ".All", values...);
+
+- if constexpr (Flags & kPlaybackType) {
++ if constexpr (Flags & kPlaybackType != 0) {
+ auto demuxer_type = GetDemuxerType();
+ if (!demuxer_type.has_value())
+ return;
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-dawn-platform.patch b/srcpkgs/electron24/files/patches/chromium-fix-dawn-platform.patch
new file mode 100644
index 000000000000..93631294fc77
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-dawn-platform.patch
@@ -0,0 +1,62 @@
+From f815e833c946a59620a2ca9df37a1da746f61460 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 1 Oct 2022 00:21:09 +0000
+Subject: [PATCH] fix dawn build for ppc64
+
+---
+ third_party/dawn/src/dawn/common/Assert.cpp | 4 ++--
+ third_party/dawn/src/dawn/common/Platform.h | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/third_party/dawn/src/dawn/common/Assert.cpp b/third_party/dawn/src/dawn/common/Assert.cpp
+index ecc92dfc..8ee91a90 100644
+--- a/third_party/dawn/src/dawn/common/Assert.cpp
++++ b/third_party/dawn/src/dawn/common/Assert.cpp
+@@ -31,9 +31,9 @@ void BreakPoint() {
+ __asm__ __volatile__("ebreak");
+ #elif DAWN_PLATFORM_IS(MIPS)
+ __asm__ __volatile__("break");
+-#elif DAWN_PLATFORM_IS(S390) || DAWN_PLATFORM_IS_(S390X)
++#elif DAWN_PLATFORM_IS(S390) || DAWN_PLATFORM_IS(S390X)
+ __asm__ __volatile__(".word 0x0001");
+-#elif DAWN_PLATFORM_IS(PPC) || DAWN_PLATFORM_IS_(PPC64)
++#elif DAWN_PLATFORM_IS(PPC) || DAWN_PLATFORM_IS(PPC64)
+ __asm__ __volatile__("twge 2,2");
+ #else
+ #error "Unsupported platform"
+diff --git a/third_party/dawn/src/dawn/common/Platform.h b/third_party/dawn/src/dawn/common/Platform.h
+index 39d5eb41..2011367d 100644
+--- a/third_party/dawn/src/dawn/common/Platform.h
++++ b/third_party/dawn/src/dawn/common/Platform.h
+@@ -124,15 +124,15 @@
+ #define DAWN_PLATFORM_IS_MIPS64 1
+ #endif
+
+-#elif defiend(__s390__)
++#elif defined(__s390__)
+ #define DAWN_PLATFORM_IS_S390 1
+-#elif defiend(__s390x__)
++#elif defined(__s390x__)
+ #define DAWN_PLATFORM_IS_S390X 1
+
+-#elif defined(__PPC__)
+-#define DAWN_PLATFORM_IS_PPC 1
+ #elif defined(__PPC64__)
+ #define DAWN_PLATFORM_IS_PPC64 1
++#elif defined(__PPC__)
++#define DAWN_PLATFORM_IS_PPC 1
+
+ #else
+ #error "Unsupported platform."
+@@ -149,7 +149,7 @@
+ static_assert(sizeof(sizeof(char)) == 8, "Expect sizeof(size_t) == 8");
+ #elif defined(DAWN_PLATFORM_IS_I386) || defined(DAWN_PLATFORM_IS_ARM32) || \
+ defined(DAWN_PLATFORM_IS_RISCV32) || defined(DAWN_PLATFORM_IS_MIPS32) || \
+- defined(DAWN_PLATFORM_IS_S390) || defined(DAWN_PLATFORM_IS_PPC32) || \
++ defined(DAWN_PLATFORM_IS_S390) || defined(DAWN_PLATFORM_IS_PPC) || \
+ defined(DAWN_PLATFORM_IS_EMSCRIPTEN) || defined(DAWN_PLATFORM_IS_LOONGARCH32)
+ #define DAWN_PLATFORM_IS_32_BIT 1
+ static_assert(sizeof(sizeof(char)) == 4, "Expect sizeof(size_t) == 4");
+--
+2.34.1
+
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-libc-version-include.patch b/srcpkgs/electron24/files/patches/chromium-fix-libc-version-include.patch
new file mode 100644
index 000000000000..d94dcf6deac5
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-libc-version-include.patch
@@ -0,0 +1,15 @@
+--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
++++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+@@ -61,8 +61,11 @@
+
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++
++#if defined(__GLIBC__)
+ #include <gnu/libc-version.h>
++#endif
+
+ #include "base/linux_util.h"
+ #include "base/strings/string_split.h"
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch b/srcpkgs/electron24/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch
new file mode 100644
index 000000000000..b56717b9ce32
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-missing-TEMP_FAILURE_RETRY-macro.patch
@@ -0,0 +1,21 @@
+This macro is defined in glibc, but not musl.
+
+--- a/sandbox/linux/suid/process_util.h.orig
++++ b/sandbox/linux/suid/process_util.h
+@@ -11,6 +11,16 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+
++// Some additional functions
++#if !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++ (__extension__ \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
++ __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-missing-cstdint-include-musl.patch b/srcpkgs/electron24/files/patches/chromium-fix-missing-cstdint-include-musl.patch
new file mode 100644
index 000000000000..6ca2897f3dd2
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-missing-cstdint-include-musl.patch
@@ -0,0 +1,10 @@
+--- a/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
++++ b/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
+@@ -3,6 +3,7 @@
+
+ #include <stddef.h>
+
++#include <cstdint>
+ #include <functional>
+
+ #include "quiche/common/platform/api/quiche_export.h"
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-musl-missing-unistd_h-include.patch b/srcpkgs/electron24/files/patches/chromium-fix-musl-missing-unistd_h-include.patch
new file mode 100644
index 000000000000..e14d009a9e0b
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-musl-missing-unistd_h-include.patch
@@ -0,0 +1,10 @@
+--- a/sandbox/linux/services/credentials.h
++++ b/sandbox/linux/services/credentials.h
+@@ -13,6 +13,7 @@
+
+ #include <string>
+ #include <vector>
++#include <unistd.h>
+
+ #include "sandbox/linux/system_headers/capability.h"
+ #include "sandbox/sandbox_export.h"
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch b/srcpkgs/electron24/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch
new file mode 100644
index 000000000000..4014d1ee5e69
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-fix-perfetto-GetThreadName-musl.patch
@@ -0,0 +1,22 @@
+--- a/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -30,7 +30,8 @@
+ #include <algorithm>
+ #endif
+
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__))
+ #include <sys/prctl.h>
+ #endif
+
+@@ -58,7 +59,8 @@
+
+ inline bool GetThreadName(std::string& out_result) {
+ char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !defined(__GLIBC__))
+ if (prctl(PR_GET_NAME, buf) != 0)
+ return false;
+ #else
diff --git a/srcpkgs/electron24/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch b/srcpkgs/electron24/files/patches/chromium-fix-swiftshader-llvm-musl-config.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/electron24/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron24/files/patches/chromium-libc_malloc.patch
new file mode 100644
index 000000000000..414f28765d69
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-libc_malloc.patch
@@ -0,0 +1,34 @@
+--- a/base/process/memory_linux.cc
++++ b/base/process/memory_linux.cc
+@@ -18,6 +18,13 @@
+ #include "base/threading/thread_restrictions.h"
+ #include "build/build_config.h"
+
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++extern void *__libc_free(void *ptr);
++}
++#endif
++
+ namespace base {
+
+ namespace {
+@@ -111,7 +118,7 @@
+ #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC)
+ *result = malloc(size);
+ #elif defined(LIBC_GLIBC)
+- *result = __libc_malloc(size);
++ *result = ::__libc_malloc(size);
+ #endif
+ return *result != nullptr;
+ }
+@@ -122,7 +129,7 @@
+ #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC)
+ free(ptr);
+ #elif defined(LIBC_GLIBC)
+- __libc_free(ptr);
++ ::__libc_free(ptr);
+ #endif
+ }
+
diff --git a/srcpkgs/electron24/files/patches/chromium-musl-no-execinfo.patch b/srcpkgs/electron24/files/patches/chromium-musl-no-execinfo.patch
new file mode 100644
index 000000000000..fac2b6d190e7
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-musl-no-execinfo.patch
@@ -0,0 +1,94 @@
+Source: https://git.alpinelinux.org/aports/plain/community/chromium/no-execinfo.patch
+musl does not have execinfo.h, and hence no implementation of
+. backtrace()
+. backtrace_symbols()
+for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1
+--
+--- a/v8/src/codegen/external-reference-table.cc
++++ b/v8/src/codegen/external-reference-table.cc
+@@ -11,7 +11,9 @@
+
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+
+ #include <vector>
+
+@@ -96,7 +98,7 @@
+ }
+
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+ char** names = backtrace_symbols(&address, 1);
+ const char* name = names[0];
+ // The array of names is malloc'ed. However, each name string is static
+--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
++++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+@@ -17,7 +17,11 @@
+ #define ENABLE_CRASH_OVERRIDES 0
+
+ /* Define to 1 if you have the `backtrace' function. */
++#ifdef __GLIBC__
+ #define HAVE_BACKTRACE 1
++#else
++#define HAVE_BACKTRACE 0
++#endif
+
+ /* Define to 1 if you have the <CrashReporterClient.h> header file. */
+ /* #undef HAVE_CRASHREPORTERCLIENT_H */
+@@ -58,7 +62,11 @@
+ #define HAVE_ERRNO_H 1
+
+ /* Define to 1 if you have the <execinfo.h> header file. */
++#ifdef __GLIBC__
+ #define HAVE_EXECINFO_H 1
++#else
++#define HAVE_EXECINFO_H 0
++#endif
+
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #define HAVE_FCNTL_H 1
+--- a/base/debug/stack_trace.cc
++++ b/base/debug/stack_trace.cc
+@@ -251,7 +253,9 @@
+ }
+
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+ OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+
+ std::string StackTrace::ToString() const {
+@@ -281,7 +281,7 @@
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+ std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+ return stream.str();
+--- a/base/debug/stack_trace_unittest.cc
++++ b/base/debug/stack_trace_unittest.cc
+@@ -33,7 +33,7 @@
+ typedef testing::Test StackTraceTest;
+ #endif
+
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && defined(__GLIBC__)
+ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
+ // See https://crbug.com/706728
+
+@@ -156,7 +156,7 @@
+
+ #endif // !defined(__UCLIBC__) && !defined(_AIX)
+
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
++#if (BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !BUILDFLAG(IS_ANDROID)
+ #if !BUILDFLAG(IS_IOS)
+ static char* newArray() {
+ // Clang warns about the mismatched new[]/delete if they occur in the same
diff --git a/srcpkgs/electron24/files/patches/chromium-musl-no-mallinfo.patch b/srcpkgs/electron24/files/patches/chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..cd728ecfb112
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-musl-no-mallinfo.patch
@@ -0,0 +1,125 @@
+Source: https://git.alpinelinux.org/aports/plain/community/chromium/no-mallinfo.patch
+musl does not implement mallinfo()/mallinfo2()
+(or rather, malloc-ng, musl's allocator, doesn't)
+--
+--- a/base/trace_event/malloc_dump_provider.cc
++++ b/base/trace_event/malloc_dump_provider.cc
+@@ -185,7 +185,6 @@
+ #define MALLINFO2_FOUND_IN_LIBC
+ struct mallinfo2 info = mallinfo2();
+ #endif
+-#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if !defined(MALLINFO2_FOUND_IN_LIBC)
+ struct mallinfo info = mallinfo();
+ #endif
+@@ -205,6 +204,7 @@
+ sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize,
+ MemoryAllocatorDump::kUnitsBytes, info.uordblks);
+ }
++#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ }
+ #endif
+
+@@ -339,7 +340,7 @@
+ &allocated_objects_count);
+ #elif BUILDFLAG(IS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
+ &allocated_objects_size, &allocated_objects_count);
+ #endif
+--- a/base/process/process_metrics_posix.cc
++++ b/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@
+
+ #endif // !BUILDFLAG(IS_FUCHSIA)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ namespace {
+
+ size_t GetMallocUsageMallinfo() {
+@@ -123,7 +123,7 @@
+ }
+
+ } // namespace
+-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
++#endif // (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) ||
+ // BUILDFLAG(IS_ANDROID)
+
+ size_t ProcessMetrics::GetMallocUsage() {
+@@ -131,9 +131,9 @@
+ malloc_statistics_t stats = {0};
+ malloc_zone_statistics(nullptr, &stats);
+ return stats.size_in_use;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+ return GetMallocUsageMallinfo();
+-#elif BUILDFLAG(IS_FUCHSIA)
++#else
+ // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+ return 0;
+ #endif
+--- ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig
++++ ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -35,7 +35,7 @@
+
+ MemoryUsage GetMemoryUsage() {
+ MemoryUsage result;
+-#ifdef __linux__
++#if defined(__linux__) && defined(__GLIBC__)
+ rusage res;
+ if (getrusage(RUSAGE_SELF, &res) == 0) {
+ result.max_rss_kb = res.ru_maxrss;
+--- ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
++++ ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
+@@ -86,11 +86,11 @@
+ }
+
+ size_t Process::GetMallocUsage() {
+-#if defined(HAVE_MALLINFO2)
++#if defined(HAVE_MALLINFO2) && defined(__GLIBC__)
+ struct mallinfo2 mi;
+ mi = ::mallinfo2();
+ return mi.uordblks;
+-#elif defined(HAVE_MALLINFO)
++#elif defined(HAVE_MALLINFO) && defined(__GLIBC__)
+ struct mallinfo mi;
+ mi = ::mallinfo();
+ return mi.uordblks;
+
+--- ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400
++++ ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
+--- a/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
++++ b/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
+@@ -717,7 +717,7 @@
+
+ #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if 0
+ SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW {
+ base::SimplePartitionStatsDumper allocator_dumper;
+ Allocator()->DumpStats("malloc", true, &allocator_dumper);
+--- a/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc
++++ b/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc
+@@ -24,7 +24,7 @@
+ #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+
+ // Platforms on which we override weak libc symbols.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
+
+ NOINLINE void FreeForTest(void* data) {
+ free(data);
diff --git a/srcpkgs/electron24/files/patches/chromium-musl-partition-atfork.patch b/srcpkgs/electron24/files/patches/chromium-musl-partition-atfork.patch
new file mode 100644
index 000000000000..2910aa2bbf9b
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-musl-partition-atfork.patch
@@ -0,0 +1,11 @@
+--- a/base/allocator/partition_allocator/partition_root.cc
++++ b/base/allocator/partition_allocator/partition_root.cc
+@@ -239,7 +239,7 @@
+ if (!g_global_init_called.compare_exchange_strong(expected, true))
+ return;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
+ // When fork() is called, only the current thread continues to execute in the
+ // child process. If the lock is held, but *not* by this thread when fork() is
+ // called, we have a deadlock.
diff --git a/srcpkgs/electron24/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/electron24/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..56a4ad1c807e
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,24 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
+index 5ea7083..c13027e 100644
+--- a/v8/src/base/platform/condition-variable.cc
++++ b/v8/src/base/platform/condition-variable.cc
+@@ -16,7 +16,7 @@ namespace base {
+
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+- (V8_OS_LINUX && V8_LIBC_GLIBC))
++ V8_OS_LINUX)
+ // On Free/Net/OpenBSD and Linux with glibc we can change the time
+ // source for pthread_cond_timedwait() to use the monotonic clock.
+ pthread_condattr_t attr;
+@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
+ &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+- (V8_OS_LINUX && V8_LIBC_GLIBC))
++ V8_OS_LINUX)
+ // On Free/Net/OpenBSD and Linux with glibc we can change the time
+ // source for pthread_cond_timedwait() to use the monotonic clock.
+ result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/electron24/files/patches/chromium-no-getcontext.patch b/srcpkgs/electron24/files/patches/chromium-no-getcontext.patch
new file mode 100644
index 000000000000..f9bc2e02d245
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-no-getcontext.patch
@@ -0,0 +1,27 @@
+--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 09:59:55.554536646 +0100
++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100
+@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel
+ siginfo.si_code = SI_USER;
+ siginfo.si_pid = getpid();
+ ucontext_t context;
++#if defined(__GLIBC__)
+ getcontext(&context);
++#endif
+ return HandleSignal(sig, &siginfo, &context);
+ }
+
+@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() {
+ sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+
+ CrashContext context;
++
++#if defined(__GLIBC__)
+ int getcontext_result = getcontext(&context.context);
+ if (getcontext_result)
+ return false;
++#else
++ return false;
++#endif
+
+ #if defined(__i386__)
+ // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/electron24/files/patches/chromium-old-clang.patch b/srcpkgs/electron24/files/patches/chromium-old-clang.patch
new file mode 100644
index 000000000000..b773d09fbd7d
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-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/electron24/files/patches/chromium-reenable-linux-i686-builds.patch b/srcpkgs/electron24/files/patches/chromium-reenable-linux-i686-builds.patch
new file mode 100644
index 000000000000..b18718e43649
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-reenable-linux-i686-builds.patch
@@ -0,0 +1,19 @@
+--- a/BUILD.gn.orig
++++ b/BUILD.gn
+@@ -1616,16 +1616,6 @@
+ }
+ }
+
+-# TODO(cassew): Add more OS's that don't support x86.
+-is_valid_x86_target =
+- target_os != "ios" && target_os != "mac" &&
+- (target_os != "linux" || use_libfuzzer || !build_with_chromium)
+-
+-# Note: v8_target_cpu == arm allows using the V8 arm simulator on x86 for fuzzing.
+-assert(
+- is_valid_x86_target || target_cpu != "x86" || v8_target_cpu == "arm",
+- "'target_cpu=x86' is not supported for 'target_os=$target_os'. Consider omitting 'target_cpu' (default) or using 'target_cpu=x64' instead.")
+-
+ group("chromium_builder_perf") {
+ testonly = true
+
diff --git a/srcpkgs/electron24/files/patches/chromium-remove-sys-cdefs-includes.patch b/srcpkgs/electron24/files/patches/chromium-remove-sys-cdefs-includes.patch
new file mode 100644
index 000000000000..00344073f461
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-remove-sys-cdefs-includes.patch
@@ -0,0 +1,39 @@
+--- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,8 +17,6 @@
+
+ #include_next <sys/ptrace.h>
+
+-#include <sys/cdefs.h>
+-
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+ defined(__GLIBC__)
+--- a/third_party/libsync/src/include/sync/sync.h
++++ b/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+
+ #include <linux/types.h>
+
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+
+ struct sync_legacy_merge_data {
+ int32_t fd2;
+@@ -158,6 +159,8 @@
+ struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/electron24/files/patches/chromium-riscv-angle.patch b/srcpkgs/electron24/files/patches/chromium-riscv-angle.patch
new file mode 100644
index 000000000000..a25bf0d3f326
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-riscv-angle.patch
@@ -0,0 +1,27 @@
+Index: chromium-103.0.5060.53/third_party/angle/gni/angle.gni
+===================================================================
+--- chromium-103.0.5060.53.orig/third_party/angle/gni/angle.gni
++++ chromium-103.0.5060.53/third_party/angle/gni/angle.gni
+@@ -77,7 +77,8 @@ declare_args() {
+
+ if (current_cpu == "arm64" || current_cpu == "x64" ||
+ current_cpu == "mips64el" || current_cpu == "s390x" ||
+- current_cpu == "ppc64" || current_cpu == "loong64") {
++ current_cpu == "ppc64" || current_cpu == "loong64" ||
++ current_cpu == "riscv64") {
+ angle_64bit_current_cpu = true
+ } else if (current_cpu == "arm" || current_cpu == "x86" ||
+ current_cpu == "mipsel" || current_cpu == "s390" ||
+Index: chromium-103.0.5060.53/third_party/angle/src/common/platform.h
+===================================================================
+--- chromium-103.0.5060.53.orig/third_party/angle/src/common/platform.h
++++ chromium-103.0.5060.53/third_party/angle/src/common/platform.h
+@@ -102,7 +102,7 @@
+ #endif
+
+ // Mips and arm devices need to include stddef for size_t.
+-#if defined(__mips__) || defined(__arm__) || defined(__aarch64__)
++#if defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(__riscv)
+ # include <stddef.h>
+ #endif
+
diff --git a/srcpkgs/electron24/files/patches/chromium-riscv-crashpad.patch b/srcpkgs/electron24/files/patches/chromium-riscv-crashpad.patch
new file mode 100644
index 000000000000..cc2c37791ace
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-riscv-crashpad.patch
@@ -0,0 +1,777 @@
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_context.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,41 @@ struct MinidumpContextMIPS64 {
+ uint64_t fir;
+ };
+
++//! \brief 64bit RISC-V-specifc flags for MinidumpContextRISCV64::context_flags.
++//! Based on minidump_cpu_riscv64.h from breakpad
++enum MinidumpContextRISCV64Flags : uint32_t {
++ //! \brief Identifies the context structure as RISCV64.
++ kMinidumpContextRISCV64 = 0x00080000,
++
++ //! \brief Indicates the validity of integer registers.
++ //!
++ //! Registers `x1`-`x31` and pc are valid.
++ kMinidumpContextRISCV64Integer = kMinidumpContextRISCV64 | 0x00000002,
++
++ //! \brief Indicates the validity of floating point registers.
++ //!
++ //! Floating point registers `f0`-`f31`, and `fcsr` are valid
++ kMinidumpContextRISCV64FloatingPoint = kMinidumpContextRISCV64 | 0x00000004,
++
++ //! \brief Indicates the validity of all registers.
++ kMinidumpContextRISCV64All = kMinidumpContextRISCV64Integer |
++ kMinidumpContextRISCV64FloatingPoint,
++};
++
++//! \brief A 64bit RISCV CPU context (register state) carried in a minidump file.
++struct MinidumpContextRISCV64 {
++ uint64_t context_flags;
++
++ //! \brief General purpose registers.
++ uint64_t regs[32];
++
++ //! \brief FPU registers.
++ uint64_t fpregs[32];
++
++ //! \brief FPU status register.
++ uint64_t fcsr;
++};
++
+ } // namespace crashpad
+
+ #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -102,6 +102,13 @@ MinidumpContextWriter::CreateFromSnapsho
+ break;
+ }
+
++ case kCPUArchitectureRISCV64: {
++ context = std::make_unique<MinidumpContextRISCV64Writer>();
++ reinterpret_cast<MinidumpContextRISCV64Writer*>(context.get())
++ ->InitializeFromSnapshot(context_snapshot->riscv64);
++ break;
++ }
++
+ default: {
+ LOG(ERROR) << "unknown context architecture "
+ << context_snapshot->architecture;
+@@ -453,5 +460,42 @@ size_t MinidumpContextMIPS64Writer::Cont
+ DCHECK_GE(state(), kStateFrozen);
+ return sizeof(context_);
+ }
++
++MinidumpContextRISCV64Writer::MinidumpContextRISCV64Writer()
++ : MinidumpContextWriter(), context_() {
++ context_.context_flags = kMinidumpContextRISCV64;
++}
++
++MinidumpContextRISCV64Writer::~MinidumpContextRISCV64Writer() = default;
++
++void MinidumpContextRISCV64Writer::InitializeFromSnapshot(
++ const CPUContextRISCV64* context_snapshot) {
++ DCHECK_EQ(state(), kStateMutable);
++ DCHECK_EQ(context_.context_flags, kMinidumpContextRISCV64);
++
++ context_.context_flags = kMinidumpContextRISCV64All;
++
++ static_assert(sizeof(context_.regs) == sizeof(context_snapshot->regs),
++ "GPRs size mismatch");
++ memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
++
++ static_assert(sizeof(context_.fpregs) == sizeof(context_snapshot->fpregs),
++ "FPRs size mismatch");
++ memcpy(context_.fpregs,
++ context_snapshot->fpregs,
++ sizeof(context_.fpregs));
++ context_.fcsr = context_snapshot->fcsr;
++}
++
++bool MinidumpContextRISCV64Writer::WriteObject(
++ FileWriterInterface* file_writer) {
++ DCHECK_EQ(state(), kStateWritable);
++ return file_writer->Write(&context_, sizeof(context_));
++}
++
++size_t MinidumpContextRISCV64Writer::ContextSize() const {
++ DCHECK_GE(state(), kStateFrozen);
++ return sizeof(context_);
++}
+
+ } // namespace crashpad
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -330,6 +330,49 @@ class MinidumpContextMIPS64Writer final
+ MinidumpContextMIPS64 context_;
+ };
+
++//! \brief The writer for a MinidumpContextRISCV64 structure in a minidump file.
++class MinidumpContextRISCV64Writer final : public MinidumpContextWriter {
++ public:
++ MinidumpContextRISCV64Writer();
++
++ MinidumpContextRISCV64Writer(const MinidumpContextRISCV64Writer&) = delete;
++ MinidumpContextRISCV64Writer& operator=(const MinidumpContextRISCV64Writer&) =
++ delete;
++
++ ~MinidumpContextRISCV64Writer() override;
++
++ //! \brief Initializes the MinidumpContextRISCV based on \a context_snapshot.
++ //!
++ //! \param[in] context_snapshot The context snapshot to use as source data.
++ //!
++ //! \note Valid in #kStateMutable. No mutation of context() may be done before
++ //! calling this method, and it is not normally necessary to alter
++ //! context() after calling this method.
++ void InitializeFromSnapshot(const CPUContextRISCV64* context_snapshot);
++
++ //! \brief Returns a pointer to the context structure that this object will
++ //! write.
++ //!
++ //! \attention This returns a non-`const` pointer to this object’s private
++ //! data so that a caller can populate the context structure directly.
++ //! This is done because providing setter interfaces to each field in the
++ //! context structure would be unwieldy and cumbersome. Care must be taken
++ //! to populate the context structure correctly. The context structure
++ //! must only be modified while this object is in the #kStateMutable
++ //! state.
++ MinidumpContextRISCV64* context() { return &context_; }
++
++ protected:
++ // MinidumpWritable:
++ bool WriteObject(FileWriterInterface* file_writer) override;
++
++ // MinidumpContextWriter:
++ size_t ContextSize() const override;
++
++ private:
++ MinidumpContextRISCV64 context_;
++};
++
+ } // namespace crashpad
+
+ #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,10 @@ std::string MinidumpMiscInfoDebugBuildSt
+ static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+ static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_RISCV32)
++ static constexpr char kCPU[] = "riscv32";
++#elif defined(ARCH_CPU_RISCV64)
++ static constexpr char kCPU[] = "riscv64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,16 @@ void CaptureMemory::PointedToByContext(c
+ for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) {
+ MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+ }
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ if (context.architecture == kCPUArchitectureRISCV64) {
++ for (size_t i = 0; i < std::size(context.riscv64->regs); ++i) {
++ MaybeCaptureMemoryAround(delegate, context.riscv64->regs[i]);
++ }
++ } else {
++ for (size_t i = 0; i < std::size(context.riscv32->regs); ++i) {
++ MaybeCaptureMemoryAround(delegate, context.riscv32->regs[i]);
++ }
++ }
+ #else
+ #error Port.
+ #endif
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,13 @@ enum CPUArchitecture {
+ kCPUArchitectureMIPSEL,
+
+ //! \brief 64-bit MIPSEL.
+- kCPUArchitectureMIPS64EL
++ kCPUArchitectureMIPS64EL,
++
++ //! \brief 32-bit RISCV.
++ kCPUArchitectureRISCV32,
++
++ //! \brief 64-bit RISCV.
++ kCPUArchitectureRISCV64
+ };
+
+ } // namespace crashpad
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -197,10 +197,12 @@ bool CPUContext::Is64Bit() const {
+ case kCPUArchitectureX86_64:
+ case kCPUArchitectureARM64:
+ case kCPUArchitectureMIPS64EL:
++ case kCPUArchitectureRISCV64:
+ return true;
+ case kCPUArchitectureX86:
+ case kCPUArchitectureARM:
+ case kCPUArchitectureMIPSEL:
++ case kCPUArchitectureRISCV32:
+ return false;
+ default:
+ NOTREACHED();
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/cpu_context.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,20 @@ struct CPUContextMIPS64 {
+ uint64_t fir;
+ };
+
++//! \brief A context structure carrying RISCV32 CPU state.
++struct CPUContextRISCV32 {
++ uint32_t regs[32];
++ uint64_t fpregs[32];
++ uint32_t fcsr;
++};
++
++//! \brief A context structure carrying RISCV64 CPU state.
++struct CPUContextRISCV64 {
++ uint64_t regs[32];
++ uint64_t fpregs[32];
++ uint32_t fcsr;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //! CPU architecture.
+ struct CPUContext {
+@@ -382,6 +396,8 @@ struct CPUContext {
+ CPUContextARM64* arm64;
+ CPUContextMIPS* mipsel;
+ CPUContextMIPS64* mips64;
++ CPUContextRISCV32* riscv32;
++ CPUContextRISCV64* riscv64;
+ };
+ };
+
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
+@@ -266,6 +266,30 @@ void InitializeCPUContextARM64_OnlyFPSIM
+ context->fpcr = float_context.fpcr;
+ }
+
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++
++template <typename Traits>
++void InitializeCPUContextRISCV(
++ const typename Traits::SignalThreadContext& thread_context,
++ const typename Traits::SignalFloatContext& float_context,
++ typename Traits::CPUContext* context) {
++ static_assert(sizeof(context->regs) == sizeof(thread_context),
++ "registers size mismatch");
++ static_assert(sizeof(context->fpregs) == sizeof(float_context.f),
++ "fp registers size mismatch");
++ memcpy(&context->regs, &thread_context, sizeof(context->regs));
++ memcpy(&context->fpregs, &float_context.f, sizeof(context->fpregs));
++ context->fcsr = float_context.fcsr;
++}
++template void InitializeCPUContextRISCV<ContextTraits32>(
++ const ContextTraits32::SignalThreadContext& thread_context,
++ const ContextTraits32::SignalFloatContext& float_context,
++ ContextTraits32::CPUContext* context);
++template void InitializeCPUContextRISCV<ContextTraits64>(
++ const ContextTraits64::SignalThreadContext& thread_context,
++ const ContextTraits64::SignalFloatContext& float_context,
++ ContextTraits64::CPUContext* context);
++
+ #endif // ARCH_CPU_X86_FAMILY
+
+ } // namespace internal
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -174,6 +174,22 @@ void InitializeCPUContextMIPS(
+
+ #endif // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+
++#if defined(ARCH_CPU_RISCV_FAMILY) || DOXYGEN
++
++//! \brief Initializes a CPUContextRISCV structure from native context
++//! structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[out] context The CPUContextRISCV structure to initialize.
++template <typename Traits>
++void InitializeCPUContextRISCV(
++ const typename Traits::SignalThreadContext& thread_context,
++ const typename Traits::SignalFloatContext& float_context,
++ typename Traits::CPUContext* context);
++
++#endif // ARCH_CPU_RISCV_FAMILY || DOXYGEN
++
+ } // namespace internal
+ } // namespace crashpad
+
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -325,6 +325,61 @@ bool ExceptionSnapshotLinux::ReadContext
+ reader, context_address, context_.mips64);
+ }
+
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++ LinuxVMAddress context_address,
++ typename Traits::CPUContext* dest_context) {
++ const ProcessMemory* memory = reader->Memory();
++
++ LinuxVMAddress gregs_address = context_address +
++ offsetof(UContext<Traits>, mcontext) +
++ offsetof(typename Traits::MContext, gregs);
++
++ typename Traits::SignalThreadContext thread_context;
++ if (!memory->Read(gregs_address, sizeof(thread_context), &thread_context)) {
++ LOG(ERROR) << "Couldn't read gregs";
++ return false;
++ }
++
++ LinuxVMAddress fpregs_address = context_address +
++ offsetof(UContext<Traits>, mcontext) +
++ offsetof(typename Traits::MContext, fpregs);
++
++ typename Traits::SignalFloatContext fp_context;
++ if (!memory->Read(fpregs_address, sizeof(fp_context), &fp_context)) {
++ LOG(ERROR) << "Couldn't read fpregs";
++ return false;
++ }
++
++ InitializeCPUContextRISCV<Traits>(thread_context, fp_context, dest_context);
++
++ return true;
++}
++
++template <>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++ ProcessReaderLinux* reader,
++ LinuxVMAddress context_address) {
++ context_.architecture = kCPUArchitectureRISCV32;
++ context_.riscv32 = &context_union_.riscv32;
++
++ return internal::ReadContext<ContextTraits32>(
++ reader, context_address, context_.riscv32);
++}
++
++template <>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++ ProcessReaderLinux* reader,
++ LinuxVMAddress context_address) {
++ context_.architecture = kCPUArchitectureRISCV64;
++ context_.riscv64 = &context_union_.riscv64;
++
++ return internal::ReadContext<ContextTraits64>(
++ reader, context_address, context_.riscv64);
++}
++
+ #endif // ARCH_CPU_X86_FAMILY
+
+ bool ExceptionSnapshotLinux::Initialize(
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -89,6 +89,9 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ CPUContextMIPS mipsel;
+ CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ CPUContextRISCV32 riscv32;
++ CPUContextRISCV64 riscv64;
+ #endif
+ } context_union_;
+ CPUContext context_;
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,9 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+ : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.sp
++ : thread_info.thread_context.t32.sp;
+ #else
+ #error Port.
+ #endif
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,67 @@ static_assert(offsetof(UContext<ContextT
+ "context offset mismatch");
+ #endif
+
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++
++struct MContext32 {
++ uint32_t gregs[32];
++ uint64_t fpregs[32];
++ unsigned int fcsr;
++};
++
++struct MContext64 {
++ uint64_t gregs[32];
++ uint64_t fpregs[32];
++ unsigned int fcsr;
++};
++
++struct ContextTraits32 : public Traits32 {
++ using MContext = MContext32;
++ using SignalThreadContext = ThreadContext::t32_t;
++ using SignalFloatContext = FloatContext::f32_t;
++ using CPUContext = CPUContextRISCV32;
++};
++
++struct ContextTraits64 : public Traits64 {
++ using MContext = MContext64;
++ using SignalThreadContext = ThreadContext::t64_t;
++ using SignalFloatContext = FloatContext::f64_t;
++ using CPUContext = CPUContextRISCV64;
++};
++
++template <typename Traits>
++struct UContext {
++ typename Traits::ULong flags;
++ typename Traits::Address link;
++ SignalStack<Traits> stack;
++ Sigset<Traits> sigmask;
++ char padding[128 - sizeof(sigmask)];
++ typename Traits::Char_64Only padding2[8];
++ typename Traits::MContext mcontext;
++};
++
++#if defined(ARCH_CPU_RISCV32)
++static_assert(offsetof(UContext<ContextTraits32>, mcontext) ==
++ offsetof(ucontext_t, uc_mcontext),
++ "context offset mismatch");
++static_assert(offsetof(UContext<ContextTraits32>, mcontext.gregs) ==
++ offsetof(ucontext_t, uc_mcontext.__gregs),
++ "context offset mismatch");
++static_assert(offsetof(UContext<ContextTraits32>, mcontext.fpregs) ==
++ offsetof(ucontext_t, uc_mcontext.__fpregs),
++ "context offset mismatch");
++#elif defined(ARCH_CPU_RISCV64)
++static_assert(offsetof(UContext<ContextTraits64>, mcontext) ==
++ offsetof(ucontext_t, uc_mcontext),
++ "context offset mismatch");
++static_assert(offsetof(UContext<ContextTraits64>, mcontext.gregs) ==
++ offsetof(ucontext_t, uc_mcontext.__gregs),
++ "context offset mismatch");
++static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
++ offsetof(ucontext_t, uc_mcontext.__fpregs),
++ "context offset mismatch");
++#endif
++
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -205,6 +205,9 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+ : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ return process_reader_->Is64Bit() ? kCPUArchitectureRISCV64
++ : kCPUArchitectureRISCV32;
+ #else
+ #error port to your architecture
+ #endif
+@@ -220,6 +223,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // Not implementable on MIPS
+ return 0;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ // Not implementable on RISCV
++ return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -240,6 +246,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // Not implementable on MIPS
+ return std::string();
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ // Not implementable on RISCV
++ return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -373,6 +382,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // Not implementable on MIPS
+ return false;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ // Not implementable on RISCV
++ return false;
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -189,6 +189,22 @@ bool ThreadSnapshotLinux::Initialize(
+ thread.thread_info.float_context.f32,
+ context_.mipsel);
+ }
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ if (process_reader->Is64Bit()) {
++ context_.architecture = kCPUArchitectureRISCV64;
++ context_.riscv64 = &context_union_.riscv64;
++ InitializeCPUContextRISCV<ContextTraits64>(
++ thread.thread_info.thread_context.t64,
++ thread.thread_info.float_context.f64,
++ context_.riscv64);
++ } else {
++ context_.architecture = kCPUArchitectureRISCV32;
++ context_.riscv32 = &context_union_.riscv32;
++ InitializeCPUContextRISCV<ContextTraits32>(
++ thread.thread_info.thread_context.t32,
++ thread.thread_info.float_context.f32,
++ context_.riscv32);
++ }
+ #else
+ #error Port.
+ #endif
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -73,6 +73,9 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ CPUContextMIPS mipsel;
+ CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ CPUContextRISCV32 riscv32;
++ CPUContextRISCV64 riscv64;
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/util/linux/ptracer.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -398,6 +398,51 @@ bool GetThreadArea64(pid_t tid,
+ return true;
+ }
+
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++ iovec iov;
++ iov.iov_base = dest;
++ iov.iov_len = sizeof(*dest);
++ if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++ PLOG_IF(ERROR, can_log) << "ptrace";
++ return false;
++ }
++ if (iov.iov_len != sizeof(*dest)) {
++ LOG_IF(ERROR, can_log) << "Unexpected registers size";
++ return false;
++ }
++ return true;
++}
++
++bool GetFloatingPointRegisters32(pid_t tid,
++ FloatContext* context,
++ bool can_log) {
++ return false;
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++ FloatContext* context,
++ bool can_log) {
++ return GetRegisterSet(tid, NT_PRFPREG, &context->f64.f, can_log);
++}
++
++bool GetThreadArea32(pid_t tid,
++ const ThreadContext& context,
++ LinuxVMAddress* address,
++ bool can_log) {
++ return false;
++}
++
++bool GetThreadArea64(pid_t tid,
++ const ThreadContext& context,
++ LinuxVMAddress* address,
++ bool can_log) {
++ *address = context.t64.tp;
++ return true;
++}
++
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/util/linux/thread_info.h
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -79,6 +79,40 @@ union ThreadContext {
+ uint32_t cp0_status;
+ uint32_t cp0_cause;
+ uint32_t padding1_;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ // Reflects user_regs_struct in asm/ptrace.h.
++ uint32_t pc;
++ uint32_t ra;
++ uint32_t sp;
++ uint32_t gp;
++ uint32_t tp;
++ uint32_t t0;
++ uint32_t t1;
++ uint32_t t2;
++ uint32_t s0;
++ uint32_t s1;
++ uint32_t a0;
++ uint32_t a1;
++ uint32_t a2;
++ uint32_t a3;
++ uint32_t a4;
++ uint32_t a5;
++ uint32_t a6;
++ uint32_t a7;
++ uint32_t s2;
++ uint32_t s3;
++ uint32_t s4;
++ uint32_t s5;
++ uint32_t s6;
++ uint32_t s7;
++ uint32_t s8;
++ uint32_t s9;
++ uint32_t s10;
++ uint32_t s11;
++ uint32_t t3;
++ uint32_t t4;
++ uint32_t t5;
++ uint32_t t6;
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+@@ -132,6 +166,40 @@ union ThreadContext {
+ uint64_t cp0_badvaddr;
+ uint64_t cp0_status;
+ uint64_t cp0_cause;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ // Reflects user_regs_struct in asm/ptrace.h.
++ uint64_t pc;
++ uint64_t ra;
++ uint64_t sp;
++ uint64_t gp;
++ uint64_t tp;
++ uint64_t t0;
++ uint64_t t1;
++ uint64_t t2;
++ uint64_t s0;
++ uint64_t s1;
++ uint64_t a0;
++ uint64_t a1;
++ uint64_t a2;
++ uint64_t a3;
++ uint64_t a4;
++ uint64_t a5;
++ uint64_t a6;
++ uint64_t a7;
++ uint64_t s2;
++ uint64_t s3;
++ uint64_t s4;
++ uint64_t s5;
++ uint64_t s6;
++ uint64_t s7;
++ uint64_t s8;
++ uint64_t s9;
++ uint64_t s10;
++ uint64_t s11;
++ uint64_t t3;
++ uint64_t t4;
++ uint64_t t5;
++ uint64_t t6;
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+@@ -143,11 +211,12 @@ union ThreadContext {
+ using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_RISCV_FAMILY)
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+
+-#if !defined(ARCH_CPU_MIPS_FAMILY)
++#if !defined(ARCH_CPU_MIPS_FAMILY) && !defined(ARCH_CPU_RISCV_FAMILY)
+ #if defined(ARCH_CPU_32_BITS)
+ static_assert(sizeof(t32_t) == sizeof(NativeThreadContext), "Size mismatch");
+ #else // ARCH_CPU_64_BITS
+@@ -218,6 +287,9 @@ union FloatContext {
+ } fpregs[32];
+ uint32_t fpcsr;
+ uint32_t fpu_id;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ uint64_t f[32];
++ uint32_t fcsr;
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+@@ -252,6 +324,9 @@ union FloatContext {
+ double fpregs[32];
+ uint32_t fpcsr;
+ uint32_t fpu_id;
++#elif defined(ARCH_CPU_RISCV_FAMILY)
++ uint64_t f[32];
++ uint32_t fcsr;
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86_FAMILY
+@@ -281,6 +356,7 @@ union FloatContext {
+ static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_RISCV_FAMILY)
+ #else
+ #error Port.
+ #endif // ARCH_CPU_X86
+Index: chromium-102.0.5005.61/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+===================================================================
+--- chromium-102.0.5005.61.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ chromium-102.0.5005.61/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -237,6 +237,8 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+ static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(ARCH_CPU_RISCV64)
++ static constexpr char arch[] = "riscv64";
+ #else
+ #error Port
+ #endif
diff --git a/srcpkgs/electron24/files/patches/chromium-riscv-dav1d.patch b/srcpkgs/electron24/files/patches/chromium-riscv-dav1d.patch
new file mode 100644
index 000000000000..d5c8058b41e2
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-riscv-dav1d.patch
@@ -0,0 +1,43 @@
+Index: chromium-102.0.5005.61/third_party/dav1d/config/linux/riscv64/config.h
+===================================================================
+--- /dev/null
++++ chromium-102.0.5005.61/third_party/dav1d/config/linux/riscv64/config.h
+@@ -0,0 +1,38 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 0
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 0
++
++#define HAVE_AS_FUNC 0
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
diff --git a/srcpkgs/electron24/files/patches/chromium-sandbox-membarrier.patch b/srcpkgs/electron24/files/patches/chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..55ef2516194a
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-sandbox-membarrier.patch
@@ -0,0 +1,10 @@
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -370,6 +370,7 @@
+ switch (sysno) {
+ case __NR_exit:
+ case __NR_exit_group:
++ case __NR_membarrier:
+ case __NR_wait4:
+ case __NR_waitid:
+ #if defined(__i386__)
diff --git a/srcpkgs/electron24/files/patches/chromium-sndio.patch b/srcpkgs/electron24/files/patches/chromium-sndio.patch
new file mode 100644
index 000000000000..077ceaa8acbc
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-sndio.patch
@@ -0,0 +1,877 @@
+diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
+--- a/media/BUILD.gn 2020-06-03 20:40:26.000000000 +0200
++++ b/media/BUILD.gn 2021-06-13 17:32:28.510395975 +0200
+@@ -65,6 +65,9 @@
+ defines += [ "DLOPEN_PULSEAUDIO" ]
+ }
+ }
++ if (use_sndio) {
++ defines += [ "USE_SNDIO" ]
++ }
+ if (use_cras) {
+ defines += [ "USE_CRAS" ]
+ }
+diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
+--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
++++ b/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200
+@@ -236,6 +236,17 @@
+ sources += [ "linux/audio_manager_linux.cc" ]
+ }
+
++ if (use_sndio) {
++ libs += [ "sndio" ]
++ sources += [
++ "sndio/audio_manager_sndio.cc",
++ "sndio/sndio_input.cc",
++ "sndio/sndio_input.h",
++ "sndio/sndio_output.cc",
++ "sndio/sndio_output.h"
++ ]
++ }
++
+ if (use_alsa) {
+ libs += [ "asound" ]
+ sources += [
+diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc
+--- a/media/audio/linux/audio_manager_linux.cc 2020-06-03 20:39:37.000000000 +0200
++++ b/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200
+@@ -19,6 +19,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+
+ namespace media {
+
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -39,6 +45,16 @@
+ audio_log_factory);
+ }
+
++#if defined(USE_SNDIO)
++ struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++ if (hdl != NULL) {
++ sio_close(hdl);
++ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++ return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++ audio_log_factory);
++ }
++#endif
++
+ #if defined(USE_CRAS)
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc
+--- a/media/audio/sndio/audio_manager_sndio.cc 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++ DCHECK(device_names->empty());
++ device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++ return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++ return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++ AudioDeviceNames* device_names) {
++ DCHECK(device_names->empty());
++ AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++ AudioDeviceNames* device_names) {
++ AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++ return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++ const std::string& device_id) {
++ static const int kDefaultInputBufferSize = 1024;
++
++ int user_buffer_size = GetUserBufferSize();
++ int buffer_size = user_buffer_size ?
++ user_buffer_size : kDefaultInputBufferSize;
++
++ return AudioParameters(
++ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++ kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++ AudioLogFactory* audio_log_factory)
++ : AudioManagerBase(std::move(audio_thread),
++ audio_log_factory) {
++ DLOG(WARNING) << "AudioManagerSndio";
++ SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++ Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++ const AudioParameters& params,
++ const LogCallback& log_callback) {
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++ return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) {
++ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++ return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) {
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++ return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) {
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++ return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++ const std::string& output_device_id,
++ const AudioParameters& input_params) {
++ // TODO(tommi): Support |output_device_id|.
++ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++ static const int kDefaultOutputBufferSize = 2048;
++
++ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++ int sample_rate = kDefaultSampleRate;
++ int buffer_size = kDefaultOutputBufferSize;
++ if (input_params.IsValid()) {
++ sample_rate = input_params.sample_rate();
++ channel_layout = input_params.channel_layout();
++ buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++ }
++
++ int user_buffer_size = GetUserBufferSize();
++ if (user_buffer_size)
++ buffer_size = user_buffer_size;
++
++ return AudioParameters(
++ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++ sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++ const AudioParameters& params) {
++ DLOG(WARNING) << "MakeInputStream";
++ return new SndioAudioInputStream(this,
++ AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++ const AudioParameters& params) {
++ DLOG(WARNING) << "MakeOutputStream";
++ return new SndioAudioOutputStream(params, this);
++}
++
++} // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h
+--- a/media/audio/sndio/audio_manager_sndio.h 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++ AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++ AudioLogFactory* audio_log_factory);
++ ~AudioManagerSndio() override;
++
++ // Implementation of AudioManager.
++ bool HasAudioOutputDevices() override;
++ bool HasAudioInputDevices() override;
++ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++ AudioParameters GetInputStreamParameters(
++ const std::string& device_id) override;
++ const char* GetName() override;
++
++ // Implementation of AudioManagerBase.
++ AudioOutputStream* MakeLinearOutputStream(
++ const AudioParameters& params,
++ const LogCallback& log_callback) override;
++ AudioOutputStream* MakeLowLatencyOutputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) override;
++ AudioInputStream* MakeLinearInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) override;
++ AudioInputStream* MakeLowLatencyInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) override;
++
++ protected:
++ AudioParameters GetPreferredOutputStreamParameters(
++ const std::string& output_device_id,
++ const AudioParameters& input_params) override;
++
++ private:
++ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++ AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++ AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++} // namespace media
++
++#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc
+--- a/media/audio/sndio/sndio_input.cc 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++ self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++ self->ThreadLoop();
++ return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++ const std::string& device_name,
++ const AudioParameters& params)
++ : manager(manager),
++ params(params),
++ audio_bus(AudioBus::Create(params)),
++ state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++ if (state != kClosed)
++ Close();
++}
++
++bool SndioAudioInputStream::Open() {
++ struct sio_par par;
++ int sig;
++
++ if (state != kClosed)
++ return false;
++
++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++ LOG(WARNING) << "Unsupported audio format.";
++ return false;
++ }
++
++ sio_initpar(&par);
++ par.rate = params.sample_rate();
++ par.rchan = params.channels();
++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++ par.bps = par.bits / 8;
++ par.sig = sig = par.bits != 8 ? 1 : 0;
++ par.le = SIO_LE_NATIVE;
++ par.appbufsz = params.frames_per_buffer();
++
++ hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++ if (hdl == NULL) {
++ LOG(ERROR) << "Couldn't open audio device.";
++ return false;
++ }
++
++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++ LOG(ERROR) << "Couldn't set audio parameters.";
++ goto bad_close;
++ }
++
++ if (par.rate != (unsigned int)params.sample_rate() ||
++ par.rchan != (unsigned int)params.channels() ||
++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++ par.sig != (unsigned int)sig ||
++ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++ (par.bits != par.bps * 8)) {
++ LOG(ERROR) << "Unsupported audio parameters.";
++ goto bad_close;
++ }
++ state = kStopped;
++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++ sio_onmove(hdl, &OnMoveCallback, this);
++ return true;
++bad_close:
++ sio_close(hdl);
++ return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++ StartAgc();
++
++ state = kRunning;
++ hw_delay = 0;
++ callback = cb;
++ sio_start(hdl);
++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++ LOG(ERROR) << "Failed to create real-time thread for recording.";
++ sio_stop(hdl);
++ state = kStopped;
++ }
++}
++
++void SndioAudioInputStream::Stop() {
++
++ if (state == kStopped)
++ return;
++
++ state = kStopWait;
++ pthread_join(thread, NULL);
++ sio_stop(hdl);
++ state = kStopped;
++
++ StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++ if (state == kClosed)
++ return;
++
++ if (state == kRunning)
++ Stop();
++
++ state = kClosed;
++ delete [] buffer;
++ sio_close(hdl);
++
++ manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++ // Not supported
++ return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++ // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++ // Not supported.
++ return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++ // Not supported.
++ return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++ const std::string& output_device_id) {
++ // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++ size_t todo, n;
++ char *data;
++ unsigned int nframes;
++ double normalized_volume = 0.0;
++
++ nframes = audio_bus->frames();
++
++ while (state == kRunning && !sio_eof(hdl)) {
++
++ GetAgcVolume(&normalized_volume);
++
++ // read one block
++ todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++ data = buffer;
++ while (todo > 0) {
++ n = sio_read(hdl, data, todo);
++ if (n == 0)
++ return; // unrecoverable I/O error
++ todo -= n;
++ data += n;
++ }
++ hw_delay -= nframes;
++
++ // convert frames count to TimeDelta
++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++ params.sample_rate());
++
++ // push into bus
++ audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++ // invoke callback
++ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++ }
++}
++
++} // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h
+--- a/media/audio/sndio/sndio_input.h 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++ // Pass this to the constructor if you want to attempt auto-selection
++ // of the audio recording device.
++ static const char kAutoSelectDevice[];
++
++ // Create a PCM Output stream for the SNDIO device identified by
++ // |device_name|. If unsure of what to use for |device_name|, use
++ // |kAutoSelectDevice|.
++ SndioAudioInputStream(AudioManagerBase* audio_manager,
++ const std::string& device_name,
++ const AudioParameters& params);
++
++ ~SndioAudioInputStream() override;
++
++ // Implementation of AudioInputStream.
++ bool Open() override;
++ void Start(AudioInputCallback* callback) override;
++ void Stop() override;
++ void Close() override;
++ double GetMaxVolume() override;
++ void SetVolume(double volume) override;
++ double GetVolume() override;
++ bool IsMuted() override;
++ void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++ enum StreamState {
++ kClosed, // Not opened yet
++ kStopped, // Device opened, but not started yet
++ kRunning, // Started, device playing
++ kStopWait // Stopping, waiting for the real-time thread to exit
++ };
++
++ // C-style call-backs
++ static void OnMoveCallback(void *arg, int delta);
++ static void* ThreadEntry(void *arg);
++
++ // Continuously moves data from the device to the consumer
++ void ThreadLoop();
++ // Our creator, the audio manager needs to be notified when we close.
++ AudioManagerBase* manager;
++ // Parameters of the source
++ AudioParameters params;
++ // We store data here for consumer
++ std::unique_ptr<AudioBus> audio_bus;
++ // Call-back that consumes recorded data
++ AudioInputCallback* callback; // Valid during a recording session.
++ // Handle of the audio device
++ struct sio_hdl* hdl;
++ // Current state of the stream
++ enum StreamState state;
++ // High priority thread running ThreadLoop()
++ pthread_t thread;
++ // Number of frames buffered in the hardware
++ int hw_delay;
++ // Temporary buffer where data is stored sndio-compatible format
++ char* buffer;
++
++ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++} // namespace media
++
++#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc
+--- a/media/audio/sndio/sndio_output.cc 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++ self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++ self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++ self->ThreadLoop();
++ return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++ AudioManagerBase* manager)
++ : manager(manager),
++ params(params),
++ audio_bus(AudioBus::Create(params)),
++ state(kClosed),
++ mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++ if (state != kClosed)
++ Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++ struct sio_par par;
++ int sig;
++
++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++ LOG(WARNING) << "Unsupported audio format.";
++ return false;
++ }
++ sio_initpar(&par);
++ par.rate = params.sample_rate();
++ par.pchan = params.channels();
++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++ par.bps = par.bits / 8;
++ par.sig = sig = par.bits != 8 ? 1 : 0;
++ par.le = SIO_LE_NATIVE;
++ par.appbufsz = params.frames_per_buffer();
++
++ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++ if (hdl == NULL) {
++ LOG(ERROR) << "Couldn't open audio device.";
++ return false;
++ }
++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++ LOG(ERROR) << "Couldn't set audio parameters.";
++ goto bad_close;
++ }
++ if (par.rate != (unsigned int)params.sample_rate() ||
++ par.pchan != (unsigned int)params.channels() ||
++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++ par.sig != (unsigned int)sig ||
++ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++ (par.bits != par.bps * 8)) {
++ LOG(ERROR) << "Unsupported audio parameters.";
++ goto bad_close;
++ }
++ state = kStopped;
++ volpending = 0;
++ vol = 0;
++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++ sio_onmove(hdl, &OnMoveCallback, this);
++ sio_onvol(hdl, &OnVolCallback, this);
++ return true;
++ bad_close:
++ sio_close(hdl);
++ return false;
++}
++
++void SndioAudioOutputStream::Close() {
++ if (state == kClosed)
++ return;
++ if (state == kRunning)
++ Stop();
++ state = kClosed;
++ delete [] buffer;
++ sio_close(hdl);
++ manager->ReleaseOutputStream(this); // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++ state = kRunning;
++ hw_delay = 0;
++ source = callback;
++ sio_start(hdl);
++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++ LOG(ERROR) << "Failed to create real-time thread.";
++ sio_stop(hdl);
++ state = kStopped;
++ }
++}
++
++void SndioAudioOutputStream::Stop() {
++ if (state == kStopped)
++ return;
++ state = kStopWait;
++ pthread_join(thread, NULL);
++ sio_stop(hdl);
++ state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++ pthread_mutex_lock(&mutex);
++ vol = v * SIO_MAXVOL;
++ volpending = 1;
++ pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++ pthread_mutex_lock(&mutex);
++ *v = vol * (1. / SIO_MAXVOL);
++ pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++ int avail, count, result;
++
++ while (state == kRunning) {
++ // Update volume if needed
++ pthread_mutex_lock(&mutex);
++ if (volpending) {
++ volpending = 0;
++ sio_setvol(hdl, vol);
++ }
++ pthread_mutex_unlock(&mutex);
++
++ // Get data to play
++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++ params.sample_rate());
++ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++ audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++ if (count == 0) {
++ // We have to submit something to the device
++ count = audio_bus->frames();
++ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++ LOG(WARNING) << "No data to play, running empty cycle.";
++ }
++
++ // Submit data to the device
++ avail = count * params.GetBytesPerFrame(kSampleFormat);
++ result = sio_write(hdl, buffer, avail);
++ if (result == 0) {
++ LOG(WARNING) << "Audio device disconnected.";
++ break;
++ }
++
++ // Update hardware pointer
++ hw_delay += count;
++ }
++}
++
++} // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h
+--- a/media/audio/sndio/sndio_output.h 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++ // The manager is creating this object
++ SndioAudioOutputStream(const AudioParameters& params,
++ AudioManagerBase* manager);
++ virtual ~SndioAudioOutputStream();
++
++ // Implementation of AudioOutputStream.
++ bool Open() override;
++ void Close() override;
++ void Start(AudioSourceCallback* callback) override;
++ void Stop() override;
++ void SetVolume(double volume) override;
++ void GetVolume(double* volume) override;
++ void Flush() override;
++
++ friend void sndio_onmove(void *arg, int delta);
++ friend void sndio_onvol(void *arg, unsigned int vol);
++ friend void *sndio_threadstart(void *arg);
++
++ private:
++ enum StreamState {
++ kClosed, // Not opened yet
++ kStopped, // Device opened, but not started yet
++ kRunning, // Started, device playing
++ kStopWait // Stopping, waiting for the real-time thread to exit
++ };
++
++ // C-style call-backs
++ static void OnMoveCallback(void *arg, int delta);
++ static void OnVolCallback(void *arg, unsigned int vol);
++ static void* ThreadEntry(void *arg);
++
++ // Continuously moves data from the producer to the device
++ void ThreadLoop(void);
++
++ // Our creator, the audio manager needs to be notified when we close.
++ AudioManagerBase* manager;
++ // Parameters of the source
++ AudioParameters params;
++ // Source stores data here
++ std::unique_ptr<AudioBus> audio_bus;
++ // Call-back that produces data to play
++ AudioSourceCallback* source;
++ // Handle of the audio device
++ struct sio_hdl* hdl;
++ // Current state of the stream
++ enum StreamState state;
++ // High priority thread running ThreadLoop()
++ pthread_t thread;
++ // Protects vol, volpending and hw_delay
++ pthread_mutex_t mutex;
++ // Current volume in the 0..SIO_MAXVOL range
++ int vol;
++ // Set to 1 if volumes must be refreshed in the realtime thread
++ int volpending;
++ // Number of frames buffered in the hardware
++ int hw_delay;
++ // Temporary buffer where data is stored sndio-compatible format
++ char* buffer;
++
++ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++} // namespace media
++
++#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
+--- a/media/media_options.gni
++++ b/media/media_options.gni
+@@ -158,6 +158,9 @@
+ # Enables runtime selection of ALSA library for audio.
+ use_alsa = false
+
++ # Enable runtime selection of sndio(7)
++ use_sndio = false
++
+ # Alsa should be used on all non-Android, non-Mac POSIX systems - with the
+ # exception of CastOS desktop builds.
+ #
diff --git a/srcpkgs/electron24/files/patches/chromium-sql-relax-constraints-on-VirtualCursor-layout.patch b/srcpkgs/electron24/files/patches/chromium-sql-relax-constraints-on-VirtualCursor-layout.patch
new file mode 100644
index 000000000000..d1e65ee1561c
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-sql-relax-constraints-on-VirtualCursor-layout.patch
@@ -0,0 +1,48 @@
+From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001
+From: Elly Fong-Jones <ellyjones@chromium.org>
+Date: Thu, 2 Mar 2023 00:15:11 +0000
+Subject: [PATCH] sql: relax constraints on VirtualCursor layout
+
+VirtualCursor::FromSqliteCursor required that VirtualCursor had a
+standard layout, but in fact VirtualCursor shouldn't have a standard
+layout, and the fact that it does with libc++ is a deviation from the
+C++ standard. This change:
+
+1. Relaxes the requirement that VirtualCursor has a standard layout, and
+2. Relaxes the requirement that the sqlite_cursor_ field has to be at
+ offset 0
+
+by use of offsetof() and pointer subtraction. This change both improves
+standards compliance and makes this code build with libstdc++.
+
+Bug: 1380656
+Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313
+Reviewed-by: Austin Sullivan <asully@chromium.org>
+Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1111925}
+---
+ sql/recover_module/cursor.h | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
+index 1970bdca8c6..4cb06557009 100644
+--- a/sql/recover_module/cursor.h
++++ b/sql/recover_module/cursor.h
+@@ -63,12 +63,10 @@ class VirtualCursor {
+ // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor().
+ static inline VirtualCursor* FromSqliteCursor(
+ sqlite3_vtab_cursor* sqlite_cursor) {
+- static_assert(std::is_standard_layout<VirtualCursor>::value,
+- "needed for the reinterpret_cast below");
+- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0,
+- "sqlite_cursor_ must be the first member of the class");
+- VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor);
+- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
++ VirtualCursor* result = reinterpret_cast<VirtualCursor*>(
++ (reinterpret_cast<char*>(sqlite_cursor) -
++ offsetof(VirtualCursor, sqlite_cursor_)));
++ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_);
+ return result;
+ }
+
diff --git a/srcpkgs/electron24/files/patches/chromium-systypes.patch b/srcpkgs/electron24/files/patches/chromium-systypes.patch
new file mode 100644
index 000000000000..1ccebbd2f2b3
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-systypes.patch
@@ -0,0 +1,11 @@
+--- a/base/third_party/symbolize/symbolize.h
++++ b/base/third_party/symbolize/symbolize.h
+@@ -58,6 +58,8 @@
+ #include "config.h"
+ #include "glog/logging.h"
+
++#include <sys/types.h>
++
+ #ifdef HAVE_SYMBOLIZE
+
+ #if defined(__ELF__) // defined by gcc
diff --git a/srcpkgs/electron24/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch b/srcpkgs/electron24/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch
new file mode 100644
index 000000000000..dae1adde0bc6
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-unbundle-ffmpeg-av_stream_get_first_dts.patch
@@ -0,0 +1,12 @@
+diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
+index 16e20744706..6a079b32221 100644
+--- a/build/linux/unbundle/ffmpeg.gn
++++ b/build/linux/unbundle/ffmpeg.gn
+@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
+ "libavformat",
+ "libavutil",
+ ]
++ defines = [ "av_stream_get_first_dts(stream)=stream->first_dts" ]
+ }
+
+ buildflag_header("ffmpeg_features") {
diff --git a/srcpkgs/electron24/files/patches/chromium-unbundled-cross-toolchain.patch b/srcpkgs/electron24/files/patches/chromium-unbundled-cross-toolchain.patch
new file mode 100644
index 000000000000..c3f2294ac4b2
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-unbundled-cross-toolchain.patch
@@ -0,0 +1,12 @@
+--- a/build/toolchain/linux/unbundle/BUILD.gn.orig
++++ b/build/toolchain/linux/unbundle/BUILD.gn
+@@ -35,7 +35,7 @@
+ extra_ldflags = getenv("BUILD_LDFLAGS")
+
+ toolchain_args = {
+- current_cpu = current_cpu
+- current_os = current_os
++ current_cpu = host_cpu
++ current_os = host_os
+ }
+ }
diff --git a/srcpkgs/electron24/files/patches/chromium-webrtc-size_t.patch b/srcpkgs/electron24/files/patches/chromium-webrtc-size_t.patch
new file mode 100644
index 000000000000..dd46fe14cd2b
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/chromium-webrtc-size_t.patch
@@ -0,0 +1,10 @@
+--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200
++++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+
+ #include <array>
++#include <cstddef>
+
+ namespace webrtc {
+
diff --git a/srcpkgs/electron24/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron24/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
new file mode 100644
index 000000000000..916dba9dc3bc
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
@@ -0,0 +1,42 @@
+From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus <elvis@magic.io>
+Date: Thu, 12 Dec 2019 16:12:18 -0500
+Subject: [PATCH] Add a script to list patch targets
+
+---
+ script/list_patch_targets.py | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+ create mode 100755 script/list_patch_targets.py
+
+diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
+new file mode 100755
+index 000000000..55173bac9
+--- /dev/null
++++ b/script/list_patch_targets.py
+@@ -0,0 +1,23 @@
++#!/usr/bin/env python
++
++import argparse
++import json
++
++
++def parse_args():
++ parser = argparse.ArgumentParser(description='Apply Electron patches')
++ parser.add_argument('config', nargs='+',
++ type=argparse.FileType('r'),
++ help='patches\' config(s) in the JSON format')
++ return parser.parse_args()
++
++
++def main():
++ configs = parse_args().config
++ for config_json in configs:
++ for patch_dir, repo in json.load(config_json).iteritems():
++ print(repo)
++
++
++if __name__ == '__main__':
++ main()
+--
+2.23.0
+
diff --git a/srcpkgs/electron24/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron24/files/patches/electron-Build-fixes.patch.patch
new file mode 100644
index 000000000000..a98ee020d34a
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/electron-Build-fixes.patch.patch
@@ -0,0 +1,12 @@
+diff --git a/build/npm.gni b/build/npm.gni
+index a1987d095..fb33a14c3 100644
+--- a/build/npm.gni
++++ b/build/npm.gni
+@@ -35,7 +35,6 @@ template("npm_action") {
+ if (!defined(deps)) {
+ deps = []
+ }
+- deps += [ ":npm_pre_flight_" + target_name ]
+
+ script = "//electron/build/npm-run.py"
+ args = [
diff --git a/srcpkgs/electron24/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron24/files/patches/electron-exclude-content-test-patches.patch
new file mode 100644
index 000000000000..049ff4bdd040
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/electron-exclude-content-test-patches.patch
@@ -0,0 +1,10 @@
+--- a/script/apply_all_patches.py 2023-05-03 15:27:52.000000000 +0200
++++ - 2023-05-04 23:12:01.430619050 +0200
+@@ -14,6 +14,7 @@
+ if os.path.exists(repo):
+ git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
+ threeway=threeway is not None,
++ exclude=['third_party/blink/tools/**', 'test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**', '.gitignore'],
+ committer_name="Electron Scripts", committer_email="scripts@electron")
+
+
diff --git a/srcpkgs/electron24/files/patches/electron-git-stuff.patch b/srcpkgs/electron24/files/patches/electron-git-stuff.patch
new file mode 100644
index 000000000000..c4d7f9aed996
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/electron-git-stuff.patch
@@ -0,0 +1,11 @@
+--- a/BUILD.gn 2023-05-03 15:27:52.000000000 +0200
++++ - 2023-05-05 00:24:25.483471021 +0200
+@@ -111,8 +111,6 @@
+ [],
+ "trim string",
+ [
+- ".git/packed-refs",
+- ".git/HEAD",
+ "script/lib/get-version.js",
+ ])
+
diff --git a/srcpkgs/electron24/files/patches/electron-no-need-for-husky.patch b/srcpkgs/electron24/files/patches/electron-no-need-for-husky.patch
new file mode 100644
index 000000000000..0b074254c43c
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/electron-no-need-for-husky.patch
@@ -0,0 +1,10 @@
+--- a/package.json 2022-07-06 17:31:50.000000000 +0200
++++ - 2022-07-08 23:04:43.654812957 +0200
+@@ -98,7 +98,6 @@
+ "precommit": "lint-staged",
+ "preinstall": "node -e 'process.exit(0)'",
+ "prepack": "check-for-leaks",
+- "prepare": "husky install",
+ "repl": "node ./script/start.js --interactive",
+ "start": "node ./script/start.js",
+ "test": "node ./script/spec-runner.js",
diff --git a/srcpkgs/electron24/files/patches/electron-std-vector-non-const.patch b/srcpkgs/electron24/files/patches/electron-std-vector-non-const.patch
new file mode 100644
index 000000000000..89de8a1afff5
--- /dev/null
+++ b/srcpkgs/electron24/files/patches/electron-std-vector-non-const.patch
@@ -0,0 +1,109 @@
+--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
++++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
+@@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359
+ - const base::FilePath& current_directory)>;
+ + base::RepeatingCallback<bool(const base::CommandLine& command_line,
+ + const base::FilePath& current_directory,
+-+ const std::vector<const uint8_t> additional_data)>;
+++ const std::vector<uint8_t> additional_data)>;
+
+ #if BUILDFLAG(IS_WIN)
+ ProcessSingleton(const std::string& program_name,
+@@ -73,7 +73,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
+ // |reader| is for sending back ACK message.
+ void HandleMessage(const std::string& current_dir,
+ const std::vector<std::string>& argv,
+-+ const std::vector<const uint8_t> additional_data,
+++ const std::vector<uint8_t> additional_data,
+ SocketReader* reader);
+
+ private:
+@@ -84,7 +84,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
+ - const std::string& current_dir, const std::vector<std::string>& argv,
+ + const std::string& current_dir,
+ + const std::vector<std::string>& argv,
+-+ const std::vector<const uint8_t> additional_data,
+++ const std::vector<uint8_t> additional_data,
+ SocketReader* reader) {
+ DCHECK(ui_task_runner_->BelongsToCurrentThread());
+ DCHECK(reader);
+@@ -114,7 +114,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
+ + base::StringToSizeT(tokens[0], &num_args);
+ + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
+ +
+-+ std::vector<const uint8_t> additional_data;
+++ std::vector<uint8_t> additional_data;
+ + if (tokens.size() >= 3 + num_args) {
+ + size_t additional_data_size;
+ + base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
+@@ -123,7 +123,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
+ + std::string(1, kTokenDelimiter));
+ + const uint8_t* additional_data_bits =
+ + reinterpret_cast<const uint8_t*>(remaining_args.c_str());
+-+ additional_data = std::vector<const uint8_t>(
+++ additional_data = std::vector<uint8_t>(
+ + additional_data_bits, additional_data_bits + additional_data_size);
+ + }
+ +
+@@ -189,7 +189,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
+ base::CommandLine* parsed_command_line,
+ - base::FilePath* current_directory) {
+ + base::FilePath* current_directory,
+-+ std::vector<const uint8_t>* parsed_additional_data) {
+++ std::vector<uint8_t>* parsed_additional_data) {
+ // We should have enough room for the shortest command (min_message_size)
+ // and also be a multiple of wchar_t bytes. The shortest command
+ - // possible is L"START\0\0" (empty current directory and command line).
+@@ -230,7 +230,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
+ + msg.substr(fourth_null + 1, fifth_null - fourth_null);
+ + const uint8_t* additional_data_bytes =
+ + reinterpret_cast<const uint8_t*>(additional_data.c_str());
+-+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
+++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
+ + additional_data_bytes + additional_data_length);
+ +
+ return true;
+@@ -241,7 +241,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
+ base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
+ base::FilePath current_directory;
+ - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) {
+-+ std::vector<const uint8_t> additional_data;
+++ std::vector<uint8_t> additional_data;
+ + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) {
+ *result = TRUE;
+ return true;
+--- a/shell/browser/api/electron_api_app.cc
++++ b/shell/browser/api/electron_api_app.cc
+@@ -519,10 +519,10 @@ bool NotificationCallbackWrapper(
+ const base::RepeatingCallback<
+ void(const base::CommandLine& command_line,
+ const base::FilePath& current_directory,
+- const std::vector<const uint8_t> additional_data)>& callback,
++ const std::vector<uint8_t> additional_data)>& callback,
+ const base::CommandLine& cmd,
+ const base::FilePath& cwd,
+- const std::vector<const uint8_t> additional_data) {
++ const std::vector<uint8_t> additional_data) {
+ // Make sure the callback is called after app gets ready.
+ if (Browser::Get()->is_ready()) {
+ callback.Run(cmd, cwd, std::move(additional_data));
+@@ -1083,7 +1083,7 @@ std::string App::GetLocaleCountryCode() {
+
+ void App::OnSecondInstance(const base::CommandLine& cmd,
+ const base::FilePath& cwd,
+- const std::vector<const uint8_t> additional_data) {
++ const std::vector<uint8_t> additional_data) {
+ v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
+ v8::Locker locker(isolate);
+ v8::HandleScope handle_scope(isolate);
+--- a/shell/browser/api/electron_api_app.h
++++ b/shell/browser/api/electron_api_app.h
+@@ -195,7 +195,7 @@ class App : public ElectronBrowserClient::Delegate,
+ std::string GetLocaleCountryCode();
+ void OnSecondInstance(const base::CommandLine& cmd,
+ const base::FilePath& cwd,
+- const std::vector<const uint8_t> additional_data);
++ const std::vector<uint8_t> additional_data);
+ bool HasSingleInstanceLock() const;
+ bool RequestSingleInstanceLock(gin::Arguments* args);
+ void ReleaseSingleInstanceLock();
diff --git a/srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.cc b/srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.cc
new file mode 100644
index 000000000000..2c7aa8efa66f
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.cc
@@ -0,0 +1,148 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/metrics/histogram_macros.h"
+#include "base/memory/ptr_util.h"
+
+#include "media/audio/openbsd/audio_manager_openbsd.h"
+
+#include "media/audio/audio_device_description.h"
+#include "media/audio/audio_output_dispatcher.h"
+#include "media/audio/sndio/sndio_input.h"
+#include "media/audio/sndio/sndio_output.h"
+#include "media/base/limits.h"
+#include "media/base/media_switches.h"
+
+namespace media {
+
+// Maximum number of output streams that can be open simultaneously.
+static const int kMaxOutputStreams = 4;
+
+// Default sample rate for input and output streams.
+static const int kDefaultSampleRate = 48000;
+
+void AddDefaultDevice(AudioDeviceNames* device_names) {
+ DCHECK(device_names->empty());
+ device_names->push_front(AudioDeviceName::CreateDefault());
+}
+
+bool AudioManagerOpenBSD::HasAudioOutputDevices() {
+ return true;
+}
+
+bool AudioManagerOpenBSD::HasAudioInputDevices() {
+ return true;
+}
+
+void AudioManagerOpenBSD::GetAudioInputDeviceNames(
+ AudioDeviceNames* device_names) {
+ DCHECK(device_names->empty());
+ AddDefaultDevice(device_names);
+}
+
+void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
+ AudioDeviceNames* device_names) {
+ AddDefaultDevice(device_names);
+}
+
+const char* AudioManagerOpenBSD::GetName() {
+ return "SNDIO";
+}
+
+AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
+ const std::string& device_id) {
+ static const int kDefaultInputBufferSize = 1024;
+
+ int user_buffer_size = GetUserBufferSize();
+ int buffer_size = user_buffer_size ?
+ user_buffer_size : kDefaultInputBufferSize;
+
+ return AudioParameters(
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
+ kDefaultSampleRate, buffer_size);
+}
+
+AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+ AudioLogFactory* audio_log_factory)
+ : AudioManagerBase(std::move(audio_thread),
+ audio_log_factory) {
+ DLOG(WARNING) << "AudioManagerOpenBSD";
+ SetMaxOutputStreamsAllowed(kMaxOutputStreams);
+}
+
+AudioManagerOpenBSD::~AudioManagerOpenBSD() {
+ Shutdown();
+}
+
+AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
+ const AudioParameters& params,
+ const LogCallback& log_callback) {
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
+ return MakeOutputStream(params);
+}
+
+AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) {
+ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
+ return MakeOutputStream(params);
+}
+
+AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) {
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
+ return MakeInputStream(params);
+}
+
+AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) {
+ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
+ return MakeInputStream(params);
+}
+
+AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
+ const std::string& output_device_id,
+ const AudioParameters& input_params) {
+ // TODO(tommi): Support |output_device_id|.
+ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
+ static const int kDefaultOutputBufferSize = 2048;
+
+ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
+ int sample_rate = kDefaultSampleRate;
+ int buffer_size = kDefaultOutputBufferSize;
+ if (input_params.IsValid()) {
+ sample_rate = input_params.sample_rate();
+ channel_layout = input_params.channel_layout();
+ buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
+ }
+
+ int user_buffer_size = GetUserBufferSize();
+ if (user_buffer_size)
+ buffer_size = user_buffer_size;
+
+ return AudioParameters(
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
+ sample_rate, buffer_size);
+}
+
+AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
+ const AudioParameters& params) {
+ DLOG(WARNING) << "MakeInputStream";
+ return new SndioAudioInputStream(this,
+ AudioDeviceDescription::kDefaultDeviceId, params);
+}
+
+AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
+ const AudioParameters& params) {
+ DLOG(WARNING) << "MakeOutputStream";
+ return new SndioAudioOutputStream(params, this);
+}
+
+} // namespace media
diff --git a/srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.h b/srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.h
new file mode 100644
index 000000000000..8c99db966d65
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-files/audio_manager_openbsd.h
@@ -0,0 +1,65 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
+#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
+
+#include <set>
+
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/threading/thread.h"
+#include "media/audio/audio_manager_base.h"
+
+namespace media {
+
+class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
+ public:
+ AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+ AudioLogFactory* audio_log_factory);
+ ~AudioManagerOpenBSD() override;
+
+ // Implementation of AudioManager.
+ bool HasAudioOutputDevices() override;
+ bool HasAudioInputDevices() override;
+ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
+ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
+ AudioParameters GetInputStreamParameters(
+ const std::string& device_id) override;
+ const char* GetName() override;
+
+ // Implementation of AudioManagerBase.
+ AudioOutputStream* MakeLinearOutputStream(
+ const AudioParameters& params,
+ const LogCallback& log_callback) override;
+ AudioOutputStream* MakeLowLatencyOutputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) override;
+ AudioInputStream* MakeLinearInputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) override;
+ AudioInputStream* MakeLowLatencyInputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) override;
+
+ protected:
+ AudioParameters GetPreferredOutputStreamParameters(
+ const std::string& output_device_id,
+ const AudioParameters& input_params) override;
+
+ private:
+ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
+ AudioOutputStream* MakeOutputStream(const AudioParameters& params);
+ AudioInputStream* MakeInputStream(const AudioParameters& params);
+
+ DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
+};
+
+} // namespace media
+
+#endif // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
diff --git a/srcpkgs/electron24/files/sndio-files/sndio_input.cc b/srcpkgs/electron24/files/sndio-files/sndio_input.cc
new file mode 100644
index 000000000000..ef5439b49a07
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-files/sndio_input.cc
@@ -0,0 +1,200 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/bind.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "media/base/audio_timestamp_helper.h"
+#include "media/audio/openbsd/audio_manager_openbsd.h"
+#include "media/audio/audio_manager.h"
+#include "media/audio/sndio/sndio_input.h"
+
+namespace media {
+
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
+{
+ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
+
+ self->hw_delay += delta;
+}
+
+void *SndioAudioInputStream::ThreadEntry(void *arg) {
+ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
+
+ self->ThreadLoop();
+ return NULL;
+}
+
+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
+ const std::string& device_name,
+ const AudioParameters& params)
+ : manager(manager),
+ params(params),
+ audio_bus(AudioBus::Create(params)),
+ state(kClosed) {
+}
+
+SndioAudioInputStream::~SndioAudioInputStream() {
+ if (state != kClosed)
+ Close();
+}
+
+bool SndioAudioInputStream::Open() {
+ struct sio_par par;
+ int sig;
+
+ if (state != kClosed)
+ return false;
+
+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+ LOG(WARNING) << "Unsupported audio format.";
+ return false;
+ }
+
+ sio_initpar(&par);
+ par.rate = params.sample_rate();
+ par.rchan = params.channels();
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
+ par.bps = par.bits / 8;
+ par.sig = sig = par.bits != 8 ? 1 : 0;
+ par.le = SIO_LE_NATIVE;
+ par.appbufsz = params.frames_per_buffer();
+
+ hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
+
+ if (hdl == NULL) {
+ LOG(ERROR) << "Couldn't open audio device.";
+ return false;
+ }
+
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
+ LOG(ERROR) << "Couldn't set audio parameters.";
+ goto bad_close;
+ }
+
+ if (par.rate != (unsigned int)params.sample_rate() ||
+ par.rchan != (unsigned int)params.channels() ||
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
+ par.sig != (unsigned int)sig ||
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
+ (par.bits != par.bps * 8)) {
+ LOG(ERROR) << "Unsupported audio parameters.";
+ goto bad_close;
+ }
+ state = kStopped;
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
+ sio_onmove(hdl, &OnMoveCallback, this);
+ return true;
+bad_close:
+ sio_close(hdl);
+ return false;
+}
+
+void SndioAudioInputStream::Start(AudioInputCallback* cb) {
+
+ StartAgc();
+
+ state = kRunning;
+ hw_delay = 0;
+ callback = cb;
+ sio_start(hdl);
+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
+ LOG(ERROR) << "Failed to create real-time thread for recording.";
+ sio_stop(hdl);
+ state = kStopped;
+ }
+}
+
+void SndioAudioInputStream::Stop() {
+
+ if (state == kStopped)
+ return;
+
+ state = kStopWait;
+ pthread_join(thread, NULL);
+ sio_stop(hdl);
+ state = kStopped;
+
+ StopAgc();
+}
+
+void SndioAudioInputStream::Close() {
+
+ if (state == kClosed)
+ return;
+
+ if (state == kRunning)
+ Stop();
+
+ state = kClosed;
+ delete [] buffer;
+ sio_close(hdl);
+
+ manager->ReleaseInputStream(this);
+}
+
+double SndioAudioInputStream::GetMaxVolume() {
+ // Not supported
+ return 0.0;
+}
+
+void SndioAudioInputStream::SetVolume(double volume) {
+ // Not supported. Do nothing.
+}
+
+double SndioAudioInputStream::GetVolume() {
+ // Not supported.
+ return 0.0;
+}
+
+bool SndioAudioInputStream::IsMuted() {
+ // Not supported.
+ return false;
+}
+
+void SndioAudioInputStream::SetOutputDeviceForAec(
+ const std::string& output_device_id) {
+ // Not supported.
+}
+
+void SndioAudioInputStream::ThreadLoop(void) {
+ size_t todo, n;
+ char *data;
+ unsigned int nframes;
+ double normalized_volume = 0.0;
+
+ nframes = audio_bus->frames();
+
+ while (state == kRunning && !sio_eof(hdl)) {
+
+ GetAgcVolume(&normalized_volume);
+
+ // read one block
+ todo = nframes * params.GetBytesPerFrame(kSampleFormat);
+ data = buffer;
+ while (todo > 0) {
+ n = sio_read(hdl, data, todo);
+ if (n == 0)
+ return; // unrecoverable I/O error
+ todo -= n;
+ data += n;
+ }
+ hw_delay -= nframes;
+
+ // convert frames count to TimeDelta
+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
+ params.sample_rate());
+
+ // push into bus
+ audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
+
+ // invoke callback
+ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
+ }
+}
+
+} // namespace media
diff --git a/srcpkgs/electron24/files/sndio-files/sndio_input.h b/srcpkgs/electron24/files/sndio-files/sndio_input.h
new file mode 100644
index 000000000000..d868e0469db5
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-files/sndio_input.h
@@ -0,0 +1,91 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+
+#include <stdint.h>
+#include <string>
+#include <sndio.h>
+
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
+#include "media/audio/agc_audio_stream.h"
+#include "media/audio/audio_io.h"
+#include "media/audio/audio_device_description.h"
+#include "media/base/audio_parameters.h"
+
+namespace media {
+
+class AudioManagerBase;
+
+// Implementation of AudioOutputStream using sndio(7)
+class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
+ public:
+ // Pass this to the constructor if you want to attempt auto-selection
+ // of the audio recording device.
+ static const char kAutoSelectDevice[];
+
+ // Create a PCM Output stream for the SNDIO device identified by
+ // |device_name|. If unsure of what to use for |device_name|, use
+ // |kAutoSelectDevice|.
+ SndioAudioInputStream(AudioManagerBase* audio_manager,
+ const std::string& device_name,
+ const AudioParameters& params);
+
+ ~SndioAudioInputStream() override;
+
+ // Implementation of AudioInputStream.
+ bool Open() override;
+ void Start(AudioInputCallback* callback) override;
+ void Stop() override;
+ void Close() override;
+ double GetMaxVolume() override;
+ void SetVolume(double volume) override;
+ double GetVolume() override;
+ bool IsMuted() override;
+ void SetOutputDeviceForAec(const std::string& output_device_id) override;
+
+ private:
+
+ enum StreamState {
+ kClosed, // Not opened yet
+ kStopped, // Device opened, but not started yet
+ kRunning, // Started, device playing
+ kStopWait // Stopping, waiting for the real-time thread to exit
+ };
+
+ // C-style call-backs
+ static void OnMoveCallback(void *arg, int delta);
+ static void* ThreadEntry(void *arg);
+
+ // Continuously moves data from the device to the consumer
+ void ThreadLoop();
+ // Our creator, the audio manager needs to be notified when we close.
+ AudioManagerBase* manager;
+ // Parameters of the source
+ AudioParameters params;
+ // We store data here for consumer
+ std::unique_ptr<AudioBus> audio_bus;
+ // Call-back that consumes recorded data
+ AudioInputCallback* callback; // Valid during a recording session.
+ // Handle of the audio device
+ struct sio_hdl* hdl;
+ // Current state of the stream
+ enum StreamState state;
+ // High priority thread running ThreadLoop()
+ pthread_t thread;
+ // Number of frames buffered in the hardware
+ int hw_delay;
+ // Temporary buffer where data is stored sndio-compatible format
+ char* buffer;
+
+ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
+};
+
+} // namespace media
+
+#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
diff --git a/srcpkgs/electron24/files/sndio-files/sndio_output.cc b/srcpkgs/electron24/files/sndio-files/sndio_output.cc
new file mode 100644
index 000000000000..a6719f9aac8d
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-files/sndio_output.cc
@@ -0,0 +1,183 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/logging.h"
+#include "base/time/time.h"
+#include "base/time/default_tick_clock.h"
+#include "media/audio/audio_manager_base.h"
+#include "media/base/audio_timestamp_helper.h"
+#include "media/audio/sndio/sndio_output.h"
+
+namespace media {
+
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
+
+ self->hw_delay -= delta;
+}
+
+void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
+
+ self->vol = vol;
+}
+
+void *SndioAudioOutputStream::ThreadEntry(void *arg) {
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
+
+ self->ThreadLoop();
+ return NULL;
+}
+
+SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
+ AudioManagerBase* manager)
+ : manager(manager),
+ params(params),
+ audio_bus(AudioBus::Create(params)),
+ state(kClosed),
+ mutex(PTHREAD_MUTEX_INITIALIZER) {
+}
+
+SndioAudioOutputStream::~SndioAudioOutputStream() {
+ if (state != kClosed)
+ Close();
+}
+
+bool SndioAudioOutputStream::Open() {
+ struct sio_par par;
+ int sig;
+
+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+ LOG(WARNING) << "Unsupported audio format.";
+ return false;
+ }
+ sio_initpar(&par);
+ par.rate = params.sample_rate();
+ par.pchan = params.channels();
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
+ par.bps = par.bits / 8;
+ par.sig = sig = par.bits != 8 ? 1 : 0;
+ par.le = SIO_LE_NATIVE;
+ par.appbufsz = params.frames_per_buffer();
+
+ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
+ if (hdl == NULL) {
+ LOG(ERROR) << "Couldn't open audio device.";
+ return false;
+ }
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
+ LOG(ERROR) << "Couldn't set audio parameters.";
+ goto bad_close;
+ }
+ if (par.rate != (unsigned int)params.sample_rate() ||
+ par.pchan != (unsigned int)params.channels() ||
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
+ par.sig != (unsigned int)sig ||
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
+ (par.bits != par.bps * 8)) {
+ LOG(ERROR) << "Unsupported audio parameters.";
+ goto bad_close;
+ }
+ state = kStopped;
+ volpending = 0;
+ vol = 0;
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
+ sio_onmove(hdl, &OnMoveCallback, this);
+ sio_onvol(hdl, &OnVolCallback, this);
+ return true;
+ bad_close:
+ sio_close(hdl);
+ return false;
+}
+
+void SndioAudioOutputStream::Close() {
+ if (state == kClosed)
+ return;
+ if (state == kRunning)
+ Stop();
+ state = kClosed;
+ delete [] buffer;
+ sio_close(hdl);
+ manager->ReleaseOutputStream(this); // Calls the destructor
+}
+
+void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
+ state = kRunning;
+ hw_delay = 0;
+ source = callback;
+ sio_start(hdl);
+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
+ LOG(ERROR) << "Failed to create real-time thread.";
+ sio_stop(hdl);
+ state = kStopped;
+ }
+}
+
+void SndioAudioOutputStream::Stop() {
+ if (state == kStopped)
+ return;
+ state = kStopWait;
+ pthread_join(thread, NULL);
+ sio_stop(hdl);
+ state = kStopped;
+}
+
+void SndioAudioOutputStream::SetVolume(double v) {
+ pthread_mutex_lock(&mutex);
+ vol = v * SIO_MAXVOL;
+ volpending = 1;
+ pthread_mutex_unlock(&mutex);
+}
+
+void SndioAudioOutputStream::GetVolume(double* v) {
+ pthread_mutex_lock(&mutex);
+ *v = vol * (1. / SIO_MAXVOL);
+ pthread_mutex_unlock(&mutex);
+}
+
+// This stream is always used with sub second buffer sizes, where it's
+// sufficient to simply always flush upon Start().
+void SndioAudioOutputStream::Flush() {}
+
+void SndioAudioOutputStream::ThreadLoop(void) {
+ int avail, count, result;
+
+ while (state == kRunning) {
+ // Update volume if needed
+ pthread_mutex_lock(&mutex);
+ if (volpending) {
+ volpending = 0;
+ sio_setvol(hdl, vol);
+ }
+ pthread_mutex_unlock(&mutex);
+
+ // Get data to play
+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
+ params.sample_rate());
+ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
+ audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
+ if (count == 0) {
+ // We have to submit something to the device
+ count = audio_bus->frames();
+ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
+ LOG(WARNING) << "No data to play, running empty cycle.";
+ }
+
+ // Submit data to the device
+ avail = count * params.GetBytesPerFrame(kSampleFormat);
+ result = sio_write(hdl, buffer, avail);
+ if (result == 0) {
+ LOG(WARNING) << "Audio device disconnected.";
+ break;
+ }
+
+ // Update hardware pointer
+ hw_delay += count;
+ }
+}
+
+} // namespace media
diff --git a/srcpkgs/electron24/files/sndio-files/sndio_output.h b/srcpkgs/electron24/files/sndio-files/sndio_output.h
new file mode 100644
index 000000000000..ead220ca96e7
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-files/sndio_output.h
@@ -0,0 +1,86 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+
+#include <pthread.h>
+#include <sndio.h>
+
+#include "base/time/tick_clock.h"
+#include "base/time/time.h"
+#include "media/audio/audio_io.h"
+
+namespace media {
+
+class AudioManagerBase;
+
+// Implementation of AudioOutputStream using sndio(7)
+class SndioAudioOutputStream : public AudioOutputStream {
+ public:
+ // The manager is creating this object
+ SndioAudioOutputStream(const AudioParameters& params,
+ AudioManagerBase* manager);
+ virtual ~SndioAudioOutputStream();
+
+ // Implementation of AudioOutputStream.
+ bool Open() override;
+ void Close() override;
+ void Start(AudioSourceCallback* callback) override;
+ void Stop() override;
+ void SetVolume(double volume) override;
+ void GetVolume(double* volume) override;
+ void Flush() override;
+
+ friend void sndio_onmove(void *arg, int delta);
+ friend void sndio_onvol(void *arg, unsigned int vol);
+ friend void *sndio_threadstart(void *arg);
+
+ private:
+ enum StreamState {
+ kClosed, // Not opened yet
+ kStopped, // Device opened, but not started yet
+ kRunning, // Started, device playing
+ kStopWait // Stopping, waiting for the real-time thread to exit
+ };
+
+ // C-style call-backs
+ static void OnMoveCallback(void *arg, int delta);
+ static void OnVolCallback(void *arg, unsigned int vol);
+ static void* ThreadEntry(void *arg);
+
+ // Continuously moves data from the producer to the device
+ void ThreadLoop(void);
+
+ // Our creator, the audio manager needs to be notified when we close.
+ AudioManagerBase* manager;
+ // Parameters of the source
+ AudioParameters params;
+ // Source stores data here
+ std::unique_ptr<AudioBus> audio_bus;
+ // Call-back that produces data to play
+ AudioSourceCallback* source;
+ // Handle of the audio device
+ struct sio_hdl* hdl;
+ // Current state of the stream
+ enum StreamState state;
+ // High priority thread running ThreadLoop()
+ pthread_t thread;
+ // Protects vol, volpending and hw_delay
+ pthread_mutex_t mutex;
+ // Current volume in the 0..SIO_MAXVOL range
+ int vol;
+ // Set to 1 if volumes must be refreshed in the realtime thread
+ int volpending;
+ // Number of frames buffered in the hardware
+ int hw_delay;
+ // Temporary buffer where data is stored sndio-compatible format
+ char* buffer;
+
+ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
+};
+
+} // namespace media
+
+#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
diff --git a/srcpkgs/electron24/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/electron24/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
new file mode 100644
index 000000000000..cf8e81b11d67
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
@@ -0,0 +1,43 @@
+diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
+index 5d703549372..9e60b40c749 100644
+--- media/audio/linux/audio_manager_linux.cc
++++ media/audio/linux/audio_manager_linux.cc
+@@ -20,6 +20,10 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include <sndio.h>
++#include "media/audio/openbsd/audio_manager_openbsd.h"
++#endif
+
+ namespace media {
+
+@@ -27,7 +31,8 @@ enum LinuxAudioIO {
+ kPulse,
+ kAlsa,
+ kCras,
+- kAudioIOMax = kCras // Must always be equal to largest logged entry.
++ kSndio,
++ kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
+ }
+ #endif
+
++#if defined(USE_SNDIO)
++ struct sio_hdl * hdl = NULL;
++ if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
++ sio_close(hdl);
++ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
++ return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
++ audio_log_factory);
++ }
++ DVLOG(1) << "Sndio is not available on the OS";
++#endif
++
+ #if defined(USE_PULSEAUDIO)
+ pa_threaded_mainloop* pa_mainloop = nullptr;
+ pa_context* pa_context = nullptr;
diff --git a/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
new file mode 100644
index 000000000000..ec6040026688
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
@@ -0,0 +1,12 @@
+--- media/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
++++ - 2020-04-06 14:32:27.960817513 +0200
+@@ -65,6 +65,9 @@
+ if (use_cras) {
+ defines += [ "USE_CRAS" ]
+ }
++ if (use_sndio) {
++ defines += [ "USE_SNDIO" ]
++ }
+ }
+
+ # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
new file mode 100644
index 000000000000..c856de0bf2ec
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
@@ -0,0 +1,23 @@
+--- media/audio/BUILD.gn 2020-03-24 10:16:30.000000000 +0100
++++ - 2020-04-06 14:31:28.871450217 +0200
+@@ -232,9 +232,19 @@
+ deps += [ "//media/base/android:media_jni_headers" ]
+ }
+
+- if (is_linux) {
++ if (is_linux) {
+ sources += [ "linux/audio_manager_linux.cc" ]
+ }
++ if (use_sndio) {
++ libs += [ "sndio" ]
++ sources += [
++ "openbsd/audio_manager_openbsd.cc",
++ "sndio/sndio_input.cc",
++ "sndio/sndio_input.h",
++ "sndio/sndio_output.cc",
++ "sndio/sndio_output.h"
++ ]
++ }
+
+ if (use_alsa) {
+ libs += [ "asound" ]
diff --git a/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
new file mode 100644
index 000000000000..14807d8e1d36
--- /dev/null
+++ b/srcpkgs/electron24/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
@@ -0,0 +1,12 @@
+--- media/media_options.gni 2020-03-24 10:16:30.000000000 +0100
++++ - 2020-04-06 14:29:22.958630783 +0200
+@@ -114,6 +114,9 @@
+ # Enables runtime selection of ALSA library for audio.
+ use_alsa = false
+
++ # Enables runtime selection of sndio library for audio.
++ use_sndio = false
++
+ # Alsa should be used on non-Android, non-Mac POSIX systems.
+ # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
new file mode 100644
index 000000000000..30815d8d856d
--- /dev/null
+++ b/srcpkgs/electron24/template
@@ -0,0 +1,441 @@
+# Template file for 'electron24'
+pkgname=electron24
+version=24.2.0
+revision=1
+_nodever=18.14.0
+_chromiumver=112.0.5615.165
+archs="x86_64* aarch64*"
+create_wrksrc=yes
+build_wrksrc="src"
+hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids
+ libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
+ pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
+ opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
+ alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if sndio sndio-devel) jq"
+makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
+ libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
+ libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
+ libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
+ libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
+ libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
+ minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
+ re2-devel fontconfig-devel freetype-devel opus-devel libffi-devel
+ $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel
+ $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel"
+short_desc="Cross platform application framework based on web technologies"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="https://electronjs.org"
+distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
+ https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
+ https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
+checksum="0dd1434ff9e6ff8f266d82ff42d922414088b4940f0dfca4d5d22062ff94d3d6
+ 168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd
+ 31bbccdff73269baebcc9f32c2ffe428f28be79841527c63e95da93e8c630829"
+
+case "$XBPS_TARGET_MACHINE" in
+ ppc64*-musl) makedepends+=" libucontext-devel" ;;
+esac
+
+if [ "$XBPS_LIBC" = musl ]; then
+ hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ makedepends+=" musl-legacy-compat"
+fi
+
+no_generic_pkgconfig_link=yes
+lib32disabled=yes
+nopie=yes # contains tools that are not PIE, enables PIE itself
+
+build_options="pulseaudio sndio clang pipewire"
+build_options_default="pulseaudio clang pipewire"
+
+#if [ "$build_option_clang" ]; then
+nocross="Yes"
+#elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
+# broken="Falls apart at runtime when compiled with gcc"
+#fi
+
+_buildtype=Release
+_is_debug=false
+
+CFLAGS="-Wno-unknown-warning-option -fPIC"
+CXXFLAGS="-Wno-unknown-warning-option -fPIC"
+
+_apply_patch() {
+ local args="$1" pname="$(basename $2)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ if [ -f "${2}.args" ]; then
+ args=$(<"${2}.args")
+ fi
+ msg_normal "$pkgver: patching: ${pname}.\n"
+ patch -N $args -i $2
+ touch .${pname}_done
+ fi
+}
+
+_git_am() {
+ local pname="$(basename $1)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ msg_normal "$pkgver: patching: ${pname}.\n"
+ git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
+ am --exclude "third_party/blink/tools/**" \
+ --exclude "test/mjsunit/**" --exclude "content/test/**" \
+ --exclude "test/cctest/**" --exclude "test/unittests/**" \
+ --exclude "third_party/blink/web_tests/**" \
+ --exclude "chrome/test/**" \
+ $1
+ touch .${pname}_done
+ fi
+}
+
+
+_get_chromium_arch() {
+ case "$1" in
+ x86_64*) echo x64 ;;
+ i686*) echo x86 ;;
+ arm*) echo arm ;;
+ aarch64*) echo arm64 ;;
+ ppc64*) echo ppc64 ;;
+ ppc*) echo ppc ;;
+ mipsel*) echo mipsel ;;
+ mips*) echo mips ;;
+ *) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ esac
+}
+
+post_extract() {
+ mv chromium-${_chromiumver} src
+ mkdir -p src/third_party/
+ mv node-$_nodever src/third_party/electron_node
+ mv electron-${version} src/electron
+}
+
+_git_init() {
+ repopath="$1"
+ cd "$wrksrc"/"$repopath"
+ git init -q
+ git config "gc.auto" 0
+ if [ "$repopath" != "src" ]; then
+ echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
+ fi
+ git add .
+ git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
+ commit -q -m "." || true
+
+}
+
+post_patch() {
+ cd $wrksrc
+ for x in $FILESDIR/patches/*.patch; do
+ case "${x##*/}" in
+ electron*.patch)
+ cd src/electron
+ _apply_patch -p1 "$x"
+ cd "$wrksrc";;
+ esac
+ done
+
+ # Sigh, electron uses git am...
+ if [ ! -f ".electron_patches_done" ]; then
+ mv src/electron/patches/config.json config.json.old
+ jq 'del(."src/electron/patches/Mantle", ."src/electron/patches/ReactiveObjC",
+ ."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \
+ config.json.old > src/electron/patches/config.json
+
+ python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
+ _git_init $repopath
+ done
+ _git_init src/electron
+ cd $wrksrc
+
+ for x in $FILESDIR/chromium-upstream-patches/*.patch; do
+ [ -f $x ] || continue
+ cd src
+ _git_am "$x"
+ cd "$wrksrc"
+ done
+
+ python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
+ touch .electron_patches_done
+ fi
+
+ for x in $FILESDIR/patches/*; do
+ case "${x##*/}" in
+ chromium*.patch)
+ cd src
+ _apply_patch -p1 "$x"
+ cd "$wrksrc";;
+ esac
+ done
+
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ for x in $FILESDIR/musl-patches/*; do
+ case "${x##*/}" in
+ chromium*.patch)
+ cd src
+ _apply_patch -p1 "$x"
+ cd "$wrksrc";;
+ electron*.patch)
+ cd src/electron
+ _apply_patch -p1 "$x"
+ cd "$wrksrc";;
+ esac
+ done
+ fi
+ if [ "$build_option_sndio" ]; then
+ mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd}
+ cp ${FILESDIR}/sndio-files/sndio_*put.* \
+ ${wrksrc}/${build_wrksrc}/media/audio/sndio
+ cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
+ ${wrksrc}/${build_wrksrc}/media/audio/openbsd
+ for f in "${FILESDIR}"/sndio-patches/*.patch; do
+ cd src
+ _apply_patch -p0 "$f"
+ cd "$wrksrc"
+ done
+ fi
+ vsed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+ src/tools/generate_shim_headers/generate_shim_headers.py
+}
+
+pre_configure() {
+ cd "$wrksrc/$build_wrksrc"
+
+ # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
+ touch chrome/test/data/webui/i18n_process_css_test.html
+ # Use the file at run time instead of effectively compiling it in
+ sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
+ -i services/device/public/cpp/usb/BUILD.gn
+
+ vsed -e 's|python3.10|python3.11|g' -i third_party/electron_node/configure
+ vsed -e "s|(3, 10)|(3, 11)|" -i third_party/electron_node/configure
+
+ mkdir -p third_party/node/linux/node-linux-x64/bin
+ ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+ rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild
+
+ # compile gn early, so it can be used to generate gni stuff
+ msg_normal "Bootstrapping GN\n"
+ CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
+ CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
+ LDFLAGS="${XBPS_LDFLAGS}" \
+ python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
+
+ # we need to generate ppc64 stuff for libvpx as it's not shipped
+ # this has to be done before unbundling, but after gn is built
+ # comment out if we switch back to system libvpx again later
+ case "$XBPS_TARGET_MACHINE" in
+ ppc64*)
+ pushd third_party/libvpx
+ mkdir -p source/config/linux/ppc64
+ # need PATH to find gn
+ PATH="${wrksrc}/${build_wrksrc}/out/Release:$PATH" \
+ ./generate_gni.sh || \
+ msg_error "failed to generate libvpx gni"
+ popd
+ ;;
+ esac
+
+ # reusable system library settings
+ local use_system="
+ ffmpeg
+ flac
+ fontconfig
+ freetype
+ harfbuzz-ng
+ libdrm
+ libevent
+ libjpeg
+ libpng
+ libwebp
+ libxml
+ libxslt
+ opus
+ re2
+ snappy
+ "
+ for _lib in $use_system libjpeg_turbo; do
+ msg_normal "Removing buildscripts for system provided $_lib\n"
+ find -type f -path "*third_party/$_lib/*" \
+ \! -path "*third_party/$_lib/chromium/*" \
+ \! -path "*third_party/$_lib/google/*" \
+ \! -path './base/third_party/icu/*' \
+ \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
+ \! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
+ \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+ -delete
+ done
+
+
+ msg_normal "Replacing gn files\n"
+ python3 build/linux/unbundle/replace_gn_files.py --system-libraries \
+ $use_system
+ third_party/libaddressinput/chromium/tools/update-strings.py
+
+ # Satisfy some scripts that use git describe to figure out the electron version
+ cd ${wrksrc}/src/electron
+ git tag -f "v${version}"
+}
+
+do_configure() {
+ local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
+ local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
+ # the build system will set march for use, adding it to cflags will break builds
+ export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
+ export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
+ export CFLAGS=${CFLAGS/-g/}
+ export CXXFLAGS=${CXXFLAGS/-g/}
+ local conf=()
+ cd third_party/electron_node
+ if [ "$CROSS_BUILD" ]; then
+ conf_args=" --dest-cpu=${target_arch} --cross-compiling"
+ fi
+ ./configure --prefix=/usr \
+ --shared-zlib \
+ --shared-libuv \
+ --shared-openssl \
+ --shared-cares \
+ --openssl-use-def-ca-store \
+ --without-npm \
+ --without-dtrace \
+ --without-bundled-v8 \
+ ${conf_args}
+
+ cd "$wrksrc/$build_wrksrc"/electron
+ yarn install --frozen-lockfile
+ cd "$wrksrc/$build_wrksrc"
+
+ if [ "$build_option_clang" ]; then
+ export CC=clang
+ export CXX=clang++
+ export HOST_CC=clang
+ export HOST_CXX=clang++
+ else
+ export CXXFLAGS="$CXXFLAGS -fpermissive"
+ export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
+ export BUILD_AR="$AR_host"
+ export BUILD_NM="$NM_host"
+ fi
+
+ conf+=(
+ 'import("//electron/build/args/release.gn")'
+ 'blink_symbol_level=0'
+ 'clang_use_chrome_plugins=false'
+ 'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+ )
+ if [ "$CROSS_BUILD" ]; then
+ conf+=(
+ 'host_toolchain="//build/toolchain/linux/unbundle:host"'
+ 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
+ "host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
+ "pkg_config=\"$PKG_CONFIG\""
+ )
+ else
+ conf+=(
+ 'host_toolchain="//build/toolchain/linux/unbundle:default"'
+ 'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
+ )
+ fi
+ if [ "$build_option_sndio" ]; then
+ conf+=(
+ 'use_sndio=true'
+ )
+ fi
+ if [ -n "$XBPS_DEBUG_PKGS" ]; then
+ conf+=('symbol_level=1')
+ else
+ conf+=('symbol_level=0')
+ fi
+
+ # this does not work on ppc64 yet
+ case "$XBPS_TARGET_MACHINE" in
+ ppc64*) conf+=( "enable_jxl_decoder=false" );;
+ esac
+
+ conf+=(
+ 'devtools_skip_typecheck=false'
+ 'enable_hangout_services_extension=true'
+ 'enable_nacl=false'
+ 'enable_precompiled_headers=false'
+ 'fatal_linker_warnings=false'
+ 'ffmpeg_branding="Chrome"'
+ 'gold_path="/usr/bin/ld.gold"'
+ 'icu_use_data_file=true'
+ "is_clang=$(vopt_if clang true false)"
+ 'clang_base_path="/usr"'
+
+ 'is_component_build=false'
+ "is_debug=$_is_debug"
+ 'proprietary_codecs=true'
+ 'treat_warnings_as_errors=false'
+ 'use_cups=true'
+ 'use_custom_libcxx=false'
+ 'use_gnome_keyring=false'
+ 'use_gold=false'
+ "use_lld=$(vopt_if clang true false)"
+
+ 'is_cfi=false'
+ 'use_thin_lto=false'
+ 'use_cfi_icall=false'
+ 'chrome_pgo_phase=0'
+
+ "use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
+ "rtc_use_pipewire=$(vopt_if pipewire true false)"
+ 'use_sysroot=false'
+ 'use_system_harfbuzz=true'
+ 'use_system_libffi=true'
+ 'is_component_ffmpeg=false'
+ "target_cpu=\"$target_arch\""
+ "host_cpu=\"$host_arch\""
+ )
+
+ msg_normal "Configuring build\n"
+ out/Release/gn gen out/$_buildtype --args="${conf[*]}"
+}
+
+do_build() {
+ export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
+ export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
+ export CFLAGS=${CFLAGS/-g/}
+ export CXXFLAGS=${CXXFLAGS/-g/}
+ if [ "$build_option_clang" ]; then
+ export CC=clang
+ export CXX=clang++
+ export HOST_CC=clang
+ export HOST_CXX=clang++
+ else
+ export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
+ export CXXFLAGS="$CXXFLAGS -fpermissive"
+ export BUILD_AR="$AR_host"
+ export BUILD_NM="$NM_host"
+ fi
+ msg_normal "Ninja turtles GO!\n"
+ ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
+ # finish rest of the build
+ strip -s out/$_buildtype/electron
+ ninja ${makejobs} -C out/$_buildtype electron_dist_zip
+}
+
+do_install() {
+ vmkdir /usr/lib/$pkgname
+ vmkdir /usr/include/$pkgname
+ bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
+
+ chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
+
+ cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
+
+ vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
+ vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
+ vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
+
+ vmkdir /usr/bin
+ ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
+}
diff --git a/srcpkgs/electron24/update b/srcpkgs/electron24/update
new file mode 100644
index 000000000000..3af8e58b5358
--- /dev/null
+++ b/srcpkgs/electron24/update
@@ -0,0 +1,2 @@
+site=https://www.electronjs.org/releases/stable?version=${version%%.*}
+pattern='tag/v\K[\d\.]+(?=")'
From 468a954836f06c244bbbb27500c4667c3288c5aa Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 May 2023 17:36:20 +0200
Subject: [PATCH 10/94] terragrunt: update to 0.45.9.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 14f61880457b..fb234a1743b1 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.45.8
+version=0.45.9
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=33780e41a0649f2ec3504cb6e365f191334feb5b90f55ce04193bcd18b570ffe
+checksum=fa55db244a60667f8cf7a86a8b9d53c7df6ab22f4498e7665ae6bb8d36a4c97d
post_install() {
vlicense LICENSE.txt
From 4c82c00580eb4d643dfde763a7261e12208a7203 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 May 2023 17:37:49 +0200
Subject: [PATCH 11/94] racket: update to 8.9.
---
srcpkgs/racket/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 2d96716c8afe..2dc69c30c241 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,6 +1,6 @@
# Template file for 'racket'
pkgname=racket
-version=8.8
+version=8.9
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
build_wrksrc=src
@@ -15,7 +15,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=398422e2b42373e14e4e0f96da3d95cb5744247ba3f73ea99815fb693c2714ab
+checksum=3ae225e84e119f4cd1a47f1b16133568fc7d35c290c505495566d9dccefc5224
nostrip=yes
patch_args="-Np2"
From e49bb2ab32186c5c60e54d4996af33079519130e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 8 May 2023 18:38:02 +0200
Subject: [PATCH 12/94] hopper: update to 5.10.0.
---
srcpkgs/hopper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 90e71e8d2085..8dbbc6ed054f 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
# Template file for 'hopper'
pkgname=hopper
-version=5.9.0
+version=5.10.0
revision=1
_build=1
create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:EULA"
homepage="https://www.hopperapp.com"
distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=44ca1be9d37ab1dc42357f2af4698f3fd7e8a11b71123c7f9552c02a6a14266e
+checksum=9d1bf15b475f4a6cafbf5f10fe8cbe9520fde14a0701529d9803b27bf5dd7aca
archs="x86_64"
restricted=yes
From 53218f5b0fbd58f05b4d8a0fa235642dcd3a6778 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 May 2023 19:16:25 +0200
Subject: [PATCH 13/94] electron24: add libatomic depenency
---
srcpkgs/electron24/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index 30815d8d856d..005d245acb25 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -9,7 +9,7 @@ create_wrksrc=yes
build_wrksrc="src"
hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids
libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
+ pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel) jq"
@@ -21,7 +21,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel opus-devel libffi-devel
+ re2-devel fontconfig-devel freetype-devel opus-devel libffi-devel libatomic-devel
$(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel
$(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel"
short_desc="Cross platform application framework based on web technologies"
From 4b9be0e799db2bffad578db048dcc010a3c729c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 00:15:29 +0700
Subject: [PATCH 14/94] smtube: switch to yt-dlp
---
srcpkgs/smtube/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/smtube/template b/srcpkgs/smtube/template
index 20b8b181a26f..3806f05e362e 100644
--- a/srcpkgs/smtube/template
+++ b/srcpkgs/smtube/template
@@ -1,7 +1,7 @@
# Template file for 'smtube'
pkgname=smtube
version=21.10.0
-revision=1
+revision=2
build_wrksrc=src
build_style=qmake
make_build_args="
@@ -10,7 +10,7 @@ make_build_args="
DOC_PATH=\\\"/usr/share/doc/smtube\\\""
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="qt5-script-devel qt5-tools-devel qt5-webkit-devel"
-depends="desktop-file-utils hicolor-icon-theme youtube-dl"
+depends="desktop-file-utils hicolor-icon-theme yt-dlp"
short_desc="Small youtube browser"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From f5a28440a24e46cda34e2520abf65429d7c44260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 6 May 2023 22:14:13 +0700
Subject: [PATCH 15/94] linux6.1: update to 6.1.27.
---
srcpkgs/linux6.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 5c0c74956b5d..7e0867970e70 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.1'
pkgname=linux6.1
-version=6.1.25
+version=6.1.27
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 6415c1c25f7614d78bf04dae4c172fc2d460ab152dcc710dd8f46990b7a6cd31"
+ c9501bd96fcf210c0b68a07500bede63c0e1f7d371eb616467dd160dbd39715a"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 9a65b76e8811b2fe3658e5f70cc44ad581fd2e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 00:18:13 +0700
Subject: [PATCH 16/94] qytdl: update to 1.6.
---
srcpkgs/qytdl/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/qytdl/template b/srcpkgs/qytdl/template
index 8781ab33e96d..66013cab1b2d 100644
--- a/srcpkgs/qytdl/template
+++ b/srcpkgs/qytdl/template
@@ -1,16 +1,16 @@
# Template file for 'qytdl'
pkgname=qytdl
-version=1.1
-revision=4
+version=1.6
+revision=1
build_style=gnu-makefile
pycompile_dirs="usr/share/qytdl/src"
-depends="desktop-file-utils python3-PyQt5 python3-youtube-dl"
+depends="desktop-file-utils python3-PyQt5 yt-dlp"
short_desc="Simple Qt (PyQt5) frontend to Youtube-DL"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.someplacedumb.net/content/progs/#qytdl"
distfiles="http://www.someplacedumb.net/content/progs/qytdl/qytdl-${version}.tar.xz"
-checksum=5626f6cfd205bd0f3e51dbddc4f033502cd64f024c230e2e3e742833c07b5c64
+checksum=ec7b2e9222fc7a133e4c4734f88a584a561da3bf1f216af4b388b3b2a8a13671
python_version=3
do_install() {
From 21f20a076b98228154fc684ffaa77615ebf07105 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 9 May 2023 13:18:30 +0200
Subject: [PATCH 17/94] valgrind: update to 3.21.0.
---
srcpkgs/valgrind/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 9ee5e4b22894..6572a5483e52 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,6 +1,6 @@
# Template file for 'valgrind'
pkgname=valgrind
-version=3.20.0
+version=3.21.0
revision=1
build_style=gnu-configure
configure_args="--enable-tls --without-mpicc --enable-lto=yes"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://valgrind.org/"
changelog="https://valgrind.org/docs/manual/dist.news.html"
distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6
+checksum=10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971
CFLAGS="-fno-stack-protector"
CXXFLAGS="-fno-stack-protector"
From 32d6c18c3c0a13b3aab163c5bb73fbd480538358 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 9 May 2023 06:35:58 -0500
Subject: [PATCH 18/94] mongo-c-driver: update to 1.23.4.
---
srcpkgs/mongo-c-driver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 56d4bb6d161b..1e7a908c7fe7 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,6 +1,6 @@
# Template file for 'mongo-c-driver'
pkgname=mongo-c-driver
-version=1.23.3
+version=1.23.4
revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=OFF"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://mongoc.org"
distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=c8f951d4f965d455f37ae2e10b72914736fc0f25c4ffc14afc3cbadd1a574ef6
+checksum=209406c91fcf7c63aa633179a0a6b1b36ba237fb77e0470fd81f7299a408e334
mongo-c-driver-devel_package() {
short_desc+=" - development files"
From 1ae0c8f55d6e35befb743f14146d5fc6582801b5 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Mon, 8 May 2023 10:31:59 +0900
Subject: [PATCH 19/94] avr-libc: update to 2.1.0.
---
srcpkgs/avr-libc/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/avr-libc/template b/srcpkgs/avr-libc/template
index 9b7bb0508caf..42e442e10075 100644
--- a/srcpkgs/avr-libc/template
+++ b/srcpkgs/avr-libc/template
@@ -1,13 +1,13 @@
# Template file for 'avr-libc'
pkgname=avr-libc
-version=2.0.0
-revision=4
+version=2.1.0
+revision=1
short_desc="C library for use with GCC on Atmel AVR microcontrollers"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://savannah.nongnu.org/projects/avr-libc/"
-distfiles="$NONGNU_SITE/$pkgname/$pkgname-$version.tar.bz2"
-checksum=b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97
+distfiles="$NONGNU_SITE/avr-libc/avr-libc-${version}.tar.bz2"
+checksum=0b84cee5c08b5d5cba67c36125e5aaa85251bc9accfba5773bfa87bc34b654e8
build_style=gnu-configure
hostmakedepends="avr-binutils avr-gcc"
From 95074d8d12e3326616a9156e50237385ebc9ab82 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 8 May 2023 10:30:09 +0200
Subject: [PATCH 20/94] miniflux: update to 2.0.44.
---
srcpkgs/miniflux/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index fa99084cb46a..1e22a1146957 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
# Template file for 'miniflux'
pkgname=miniflux
-version=2.0.43
-revision=2
+version=2.0.44
+revision=1
build_style=go
go_import_path="miniflux.app"
go_ldflags="-X miniflux.app/version.Version=${version}"
@@ -11,7 +11,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/v2/main/ChangeLog"
distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=47bd2cf4fabcfff8589c24069e3d5b399cea55e60437585d3d1c1bd6a22e69b6
+checksum=9b3d873c21dde5eafc947be5394cd1bdd6d4f49ba62e5d796a526176647d9404
system_accounts="_miniflux"
post_install() {
From 62e7acb0b93666d69db8b062fd2694fd92fdf75c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 8 May 2023 09:19:50 +0200
Subject: [PATCH 21/94] labwc: update to 0.6.3
---
srcpkgs/labwc/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template
index 802852ea58b4..841b82c0cd82 100644
--- a/srcpkgs/labwc/template
+++ b/srcpkgs/labwc/template
@@ -1,6 +1,6 @@
# Template file for 'labwc'
pkgname=labwc
-version=0.6.2
+version=0.6.3
revision=1
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
@@ -11,12 +11,11 @@ license="GPL-2.0-or-later"
homepage="https://labwc.github.io/"
changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md"
distfiles="https://github.com/labwc/labwc/archive/refs/tags/${version}.tar.gz"
-checksum=f2a91edea4069ba0a9d759e096a8e96434eb3d36d54ccbbba486d66f5b8060f3
+checksum=a19ada70e40b90c759cf61094b4df96f907527f743b7e669da243d3ca3554ca2
post_install() {
local _example
- vmkdir usr/share/examples/labwc
for _example in autostart environment menu.xml rc.xml.all themerc; do
- vinstall "docs/$_example" 0644 usr/share/examples/labwc
+ vsconf docs/${_example}
done
}
From b4926299d3ce93fb64af4f54d0231849e3585fbd Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 7 May 2023 22:23:30 +0200
Subject: [PATCH 22/94] dbeaver: update to 23.0.4.
---
srcpkgs/dbeaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b345c36c1f34..ba3dce2ca908 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
# Template file for 'dbeaver'
pkgname=dbeaver
-version=23.0.3
+version=23.0.4
revision=1
# the build downloads binaries linked to glibc
archs="x86_64 aarch64"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://dbeaver.io"
changelog="https://dbeaver.io/news/"
distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=8470d2cd00e12aaa13b7167786116229bb60c30c10da3029996270503a99b129
+checksum=ddebd3b5b934bd34785037f6647d8f827a92c60b20983615d2902a6aae2e4050
nopie=true
do_build() {
From 65e8a93771aeb582ec0a68eff6369eeb89c4d08b Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sun, 7 May 2023 22:05:33 -0500
Subject: [PATCH 23/94] xinput: update to 1.6.4.
---
srcpkgs/xinput/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xinput/template b/srcpkgs/xinput/template
index 9317874f2eda..adb4ce2c5750 100644
--- a/srcpkgs/xinput/template
+++ b/srcpkgs/xinput/template
@@ -1,6 +1,6 @@
# Template file for 'xinput'
pkgname=xinput
-version=1.6.3
+version=1.6.4
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Utility to configure and test X input devices"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.x.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.gz"
+checksum=64e25434af1309ed0abca1ebebd035f7631bb0bc1bfac5decefe9aa98ccaf611
post_install() {
vlicense COPYING
From 246292d7ac312530f35cb99e5130e2d51a068bcd Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Sun, 7 May 2023 20:03:14 +0200
Subject: [PATCH 24/94] gtklock: update to 2.1.0
---
srcpkgs/gtklock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template
index cd2a1070658f..b6300b834777 100644
--- a/srcpkgs/gtklock/template
+++ b/srcpkgs/gtklock/template
@@ -1,6 +1,6 @@
# Template file for 'gtklock'
pkgname=gtklock
-version=2.0.1
+version=2.1.0
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -11,7 +11,7 @@ maintainer="Jovan Lanik <jox969@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/jovanlanik/gtklock"
distfiles="https://github.com/jovanlanik/gtklock/archive/refs/tags/v${version}.tar.gz"
-checksum=d1802a7fcb8cace0408ab34627841d7ea28d630f934c8b7884536f9dfa76910e
+checksum=47cc09ab773e90e3a28240faaabb8d9ac4e36f5234a2b5c3a956039783365f43
post_install() {
# copying CSS example provided
From d314c48ad724e7f782b708d81db822e6d1a59db5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 7 May 2023 10:10:27 +0200
Subject: [PATCH 25/94] sonic-visualiser: update to 4.5.2
---
srcpkgs/sonic-visualiser/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index 8ada7658aca5..0f70214f8570 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,6 +1,6 @@
# Template file for 'sonic-visualiser'
pkgname=sonic-visualiser
-version=4.5.1
+version=4.5.2
revision=1
build_style=meson
hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
homepage="https://www.sonicvisualiser.org/"
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=59ab88682590b3bdfd230248a2b0c2372987fff9dabf1b1b1d4095014625efe9
+checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From b575a66226e75e1034a1fc686683b0d2a525a269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 00:21:36 +0700
Subject: [PATCH 26/94] gallery-dl: test with yt-dlp
---
srcpkgs/gallery-dl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 050c8e2f5f97..4de3fcdd2290 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -6,7 +6,7 @@ build_style=python3-module
make_check_args="--ignore test/test_results.py"
hostmakedepends="python3-setuptools"
depends="python3-requests"
-checkdepends="${depends} youtube-dl python3-pytest"
+checkdepends="${depends} yt-dlp python3-pytest"
short_desc="Command-line program to download image galleries"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="GPL-2.0-only"
From 2f350d552290088cd567fc3607f3a2d68173305b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 9 May 2023 22:53:18 +0700
Subject: [PATCH 27/94] ca-certificates: update to 20230311+3.89.1.
Also stop remove expired certs, for reproducibility.
---
.../files/remove-expired-certs.sh | 51 -------------------
.../patches/busybox-flags.patch | 14 -----
.../patches/drop-python-dependency.patch | 7 ++-
.../update-ca-certificates-destdir.patch | 9 ++--
srcpkgs/ca-certificates/template | 11 ++--
5 files changed, 12 insertions(+), 80 deletions(-)
delete mode 100755 srcpkgs/ca-certificates/files/remove-expired-certs.sh
delete mode 100644 srcpkgs/ca-certificates/patches/busybox-flags.patch
diff --git a/srcpkgs/ca-certificates/files/remove-expired-certs.sh b/srcpkgs/ca-certificates/files/remove-expired-certs.sh
deleted file mode 100755
index 92cda666cad3..000000000000
--- a/srcpkgs/ca-certificates/files/remove-expired-certs.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Begin remove-expired-certs.sh
-#
-# Version 20120211
-
-# Make sure the date is parsed correctly on all systems
-mydate()
-{
- local y=$( echo $1 | cut -d" " -f4 )
- local M=$( echo $1 | cut -d" " -f1 )
- local d=$( echo $1 | cut -d" " -f2 )
- local m
-
- [ -z "${d}" ] && d="0"
- [ "${d}" -lt 10 ] && d="0${d}"
-
- case $M in
- Jan) m="01";;
- Feb) m="02";;
- Mar) m="03";;
- Apr) m="04";;
- May) m="05";;
- Jun) m="06";;
- Jul) m="07";;
- Aug) m="08";;
- Sep) m="09";;
- Oct) m="10";;
- Nov) m="11";;
- Dec) m="12";;
- esac
-
- certdate="${y}${m}${d}"
-}
-
-DIR="$1"
-[ -z "$DIR" ] && DIR=$(pwd)
-
-today=$(date +%Y%m%d)
-
-find ${DIR} -type f -a -iname "*.crt" -printf "%p\n" | while read cert; do
- notafter=$(/usr/bin/openssl x509 -enddate -in "${cert}" -noout)
- date=$( echo ${notafter} | sed 's/^notAfter=//' )
- mydate "$date"
-
- if [ ${certdate} -lt ${today} ]; then
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "EXPIRED CERTIFICATE FOUND $certdate: \"$(basename ${cert})\""
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- rm -f "${cert}"
- fi
-done
diff --git a/srcpkgs/ca-certificates/patches/busybox-flags.patch b/srcpkgs/ca-certificates/patches/busybox-flags.patch
deleted file mode 100644
index 0f109e1b0bc1..000000000000
--- a/srcpkgs/ca-certificates/patches/busybox-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
---- a/work/sbin/update-ca-certificates
-+++ b/work/sbin/update-ca-certificates
-@@ -81,8 +81,8 @@ trap cleanup 0
- # Helper files. (Some of them are not simple arrays because we spawn
- # subshells later on.)
- TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
--ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
--REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
-+ADDED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
-+REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
-
- # Adds a certificate to the list of trusted ones. This includes a symlink
- # in /etc/ssl/certs to the certificate file and its inclusion into the
diff --git a/srcpkgs/ca-certificates/patches/drop-python-dependency.patch b/srcpkgs/ca-certificates/patches/drop-python-dependency.patch
index 4d9140384ba5..409d6fde69f7 100644
--- a/srcpkgs/ca-certificates/patches/drop-python-dependency.patch
+++ b/srcpkgs/ca-certificates/patches/drop-python-dependency.patch
@@ -1,6 +1,6 @@
---- ca-certificates-20210119+3.67.orig/work/mozilla/Makefile
-+++ ca-certificates-20210119+3.67/work/mozilla/Makefile
-@@ -2,8 +2,12 @@
+--- a/ca-certificates/mozilla/Makefile
++++ b/ca-certificates/mozilla/Makefile
+@@ -2,8 +2,11 @@
# Makefile
#
@@ -11,7 +11,6 @@
+
+all: certdata2pem
+ ./certdata2pem
-+ ./remove-expired-certs.sh
clean:
-rm -f *.crt
diff --git a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
index 831708b769ff..5181c28f6c24 100644
--- a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
+++ b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
@@ -1,14 +1,13 @@
---- a/work/sbin/update-ca-certificates 2015-05-29 11:09:43.922158838 +0200
-+++ b/work/sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200
+--- a/ca-certificates/sbin/update-ca-certificates
++++ b/ca-certificates/sbin/update-ca-certificates
@@ -24,12 +24,12 @@
verbose=0
fresh=0
default=0
-CERTSCONF=/etc/ca-certificates.conf
--CERTSDIR=/usr/share/ca-certificates
--LOCALCERTSDIR=/usr/local/share/ca-certificates
+CERTSCONF=$DESTDIR/etc/ca-certificates.conf
-+CERTSDIR=/usr/share/ca-certificates
+ CERTSDIR=/usr/share/ca-certificates
+-LOCALCERTSDIR=/usr/local/share/ca-certificates
+LOCALCERTSDIR=$DESTDIR/usr/local/share/ca-certificates
CERTBUNDLE=ca-certificates.crt
-ETCCERTSDIR=/etc/ssl/certs
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 3a158856127d..4326cc79f1a3 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,22 +1,21 @@
# Template file for 'ca-certificates'
pkgname=ca-certificates
-version=20211016+3.86
+version=20230311+3.89.1
revision=1
_nss_version=${version#*+}
bootstrap=yes
conf_files="/etc/ca-certificates.conf"
-create_wrksrc=yes
-build_wrksrc="work"
+build_wrksrc="ca-certificates"
hostmakedepends="openssl"
depends="openssl run-parts"
short_desc="Common CA certificates for SSL/TLS from Mozilla"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later, MPL-2.0"
homepage="https://wiki.mozilla.org/NSS:Root_certs"
distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
-checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975"
+checksum="83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3
+ 3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156"
post_extract() {
cp ${FILESDIR}/* $build_wrksrc/mozilla
From 0cbc6072a4ba989769b100ed04b588b74f276fd8 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 9 May 2023 17:42:41 +0200
Subject: [PATCH 28/94] terragrunt: update to 0.45.10.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fb234a1743b1..de4781593062 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.45.9
+version=0.45.10
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=fa55db244a60667f8cf7a86a8b9d53c7df6ab22f4498e7665ae6bb8d36a4c97d
+checksum=852247eb5cc6cf81ce92ca73ab4dd3013efd11b4c7e24b6a29ed6eb740bb9772
post_install() {
vlicense LICENSE.txt
From 7c9771e423d066682d09c6aaeac3561c0a7b3b16 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 9 May 2023 17:44:32 +0200
Subject: [PATCH 29/94] moby: update to 23.0.6.
---
srcpkgs/moby/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 96ad69895787..83f23916624d 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,7 +1,7 @@
# Template file for 'moby'
# should be kept in sync with docker-cli
pkgname=moby
-version=23.0.5
+version=23.0.6
revision=1
# libnetwork commit is mentioned in vendor.conf
_libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
@@ -18,7 +18,7 @@ homepage="https://www.docker.com"
changelog="https://github.com/moby/moby/releases"
distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-checksum="f502eba135828ae52cefb12f1c74092c8865e39cb94f5daed0f3f6717a8d50a3
+checksum="3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e
5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b"
system_groups="docker"
From 32d6e88b04df1d490ced6fedd67ad5d8d692d586 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 9 May 2023 17:46:13 +0200
Subject: [PATCH 30/94] docker-cli: update to 23.0.6.
---
srcpkgs/docker-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 7e0bdd2e46d5..6a848d9b3820 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
# Template file for 'docker-cli'
# should be kept in sync with moby
pkgname=docker-cli
-version=23.0.5
+version=23.0.6
revision=1
build_style=go
go_package="github.com/docker/cli/cmd/docker"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://www.docker.com"
distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=2d6599783d447ac56d4caa482e9d8f09ad9e6f91ba2be6707bc107be04f89ddd
+checksum=b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9
system_groups="docker"
pre_build() {
From 3e940db4cdcc6cfd612cd4c69ebabfc7931890a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 14:35:25 +0200
Subject: [PATCH 31/94] New package: knit-1.1.1
---
srcpkgs/knit/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/knit/template
diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
new file mode 100644
index 000000000000..0476523cf1b4
--- /dev/null
+++ b/srcpkgs/knit/template
@@ -0,0 +1,24 @@
+# Template file for 'knit'
+pkgname=knit
+version=1.1.1
+revision=1
+build_style=go
+go_import_path="./cmd/..."
+go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
+hostmakedepends="pandoc"
+short_desc="Simple and flexible build tool using Lua, similar to make/mk"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT, MPL-2.0"
+homepage="https://github.com/zyedidia/knit"
+distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
+checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+
+post_build() {
+ go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1
+}
+
+post_install() {
+ vman knit.1
+ vlicense LICENSE
+ vlicense LICENSE-EXTRA
+}
From e059f4a83fb690eec0721a19b530e9d0e2c1510e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 14:37:59 +0200
Subject: [PATCH 32/94] crawl: update to 0.30.0.
---
srcpkgs/crawl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/crawl/template b/srcpkgs/crawl/template
index 02e4a38d07e8..8e061ee68eea 100644
--- a/srcpkgs/crawl/template
+++ b/srcpkgs/crawl/template
@@ -1,6 +1,6 @@
# Template file for 'crawl'
pkgname=crawl
-version=0.29.1
+version=0.30.0
revision=1
build_wrksrc="crawl-ref/source"
make_build_args="prefix=/usr bin_prefix=bin"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://crawl.develz.org/"
distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=e8ff1d09718ab3cbff6bac31651185b584c9eea2c9b6f42f0796127ca5599997
+checksum=a4ba0d5a6fcf9bb1ad57b6a116f5d577b7ee9dac33d90448525a1061207a6abf
nocross=yes
post_extract() {
From 9ca6600268af20dee6433b415752ec7f3cdfe624 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 8 May 2023 14:38:01 +0200
Subject: [PATCH 33/94] crawl-tiles: update to 0.30.0.
---
srcpkgs/crawl-tiles/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/crawl-tiles/template b/srcpkgs/crawl-tiles/template
index 85ca68bd0e85..af4ff9fddd8d 100644
--- a/srcpkgs/crawl-tiles/template
+++ b/srcpkgs/crawl-tiles/template
@@ -1,6 +1,6 @@
# Template file for 'crawl-tiles'
pkgname=crawl-tiles
-version=0.29.1
+version=0.30.0
revision=1
build_wrksrc="crawl-ref/source"
make_build_args="prefix=/usr bin_prefix=bin DATADIR=/usr/share/crawl-tiles
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://crawl.develz.org/"
distfiles="https://github.com/crawl/crawl/archive/${version}.tar.gz"
-checksum=e8ff1d09718ab3cbff6bac31651185b584c9eea2c9b6f42f0796127ca5599997
+checksum=a4ba0d5a6fcf9bb1ad57b6a116f5d577b7ee9dac33d90448525a1061207a6abf
nocross=yes
post_extract() {
From 108a0b821afa922fb18fcf56b42e387337d6fe64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 May 2023 19:25:54 +0200
Subject: [PATCH 34/94] tnftp: update to 20230507.
---
srcpkgs/tnftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index e1fa048607b6..66921584537d 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,6 +1,6 @@
# Template file for 'tnftp'
pkgname=tnftp
-version=20230409
+version=20230507
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-4-Clause"
homepage="https://man.netbsd.org/ftp.1"
distfiles="ftp://ftp.netbsd.org/pub/NetBSD/misc/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c6c631eb43cdeb5be47f8d37fa12b8d991894408b323d39ae753051f4271de2c
+checksum=be0134394bd7d418a3b34892b0709eeb848557e86474e1786f0d1a887d3a6580
alternatives="
ftp:ftp:/usr/bin/${pkgname}
From 58bdbfac60aa33cbed2c0d76c0fea6208c5f1a5f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 May 2023 19:26:54 +0200
Subject: [PATCH 35/94] libbpf: update to 1.2.0.
---
srcpkgs/libbpf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libbpf/template b/srcpkgs/libbpf/template
index 8ae0851d2d98..397a9c91047f 100644
--- a/srcpkgs/libbpf/template
+++ b/srcpkgs/libbpf/template
@@ -1,6 +1,6 @@
# Template file for 'libbpf'
pkgname=libbpf
-version=1.1.0
+version=1.2.0
revision=1
build_wrksrc="src"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-only, BSD-2-Clause"
homepage="https://github.com/libbpf/libbpf"
distfiles="https://github.com/libbpf/libbpf/archive/refs/tags/v${version}.tar.gz"
-checksum=5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8
+checksum=dadd4bb6ab3bf9c667d42ee2ae4f7673fca8c60c0f467fcd88c211478266f644
post_install() {
vlicense ../LICENSE
From a7c3e4d7a8202929b955f217e7f57c550603d37b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 9 May 2023 12:34:57 -0500
Subject: [PATCH 36/94] minitalk: update to 0.3.1.
---
srcpkgs/minitalk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/minitalk/template b/srcpkgs/minitalk/template
index 0da6bf8e487c..2b4d9078714e 100644
--- a/srcpkgs/minitalk/template
+++ b/srcpkgs/minitalk/template
@@ -1,6 +1,6 @@
# Template file for 'minitalk'
pkgname=minitalk
-version=0.3.0
+version=0.3.1
revision=1
build_style=gnu-makefile
makedepends="readline-devel"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/abenson/minitalk"
distfiles="https://github.com/abenson/minitalk/archive/v${version}.tar.gz"
-checksum=7ed213d8de21010d75c10936f29b2492b6b737a1955d4bf80452b4d8b3bfb800
+checksum=86e6696d885a10f6c2c19ab256a5124ed69149b114f2fb394af9e6e299f4209b
post_install() {
vlicense LICENSE
From 52f1773ede9edc87a7384accc3a5a33932268cba Mon Sep 17 00:00:00 2001
From: Siddhartha Menon <siddharthamenon+void@outlook.com>
Date: Wed, 8 Feb 2023 17:33:56 +0000
Subject: [PATCH 37/94] btdu: update to 0.5.0.
---
srcpkgs/btdu/template | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/btdu/template b/srcpkgs/btdu/template
index e2c173e49344..3e08d8262b4c 100644
--- a/srcpkgs/btdu/template
+++ b/srcpkgs/btdu/template
@@ -1,27 +1,22 @@
# Template file for 'btdu'
pkgname=btdu
-version=0.4.1
+version=0.5.0
revision=1
# fails to build on musl due to different argument types for ioctl
# struct packing seems to differ on i686 archs and therefore d-btrfs fails
-archs=x86_64
-hostmakedepends="dmd dub"
+archs="x86_64"
+hostmakedepends="ldc dub"
makedepends="zlib-devel ncurses-devel"
short_desc="Sampling disk usage profiler for btrfs"
maintainer="Siddhartha Menon <siddharthamenon+void@outlook.com>"
license="GPL-2.0-only"
homepage="https://github.com/CyberShadow/btdu"
distfiles="https://github.com/CyberShadow/btdu/archive/v${version}.tar.gz"
-checksum=265c63ee82067f6b5dc44b47c9ec58be5e13c654f31035c60a7e375ffa4082c9
+checksum=90ba4d8997575993e9d39a503779fb32b37bb62b8d9386776e95743bfc859606
nocross="dmd compilation fails on cross"
-pre_configure() {
- vsed -e 's/dependency "ae" version="==0.0.3184"/dependency "ae" version="==0.0.3228"/g' -i dub.sdl
- vsed -e 's/"ae": "0.0.3184"/"ae": "0.0.3228"/g' -i dub.selections.json
-}
-
do_build() {
- dub build -b release
+ dub build --compiler=ldc2 -b release
}
do_install() {
From 9b4b67f2ee863245fd118b2a7e3f9e73e3f499bf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 9 May 2023 23:03:57 +0200
Subject: [PATCH 38/94] rdiff-backup: update to 2.2.5.
---
srcpkgs/rdiff-backup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index 0329d02505ba..825013f6cedb 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,6 +1,6 @@
# Template file for 'rdiff-backup'
pkgname=rdiff-backup
-version=2.2.4
+version=2.2.5
revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools_scm python3-pip"
@@ -10,6 +10,6 @@ short_desc="Local/remote mirroring and incremental backups"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rdiff-backup.net/"
-changelog="https://github.com/rdiff-backup/rdiff-backup/raw/master/CHANGELOG.md"
+changelog="https://github.com/rdiff-backup/rdiff-backup/raw/master/CHANGELOG.adoc"
distfiles="${PYPI_SITE}/r/rdiff-backup/rdiff-backup-${version}.tar.gz"
-checksum=948151492a42c2ad47ca90dfb2d1cbe7a5bb90f2bc2b9b6f3ef4238a7bf0dbf5
+checksum=86e2826b784ec3ea4ef187d936ee5f15277422c4077efa0156ef67e3139ea08e
From 9344eda4a56cb35c207be059d52fdf138b75ef71 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 9 May 2023 23:04:21 +0200
Subject: [PATCH 39/94] openfortivpn: update to 1.20.3.
---
srcpkgs/openfortivpn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 35833d38d6b0..6d916b48b31b 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
# Template file for 'openfortivpn'
pkgname=openfortivpn
-version=1.20.2
+version=1.20.3
revision=1
build_style=gnu-configure
configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/adrienverge/openfortivpn"
changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=0f8db4217ac9973f4815a2c18a7ab04d2714deec5f8cb6530b171bae17ae38a6
+checksum=e54331098dc2c009cf98524f0ade027e337739506c5a60b65e2c2bf5f9c1d7e1
conf_files="/etc/openfortivpn/config"
From 21a55ccbcce0a39a254940aed225dcc02cf7bada Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 9 May 2023 16:55:36 +0200
Subject: [PATCH 40/94] firefox: update to 113.0.
---
...the-vendored-glean_parser-for-all-of.patch | 39 +++++++++++++++++++
srcpkgs/firefox/patches/ppc64-webrtc.patch | 22 -----------
srcpkgs/firefox/template | 4 +-
3 files changed, 41 insertions(+), 24 deletions(-)
create mode 100644 srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
delete mode 100644 srcpkgs/firefox/patches/ppc64-webrtc.patch
diff --git a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
new file mode 100644
index 000000000000..3a7118ec69ca
--- /dev/null
+++ b/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Sat, 6 May 2023 21:07:09 +0000
+Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of
+ `mach` r=firefox-build-system-reviewers,glandium
+
+Differential Revision: https://phabricator.services.mozilla.com/D177340
+---
+ python/sites/build.txt | 1 -
+ python/sites/mach.txt | 1 +
+ python/sites/python-test.txt | 1 -
+ 3 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/python/sites/build.txt b/python/sites/build.txt
+index b43f7680d200..4e6f6c51d9ad 100644
+--- a/python/sites/build.txt
++++ b/python/sites/build.txt
+@@ -1,2 +1 @@
+-vendored:third_party/python/glean_parser
+ pth:third_party/python/vsdownload
+diff --git a/python/sites/mach.txt b/python/sites/mach.txt
+index b9fafd0b9c59..a18691184312 100644
+--- a/python/sites/mach.txt
++++ b/python/sites/mach.txt
+@@ -78,6 +78,7 @@ vendored:third_party/python/esprima
+ vendored:third_party/python/fluent.migrate
+ vendored:third_party/python/fluent.syntax
+ vendored:third_party/python/giturlparse
++vendored:third_party/python/glean_parser
+ vendored:third_party/python/gyp/pylib
+ vendored:third_party/python/idna
+ vendored:third_party/python/importlib_metadata
+diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt
+index 48cdcd2b8f48..74889365a22b 100644
+--- a/python/sites/python-test.txt
++++ b/python/sites/python-test.txt
+@@ -1,2 +1 @@
+-vendored:third_party/python/glean_parser
+ pypi:pytest==7.0.1
diff --git a/srcpkgs/firefox/patches/ppc64-webrtc.patch b/srcpkgs/firefox/patches/ppc64-webrtc.patch
deleted file mode 100644
index dad58e04c3c8..000000000000
--- a/srcpkgs/firefox/patches/ppc64-webrtc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 214967e5cea61ff49fb21810e8d8c755db84f682
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Tue Oct 4 11:53:06 2022 +0200
-
- fix libwebrtc on ppc64
-
-diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
-index 8579f8b..d9ca79d 100644
---- a/third_party/libwebrtc/moz.build
-+++ b/third_party/libwebrtc/moz.build
-@@ -520,7 +520,10 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
- "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
- "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
- "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
-- "/third_party/libwebrtc/modules/audio_coding/isac_gn"
-+ "/third_party/libwebrtc/modules/audio_coding/isac_gn",
-+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
-+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
-+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
- ]
-
- if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 30105ec369c4..85a14d933c65 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=112.0.2
+version=113.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=e6a4819a3b82b1ca6c45296e50e6c9ab653306eeb540e50ba8683e339565992e
+checksum=7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627
lib32disabled=yes
From 87ca3aa567b9dc26824928c7a370ddc92ddfa9e4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 9 May 2023 16:58:34 +0200
Subject: [PATCH 41/94] firefox-i18n: update to 113.0.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index a16b3e301a22..9c721ea35982 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=112.0.2
+version=113.0
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="2d6f6373580fae6c3fb0251ad49a2a25e437b38738c204a924304c00d6492202
- 452285fc2119b75d70a747f8aef7164451521cee609aa7b66e050430262f77e0
- 73e8754d4a37b6e7590308a864bd9bbcc7997a1718998970c43572717e8a414a
- a8617342200a6d34fc8c053386e0714e6857a70865b6fd7f91b3a88a374c4aa4
- db35f3eb861a0a37c131a1c877adb951ba838ce402d6d1250fd2970afd444ab2
- 5398c2eb8b0812d4f547514bdfe38502fe973a97d2762dad1fa61b24d79d6d32
- b5871097e289f5be787fded5ea629570f0684b1efe32a1566e4a6693fb637553
- 5eb2dfe39f3e70ec7c01954aeb20f7b53198fc4eb3aebd7126b65ab2de21a746
- 220cbe986b7a3439ccde0c91cab0bc65825e67c3ce68ccd04b431269c7c52388
- 8303cd05a04e834a5631aa4a1a0051b3a11096d3807c52971e0add006a72e3c6
- b4f91f49f7cde8ddff1f74cc36f9ad8b30926491a56a8de7940e02ec9bc675d5
- 39a5f4206ac60f7e6630e12876b2fa52434cfd4ab5d02b369cd70b00941f9e8f
- 8e837e4cb6267122e9355dfd8618b022d23ba7ad87b43464f5ddec46e9206fe0
- 8a0e992485cca6fc6be1603183ef1fccdb665eb969e237d3fc44a4237c83dbe2
- fbb368d55c20718fb46e0e6deea6f864e94f193c38284a8be9021e337a2ca640
- 57626218bce0c5c9a276deb97a3584e0f52e900ee63437e000521b83b9866af3
- ba46cafb74b2623fb94f2b00131f10ccefbdbaeea726e30401c5a376a5a39651
- 7607b1c01e5501a6dca85fdc8bd446f032061b3558e5c444cd4d7708747a144a
- 82f5ace59f6a6dd4be5a7ded32824570b370bfa1c49b33fcc3ddc6df6743010a
- 39144978bab8bed7b5864fb34d363199808bb89b1911c5cbcf138eda404c7963
- 9084b0e8304ce3a928d7cb7fc1b9f81a6c616897226c9fc59ecc960e492db138
- f7a6908d9c6663cd2408e3aef10e56f17f67a42c27a0e6c6b958d0350518403e
- a8e14cfb1df640ed8b208ef7d248f8c2176366482dae5101c824a55345868898
- 8846ba5a0830efe74dc12bc3bf3958bab5cf1d0251f9aba6ac8e724e01810117
- 535971f39916ed2af240b8da57eaadf5af46511126a587952037246fe805e993
- 41556a24e9e1194a5cf3582c3b974f69fbeb25a941ebc475e1f9fc51916c6bc8
- 7402abdb4b3c3f630a18e80b6efed8876db75e1e4331046cc4b1add22081d509
- 6f1967bd843ca570ebb1435d05d00513cd986ad04087a3dfd983092705288721
- c413239b280a880b145c29c7814c50f639af03d4a11ab94cc25702343c51bd14
- 35bb77d45db0a02583ab11dfa74acfc789f16ed9dce7bec11bd828608208ed9f
- b7c4a9b870a79a4a382c487fed97c661f9edc7e598f27df6c8809040b2b5abd1
- 70328aa8633d13a9aacf90cb2e17617e5d6b8ceba372713c504cd8261f44e7ab
- be58bb5808e6386e8bf25f38dad14a51e1440a3bf1a89b38a85809cf9052c835
- 09a35199c0a8079bf24507b5b1a5c558e17c1eeff6c035d7636971482cc993d9
- 5816972cada943cddc914db7e832aabcd97fb6961880bca1e8d4871ac7f9f526
- 3982e8e2c224680f3ae95ecb8d5f7d957a37b9115a39bbbe97d454d26bdb2aa0
- 81d03d3ecad1c0005d3795ce6652d973533a2e56815c8d4593d649135aafd13d
- f16305eeae711feb0c0d76836e9b28210b0597b932e0edab1319f42102b939b3
- f717ec91dc95fb6e25f15acc93f4d124f9258886c8831ddfdb487d7fc52cb987
- d9a32a3d6b9646186952462566e1368d04c49b871a890740857495a34a301197
- 262e7529383e810dcc4b49af1707897748ed24ba12d7689922e6ee66c44c8375
- 84ffd5b152770a1362e554ed575cd7f5391ef8a10b35af530058b4b6b46d7c22
- 92582a14515b769cf1b5ad8b807adab30c4b1348855e052f2a447d4fdafaa120
- 24e12ccf89acb20957b04e4a15fb2bd368c26ab5f3b478c8c88f1765cf1ec27f
- 5ec55d5981de909c8d9471a6a4f5340cb9787b01af9ed59c70b552af3c80eaf4
- 8c4b06a81f1246c7bb0f6331f05b9a37fe713bcfaa012501f505a5a743166a26
- b72e8b8ac67f59b3a560413f5d6cef1e973e115678908886fb276208b661fe3a
- 5a5b58aa834c1dbabae3597299cf52365c2590f4cfc05b6abc1aa689531b88f1
- 9cf7dfa02ab39112c6a377e1d5b3156505c4cf90611cf30c1a8db2013d9defac
- 7bacc65735391279dbd7b7180d565290f2b3ecb7c3d9c7dbf38b32f3a0bd38ca
- 2c14b05b202a548004e062baf185fbae399867459a8063c7bd0397d1e0a6db89
- 0c31999d283421ca4cedcaebb26ba52ff44bc975fce46b75fce72b5b9c3754a8
- 85220a71f2e1b0395e77aa92e7cd148c5bf5226f6eff894cc82bff2520e58c9d
- ae7e17818a9620745f0553ad1b789bd5c7f88b3d6b1e74a75d6c7b20ddf56f34
- 33054b2fa38145e74c2e76e25ac53747dec4e61186dbc7cd64786a3b501f6363
- cd0284bb1ea4c43114a1cba19a1e619f7602e16e2df6d4549ec352d649f18023
- 2e86b7b68afbf7e03e6c07fd154ace1c72ba4a5927661a3bbc0e9494f3c89430
- 7dfeb205b5539272ce1354bd09dd65328c83542132713b032390b197dfe3017c
- 79299c4a8797e2469bcd0035f269c0c493b2bca83c5d5993abd1aa422c9a3933
- 1af806387b328b82ebc289c617b4f006802f56fa7bb6e25bbdd92ee2ea003f53
- 70a1bcdb1b69e465d38091f46f49d9143c2c1e39d8aead6896160eb3f7776b94
- 3a28b1b5a3f3d4ba7211611fb6bb894ba4dd25897553d13f105445817442690f
- 07016e174009a12f3002d4278675341a621f468075f433563d7afb9cdacee85b
- 57eadaaa2db01bde680081274922f1169c84d214bde2ad1aa242c7e617ff09dc
- 70f5c3d47eaf1e0d4c268ddbda3bd2cc79d97796f13d461f15f43615839c8bc8
- b002b5227ff3406a7ee6a6caed4aa6b24d8c9ade5b22df73066c4ee4a6c7cf66
- 45ec20bdb561f2bf0c17c614a2aa9cff11c4f2157f36872142dcc79bf3291b18
- 58b96ce10f240c1d2f65fde6b2a8eb7e47c7295c9d454173e1a3b6c76b8248a1
- dcabf1ced78f5b4d01c05e4867144501aad4900537b13db293f961c23a7ba2ba
- 3d85c89477997e6d401c7a76103caa99565996c7ba30d8939e765e730cf07cd8
- f4009f44ee0e70b44356663ed5eb81ac6618a84e0f531f2d1f71b15e76addd2c
- c7a49fa32d668532e5d7d3f5fca443efd934006f35d5f5d190705a2bb9dc304b
- 176ce996cf7f0f41fb363e7e4b62abbc768b2dd840c49d538cfc9fe258a2522f
- 5fc7161afdb024016e4ccb563be01bc232144ff1a4e8e7c81209b8bd5478cd70
- da9d9a5f96d7de9a427bee236f9ef169adb796eecd8fbf028e33f53c4606b2d8
- 85cac5e292d399e89994bca8b51ef1771fc30cefeaf88791326d83ec2049dfe9
- 4667328927408331843e26358581c04f899895a996bd7047c844f5d10bb0c299
- da130582dc360c730725dba402cbc18419387216f005d6ae72a879d713217761
- ba0b6334da455e61986cabf7abf7a5fdc26483a9b1e34a5c5c138230ded8e50f
- df8e3838cb39673b96183f71c1b0cd777ba82a97e543e81d9d7ad09c9e7abfb8
- b38c9a5cc7535ba3a4975f4c30a4c85eb763ee2df6eaf5f416554fd609eada60
- c98bafa73207b0f18168ac5fab3fda51c56a7f163388fd332797a2ff7e7ff6fe
- 952c56e2f99a4342b418fdec8034a814e60f215f5939813526bde8bfab39604c
- 2c331935e10df11a8f1af3ababaa0921bfe235ad8305ccb7c7d4ff4d531420f1
- f26690f2e82a73a9eba42aa346f996ffc6f0b873dcdba3f3a0b641e0654013e9
- 40ff7dfa852a7d36ae6dfe6897549c780755e1a465a1c29089b36051e0c11adb
- 99c4516b5b9b20b42f1f3d9bc1790d19ac7b145a5690bc7d10f8d4ea93b43318
- 81a8db799f83ce86ed905cdfc79a39528cdfb0cd3a20527e9e36a99d840e8335
- 631fb77e08e20fce384301b0c346352f647f41a53dda07cd7b3743afb6e36e43
- 27f614b359eb8102336a33760dd3c6797ef305c9ef10791b95e4e47c90f10d2d
- e6604a15ecdaead766fd02bd274c61a615fe9c286ab7bba160c8d0b135abf6c2
- 4ee571a1ddf9caad87d70833e3e43d2f1a3f3e69f9c261c5ee39414abc357e9f
- 9ddb12ffd6f825d51564444bb576967bf2008730e24cf2288ecfab7c18e7f895
- 01aeacb6afe389a48bd399d572761672460f4a4d1ebd5bd6c9e44d3d7504fb0f
- 617c5d38481eaa8c1d9fcb1cb0372be0f493f79bcb265707dc57f10f9dc01a13
- 4f57834e3647863516a517f35d825b9778bbc072e47a91aebb10a5d94701427b"
+checksum="d36df7a481a96ab6ac74ba4cc33e0ee72e91caa2bfe55b97a17d9794d2a3c4e8
+ 21d502f5e1d25ee0ea4b3709afc7e9575f629cd15737e21aed19c1f148fd57d1
+ ee8d0193cfd2ed426044352d957026e91f31d6c1de680080e6d27ae08cf70ec1
+ dca830694cccbecd46e74950d14fa46c3f43614551fb7f75e3b537275a9d50fa
+ 2b84cea51df01c5959d1b1012f3ac2e411b9da26b2264b18b59553a814f3ef8e
+ 4fe334dce9241ad92b93e09c66124d42841a1e724e359cbb0c50e6000f2f9fc5
+ 8b895a7879c8bb652ff56e390e0da4889a4774f30f1976f11b13afe8e7a72994
+ 6a6a2cc943c146a98180ed5e862a2c279a08702f89d4074beec01a64f55b98a1
+ 06144c4d43188e20d3325c2799a61b87808b587dc0136ac817d890a0cd91bf25
+ 0f3d153bde7f1a6afb2a598fe98e95c41f5d14f78191db7b353220557e40e5d5
+ a3ff7e5536d4ff85b06ca4f8ffacee45cf1ba73c0662593a14bac544139cc3f9
+ 85be7ecde1bfeea1f1f477f2b808de51c74f01d2228966f31e60abe06279049e
+ 156747a491aaf8744bd37a085a5b3959d1c00a4edac14ed859690cf980aae709
+ bd31e4c6331cc249f114eb9ef7a454d99482fb05c0f0f0e8d4507948d7c113b5
+ 0373f78a7bbe79d849c11bec495893c5e99f40c20d3b674acb9704126cd49741
+ f6c3f8edc69a07692a8fba5ad37a04e46f246bb9e2f085da5a97caa024d19828
+ ca9c9f07abd3feec4dc6cd375f3a2c8841ee19bd69585c6d70ad950c18879adc
+ 3626081b50619d66cb88e14eaf71caa97a2b48d79f69cac3a5bb919633f87d04
+ b0a4b03cb247c8f0c87c9dee819cc47ff6ced32cb3c89773233a08963975ea36
+ 6ae2fdf3c67a676112befb69b0c66709f2acadfeb1d7696315e331cd61dc96bf
+ 998bd6ee63d6388c0631524992d7c4d050f8f005d37b0c593e531bfaf6a4a2d1
+ 3729bcd73ccc966f0d73f7e32aadb2bfbb9559466c69550602bedad2a78bf500
+ 06acc903cfbb6b7f683ae738b733972e451ab6a14b28f7975c2884ae59701ec4
+ b1938f51754971be1fa5fcccccdfcba6fa63a845746e47f666efd050042141c1
+ 57400cd4597926629ab8f22e5f4722e0234f5727441906708786bbe6843fbf22
+ fd42ffc5e14bd3526d8fea876a1e18df379e5f75c1f10368641dee1d6eebbb23
+ cc351cb54675a908b20226b13354e189b6a3fc38a5c039116b1f2258af0f479f
+ df0794bb5b2e78aec73ecdc779458e9a86f756b5e2f37acec6e227543dc1b3d0
+ c750bac67017e0784cf58fb06e92e2bc52688a16a3773825a1a6e0df84ef233a
+ a4a11e68fcd10aadd62b0cb10533ffd43a1c98a3e1db535e119cac0df5613f3a
+ d489aeb8ca63f97778fa309d43529838349918414188dce598d29b20c59da533
+ 438efaaae1867ab1b37fe23283c2bfe666d73288c76f482f339bcdf27a4eb7dd
+ d52e1c96fa56d3bd8f152bb4b2e9c9a9e2edc2c4fad81869b1962b06ebb4c283
+ 9f442e9e8c819791cb78fe655c53129b9a5d0b8090079ab74b45b7f7d1515a5b
+ 8a17ed68d41be60e18ecbe2becff41912305e7fb86384b7d1fc89dd767fa21d5
+ 891591bcde2190b87be25d5d57777608b8f8cea06d58c8a60d09d18809b42856
+ 9e57d9348c392adfbb14debfc3aa474116007241109ca421a369ef5865cca480
+ ea9bf771e9e792a2a1723093c3f3d522681f638c5dc30c0dae6dde0a68648961
+ bf9e2e72dfcdb609064a0c0f503001f270257045b3f0b455470bccfbab0476b9
+ 0f4f2eea09738aea94c0afec45f0bec34dbae9c4bd922634c82735d3a703f292
+ bc228183f6e3c563ade71fd4c64784aa0c0a0e5e108ac04c055e9bcd9836bb86
+ 95c0605bffcef0d327830fa14aea895d54b4c18cc38122e49ce115c9a7afb47f
+ ee2753898e65d344ad7bc9642ec0a2e05a7880ebee03112c1190cd001c15b4b9
+ 9a14eae682acd9044b4227adf33ec1d2e0e4ecad75791fecfd355871d27eb047
+ 60db4ea466aa513ca24c4051f0c048bd09e6feb0935b7789cbe4331ad4888cdc
+ 9f75ea79337d72287bf6738fb62f6f5abb0bd67e306c331ae1feb412ec160482
+ 8a8e4d03059b5bd2ed73870e89f31b20b6ef4d644487d2e048eb422f59a3649b
+ 26e0a1db066ec73688d607243f90c98b77806cd67bee504345f6de1e24915f4c
+ 7c274bc5c13c6e0b7b2e6674f1e2af791b81eceb0bd722ef5a80e921a97bd903
+ a34e84cd85b434885ba7b7b5824b293d8a8a9f23cceb23f79a802236eb6dde1e
+ 9aaf343698c7666394b393154ffcf248d87d226fe577e5563afd2de602249c2f
+ fef917c385f92ac3dc95aff1d2e9f78eb7afe9d74895c87a7051d770ac887987
+ 11729bfef6adcea46e77b1c96dc2b40d3989ffa36ba65f3782f9453f5533b2ae
+ 177164301e02565efb226aa525e5b5b2bfd7cd904f5456e15350284f31f3f223
+ 45310e7db684e38f404fc4b805e39bbe7a5bae4028beab38311e6aaf2a31fe2b
+ 5a25567e3c83bc7a57d16df9f5f669fb1b4e90f5bf1c483280cac6a00e86537c
+ ce1295de439ca8476195ac7c4041608669705943c60e883f678a20f0cb7f58e6
+ 075b9a3867ddee26ad61441939b4d431329b9605bb86125b29e719e81a0a2c68
+ aabf6cef613b20f1fdecd91fcc347275a7c1bc0ef1d18e55e5a245bf6735818e
+ 4afde707b110688d130a865969a5ebd78cc7876f74ac151624705fd9f3a8e275
+ 3f11b5ea15424f75544378a913eff10f2f9802610541aa24dca72ee2503ef35d
+ d0cb5f452064685162686ba49a7b4f5ec6998c726d415c72f178b2db4ef523e3
+ 917fe99ea4ce119c418d52d071e6662c8cb9c6190939111142a1daabc4091fd0
+ 8eafb1a687d8b8072c6caec83f9ca80d03699f0a182629c2087fe77c2f354fd2
+ dcd54b26247e4563d675c612ca7c471fd2588fe9beda9c077695a2f5a673cdde
+ 93e71b7dd69dec0d992829ecd7362369a8a2c6070900d93879693d4ea5a1ef32
+ 5ba8d4c71ff5b915e20d9d5eab5f57d2daf971cf1b3f0b12dc2fd25755bf6303
+ 6b6a82733fec2611d62fafc00dd3de8bc7f7018a8ea9c1f1f7f8d11b599e2a23
+ a7cb00209f94b3cb18db773f6d7ab568c416c3604b2d109135b9521f89e2371c
+ 0f14e9cee9d13549d418bde6fb20c2827297e673bea582ac1cf085b8d763861e
+ 897f391a66e95dc41f52c480a162239f76bac3cf7209152e7e610a19facee29f
+ 6a5fdeefc438825d60ad5f8ff14615de43c4a332f01c275e9c2a4a66dd5a4fdb
+ e1ea24d2cfa6fc4b490ac81755920b9b8f6f481666d56a66be6fde2539b2080d
+ fcf415b511a74d57b1cfa92a22eabd5e3bc30f42642c754e07c429b8caffc714
+ 38021f594397a1078fb5be7d584a15dae70f9663681f6f33ef9d14f2a3b91d93
+ 32d56004e40dc59240060f0eb84bb761a67f4545d73856775eac41c79c25fdec
+ 0bac15f959317aab370995793e585b331b181536b5b40cfcf59100b81a086f38
+ 54ec4111d38fd2c4ce4dbfbb86a4517466102d1fd871f6f4f73e4f8cf59a998e
+ 353fb938fd4641fd65b10cf54d9f40f703cec74a3d5316126478903eec3f9435
+ c43a49feff2ffe483599e286631a2f3bbad61fe90182b8d0acd5468115590971
+ f9ebe4290302e434ac774cf21bd5397d438c9e6478b778bd2b2c2bd5f95c3399
+ 19a21659c6fb216e5d594ca35f62453de7ceaf88408a52444b40f8dc23d64f17
+ 1294a7fdf7e36a3abb2b89222e97d4aaa6dcc2b36bff5319843a64122c692160
+ d9f184a76008b8d2be832086b1f53baea3eff988993fd683c5cb2bcd1d240f4f
+ c38edc9bfb0ac02bf4972811f50baa3cb237c1e7d626237b8c7c08d520e1246d
+ afce22b71757920587de3ff5a5c12fe3dd7b53daf9110ffde6c09c69545edd0e
+ fb754a736658035849341f2d01d1f48bb06b09c7f1ee9e6749e0580c7c9cb903
+ 30c5079f9c514b7b9e8bc44fd67bd44e4a5b42457c9c76a2ca606a8bf5d62bde
+ abf2d8a5d2c8736ffbede3844101a3bd9ea977a0dbca091c2b87871e3bbe96c3
+ 7fd38252dd62fe45a732dd322e920ab90533d533f947322db80c48773262a827
+ 01db872a78484ee2ed53060810ab46927572d4af92c727b0e03e5337ad2a6fa5
+ 944cd12f408e49e0fd4bb79205f9ce9ee007b64d923a3c1d83c1e0cc7f494621
+ 6bf5b9d2f30ded74ebdf32933148fe7a478cffff9353379b72f0482ea0991f10
+ 1da211f718c88aa8252be97c7a5703d54e9c65599a24121d80853174e9e7dd60
+ f2fdd09021e69566d750e34404866235f0f395ead48b36db35738192de557ad0
+ da39e10a5598ab69b756872efcaad594fe52dda0e533e7a0d56ad1cdc8859a43"
From 1a15e23c9ceaacc5b8f55a22d0a8bda6ce777de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 9 May 2023 22:52:39 +0700
Subject: [PATCH 42/94] nss: update to 3.89.1.
---
srcpkgs/nss/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 9faceae76235..6fda2a8425eb 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
_nsprver=4.35
pkgname=nss
-version=3.89
+version=3.89.1
revision=1
hostmakedepends="perl which"
makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5
+checksum=3adaedb9e70c3c5f40603bf60a01e336190a6dbe01929d395f16b01fe84a0156
export NS_USE_GCC=1
export LIBRUNPATH=
From 6ea7f120c276af08aff8d38f2443e957f06142d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 10 May 2023 08:51:03 +0700
Subject: [PATCH 43/94] qytdl: force using yt_dlp
Fix #43814
---
srcpkgs/qytdl/patches/force-yt-dlp.patch | 67 ++++++++++++++++++++++++
srcpkgs/qytdl/template | 3 +-
2 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/qytdl/patches/force-yt-dlp.patch
diff --git a/srcpkgs/qytdl/patches/force-yt-dlp.patch b/srcpkgs/qytdl/patches/force-yt-dlp.patch
new file mode 100644
index 000000000000..de37c69c2a07
--- /dev/null
+++ b/srcpkgs/qytdl/patches/force-yt-dlp.patch
@@ -0,0 +1,67 @@
+--- a/src/config.py
++++ b/src/config.py
+@@ -11,7 +11,7 @@ def default_opts():
+ "profile" : "auto",
+ "fallback" : ["auto"],
+ "duplicates" : "false",
+- "module" : "youtube_dl",
++ "module" : "yt_dlp",
+ "playlistFolder" : "true",
+ "theme" : "default",
+ }
+@@ -64,7 +64,7 @@ def write_config( opts ):
+ "download_path" : opts.get( "downloadPath", userPath ),
+ "\n# Which system installation (module) used to download": None,
+ "# (youtube_dl, yt_dlp, etc.)" : None,
+- "module" : opts.get( "module", "youtube_dl" ),
++ "module" : "yt_dlp",
+ "\n# Allow duplicate URLs into queue (true/false)" : None,
+ "allow_duplicates" : opts.get( "duplicates", "false" ),
+ "\n# Each playlist gets its own subdirectory (true/false)" : None,
+@@ -125,7 +125,7 @@ def read_options( opts ):
+ ## Default section
+ section = cfg[ "DEFAULT" ]
+ opts[ "downloadPath" ] = section.get( "download_path", userPath )
+- opts[ "module" ] = section.get( "module", "youtube_dl" )
++ opts[ "module" ] = "yt_dlp"
+ opts[ "duplicates" ] = section.get( "allow_duplicates", "false" )
+ opts[ "playlistFolder" ] = section.get( "playlist_folder", "true" )
+
+--- a/src/main_widget.py
++++ b/src/main_widget.py
+@@ -330,9 +330,9 @@ class MainWidget( QWidget ):
+ print( "Module:\t%s" % opts[ "module" ] )
+
+ except ImportError:
+- ydl_module = youtube_dl
++ ydl_module = yt_dlp
+ if self.debug:
+- print( "Module:\tyoutube_dl")
++ print( "Module:\tyt_dlp")
+
+ ydl_opts = self.ydl_opts( profile )
+
+@@ -539,9 +539,9 @@ class MainWidget( QWidget ):
+
+ ## Just grab this here for convenience's sake
+ if not self.debug:
+- ydl = youtube_dl.YoutubeDL( { "quiet" : True } )
++ ydl = yt_dlp.YoutubeDL( { "quiet" : True } )
+ else:
+- ydl = youtube_dl.YoutubeDL()
++ ydl = yt_dlp.YoutubeDL()
+
+ for url in urls:
+
+--- a/src/util.py
++++ b/src/util.py
+@@ -1,7 +1,7 @@
+ from __future__ import unicode_literals
+ import sys, os
+-import youtube_dl
+-from youtube_dl.utils import DownloadError
++import yt_dlp
++from yt_dlp.utils import DownloadError
+
+ #### RE-ENABLE if you want to enable possible internal YDL
+ #import internal_ydl
diff --git a/srcpkgs/qytdl/template b/srcpkgs/qytdl/template
index 66013cab1b2d..1bbccb582c23 100644
--- a/srcpkgs/qytdl/template
+++ b/srcpkgs/qytdl/template
@@ -1,8 +1,7 @@
# Template file for 'qytdl'
pkgname=qytdl
version=1.6
-revision=1
-build_style=gnu-makefile
+revision=2
pycompile_dirs="usr/share/qytdl/src"
depends="desktop-file-utils python3-PyQt5 yt-dlp"
short_desc="Simple Qt (PyQt5) frontend to Youtube-DL"
From fe707fb2ae2f4a48b768e00ae1e877e36c147e54 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 10 May 2023 00:54:46 +0530
Subject: [PATCH 44/94] d2: update to 0.4.2.
---
srcpkgs/d2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 49762caa3d12..a9417fefa503 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,6 +1,6 @@
# Template file for 'd2'
pkgname=d2
-version=0.4.1
+version=0.4.2
revision=1
build_style=go
go_import_path="oss.terrastruct.com/d2"
@@ -11,4 +11,4 @@ license="MPL-2.0"
homepage="https://d2lang.com/"
changelog="https://d2lang.com/releases/intro/"
distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
-checksum=abfc926a7dbb090c73012c8bf37558a8ae49d5c6045211b50a3386d8cd60b8dd
+checksum=5a7fb24f2116ff63f7350c60933134a80d93f0e4f298f7d2b654e2e3ee58378a
From ea4fae14db47ea4583eec4acb842f17e98467639 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 9 May 2023 19:38:20 +0200
Subject: [PATCH 45/94] perl: update to 5.36.1.
---
srcpkgs/perl/patches/multiplicity.patch | 39 -------------------------
srcpkgs/perl/template | 15 +++++-----
2 files changed, 8 insertions(+), 46 deletions(-)
delete mode 100644 srcpkgs/perl/patches/multiplicity.patch
diff --git a/srcpkgs/perl/patches/multiplicity.patch b/srcpkgs/perl/patches/multiplicity.patch
deleted file mode 100644
index 976f9d388047..000000000000
--- a/srcpkgs/perl/patches/multiplicity.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a31a5cddd6c52fd21976b9cbff303b966c4a3122 Mon Sep 17 00:00:00 2001
-From: Alex Suykov <alex.suykov@gmail.com>
-Date: Tue, 7 Jun 2022 17:50:03 +0300
-Subject: [PATCH] enable multiplicity whenever ithreads are enabled
-
----
- cnf/configure_misc.sh | 1 -
- cnf/configure_thrd.sh | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cnf/configure_misc.sh b/cnf/configure_misc.sh
-index 77d73b4..33b1834 100644
---- a/cnf/configure_misc.sh
-+++ b/cnf/configure_misc.sh
-@@ -62,7 +62,6 @@ define usekernprocpathname 'undef'
- define uselongdouble 'undef'
- define usemallocwrap 'define'
- define usemorebits 'undef'
--define usemultiplicity 'undef'
- define usemymalloc 'n'
- define usenamedanoncv 'undef'
- define usenm 'false'
-diff --git a/cnf/configure_thrd.sh b/cnf/configure_thrd.sh
-index 6e63b68..8874a1d 100644
---- a/cnf/configure_thrd.sh
-+++ b/cnf/configure_thrd.sh
-@@ -14,9 +14,12 @@ if [ "$usethreads" = 'define' ]; then
- define use5005threads 'undef'
- result 'yes, ithreads'
- fi
-+
-+ define usemultiplicity "$useithreads"
- else
- define useithreads 'undef'
- define use5005threads 'undef'
-+ define usemultiplicity 'undef'
- result 'no'
- msg "Disabling thread-related stuff"
- fi
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 3f897f995e7b..d507855d3d1f 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
# Template file for 'perl'
pkgname=perl
-version=5.36.0
+version=5.36.1
revision=1
-_perl_cross_version=1.4
+_perl_cross_version=1.4.1
build_style=gnu-configure
hostmakedepends="less"
makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,13 +14,14 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://www.perl.org"
distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="e26085af8ac396f62add8a533c3a0ea8c8497d836f0689347ac5abd7b7a4e00a
- be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91"
+checksum="68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1
+ 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca"
skip_extraction=perl-cross-${_perl_cross_version}.tar.gz
-# Before updating this package to a new major version, run ${FILESDIR}/provides.pl
-# against ${wrksrc} to find the list of built in packages.
+# Before updating this package to a new major version, run
+# ${FILESDIR}/update-perl-provides.pl ${wrksrc} perl/template
+# to find the list of built in packages.
provides="perl-Archive-Tar-2.40_1
perl-Attribute-Handlers-1.02_1
@@ -76,7 +77,7 @@ provides="perl-Archive-Tar-2.40_1
perl-Math-BigRat-0.2621_1
perl-Math-Complex-1.59.02_1
perl-Memoize-1.03.01_1
- perl-Module-CoreList-5.20220520_1
+ perl-Module-CoreList-5.20230423_1
perl-Module-Load-0.36_1
perl-Module-Load-Conditional-0.74_1
perl-Module-Loaded-0.08_1
From 37848defa04539e12c4a6174329ae0f2605c3996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 10 May 2023 20:17:26 +0700
Subject: [PATCH 46/94] common: wrap gphoto2 config
---
common/hooks/pre-configure/02-script-wrapper.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index 641d7ab762c0..beaec6ee8af2 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -207,6 +207,8 @@ hook() {
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
+ generic_wrapper gphoto2-config
+ generic_wrapper gphoto2-port-config
generic_wrapper imlib2-config
generic_wrapper libmikmod-config
generic_wrapper pcre-config
From d20bf8846d6d054b3ab795ef912b7f41a65b9209 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 10 May 2023 00:13:11 +0300
Subject: [PATCH 47/94] xz: update to 5.4.3.
---
srcpkgs/xz/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template
index 03c0ec8b92e6..4aa4813663d1 100644
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@@ -1,6 +1,6 @@
# Template file for 'xz'
pkgname=xz
-version=5.4.2
+version=5.4.3
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -11,7 +11,7 @@ license="Public Domain, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://tukaani.org/xz"
changelog="https://git.tukaani.org/?p=xz.git;a=blob_plain;f=NEWS"
distfiles="https://tukaani.org/xz/xz-${version}.tar.bz2"
-checksum=aa49909cbd9028c4666a35fa4975f9a6203ed98154fbb8223ee43ef9ceee97c3
+checksum=9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90
liblzma_package() {
short_desc="XZ-format compression library"
From a4da32f27b126f38f58d653e50d3c5340153173d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 10 May 2023 00:59:55 +0530
Subject: [PATCH 48/94] strace: update to 6.3.
---
srcpkgs/strace/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 0e2cea0454ba..7dcdfd098fc6 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,6 +1,6 @@
# Template file for 'strace'
pkgname=strace
-version=6.2
+version=6.3
revision=1
build_style=gnu-configure
configure_args="--enable-silent-rules $(vopt_with libunwind)"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
homepage="https://strace.io/"
changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8
+checksum=e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731
build_options="static libunwind"
build_options_default="libunwind"
From 57fdee0de8d5d979264869bfd3b0ced1c5fa15f5 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 28 Jan 2023 16:28:00 +0530
Subject: [PATCH 49/94] lsof: update to 4.98.0
---
.../fix-github-ci.patch} | 8 +-
srcpkgs/lsof/patches/fix-epoll-test.patch | 86 +++++++++++++++++++
srcpkgs/lsof/template | 49 ++++-------
3 files changed, 103 insertions(+), 40 deletions(-)
rename srcpkgs/lsof/{patches/fix-tests.patch => files/fix-github-ci.patch} (51%)
create mode 100644 srcpkgs/lsof/patches/fix-epoll-test.patch
diff --git a/srcpkgs/lsof/patches/fix-tests.patch b/srcpkgs/lsof/files/fix-github-ci.patch
similarity index 51%
rename from srcpkgs/lsof/patches/fix-tests.patch
rename to srcpkgs/lsof/files/fix-github-ci.patch
index bd9fa284d19a..05582cf65492 100644
--- a/srcpkgs/lsof/patches/fix-tests.patch
+++ b/srcpkgs/lsof/files/fix-github-ci.patch
@@ -1,11 +1,8 @@
-This patch eliminates the need to modify /etc/hosts
+gethostbyaddr() fails on the hostname of GitHub CI containers
--- a/tests/LTsock.c
+++ b/tests/LTsock.c
-@@ -255,10 +255,7 @@ main(argc, argv)
- * Get the host name and its IP address. Convert the IP address to dotted
- * ASCII form.
- */
+@@ -262,6 +262,3 @@
- if (gethostname(hnm, sizeof(hnm) - 1)) {
- cem = "ERROR!!! can't get this host's name";
- goto print_errno;
@@ -13,4 +10,3 @@ This patch eliminates the need to modify /etc/hosts
+ strncpy(hnm, "localhost", sizeof(hnm) - 1);
hnm[sizeof(hnm) - 1] = '\0';
if (!(hp = gethostbyname(hnm))) {
- (void) snprintf(buf, bufl - 1, "ERROR!!! can't get IP address for %s",
diff --git a/srcpkgs/lsof/patches/fix-epoll-test.patch b/srcpkgs/lsof/patches/fix-epoll-test.patch
new file mode 100644
index 000000000000..64087d99173d
--- /dev/null
+++ b/srcpkgs/lsof/patches/fix-epoll-test.patch
@@ -0,0 +1,86 @@
+This patch has been upstreamed already, and should be
+unnecessary in the next release.
+
+https://github.com/lsof-org/lsof/commit/5ca335ff9ae6510cba0a94a62fbaa46709f7cb16
+--- a/dialects/linux/tests/case-20-epoll.bash
++++ b/dialects/linux/tests/case-20-epoll.bash
+@@ -8,9 +8,9 @@
+ fi
+
+ $TARGET 2>> $report | {
+- read pid epfd
+- if [[ -z "$pid" || -z "$epfd" ]]; then
+- echo "unexpected output form target ( $TARGET )" >> $report
++ read pid epfd evp0 evp1
++ if [[ -z "$pid" || -z "$epfd" || -z "$evp0" || -z "$evp1" ]]; then
++ echo "unexpected output from target ( $TARGET )" >> $report
+ exit 1
+ fi
+ if ! [ -e "/proc/$pid" ]; then
+@@ -25,7 +25,7 @@
+ echo done
+ } >> $report
+ if $lsof -p $pid -a -d $epfd |
+- grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:5,6\]"; then
++ grep -q "epoll *[0-9]* *.* *${epfd}u *a_inode *[0-9]*,[0-9]* *[0-9]* *[0-9]* *\[eventpoll:${evp0},${evp1}\]"; then
+ kill $pid
+ exit 0
+ else
+--- a/dialects/linux/tests/epoll.c
++++ b/dialects/linux/tests/epoll.c
+@@ -14,42 +14,42 @@
+ return 1;
+ }
+
+- struct epoll_event ev;
+- int fd[2];
+- if (pipe(fd) < 0)
+- if (fd < 0)
++ int pipefd[2];
++ if (pipe(pipefd) < 0)
+ {
+ perror ("pipe");
+ return 1;
+ }
+- if (dup2(fd[0], 5) < 0)
++ int evfd[2];
++ if ((evfd[0] = dup(pipefd[0])) < 0)
+ {
+- perror ("dup2(fd[0], 5)");
++ perror ("dup(pipefd[0])");
+ return 1;
+ }
+- if (dup2(fd[1], 6) < 0)
++ if ((evfd[1] = dup(pipefd[1])) < 0)
+ {
+- perror ("dup2(fd[1], 6)");
++ perror ("dup(pipefd[1])");
+ return 1;
+ }
+
++ struct epoll_event ev;
+ ev.events = EPOLLOUT;
+- ev.data.fd = 6;
++ ev.data.fd = evfd[1];
+ if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+ {
+- perror ("epoll_ctl<6>");
++ perror ("epoll_ctl<evfd[1]>");
+ return 1;
+ }
+
+ ev.events = EPOLLIN;
+- ev.data.fd = 5;
++ ev.data.fd = evfd[0];
+ if (epoll_ctl (epfd, EPOLL_CTL_ADD, ev.data.fd, &ev) < 0)
+ {
+- perror ("epoll_ctl<5>");
++ perror ("epoll_ctl<evfd[0]>");
+ return 1;
+ }
+
+- printf ("%d %d\n", getpid(), epfd);
++ printf ("%d %d %d %d\n", getpid(), epfd, evfd[0], evfd[1]);
+ fflush (stdout);
+ pause ();
+ return 0;
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 4dcfdb240e43..21a623dad947 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -1,48 +1,29 @@
# Template file for 'lsof'
pkgname=lsof
-version=4.96.3
+version=4.98.0
revision=1
-build_style=configure
-configure_script="./Configure"
-configure_args="-n linux"
-make_check_target="all"
-make_check_args="-C tests"
-hostmakedepends="perl groff"
+build_style=gnu-configure
+configure_args="--enable-security"
+hostmakedepends=groff
+checkdepends="util-linux procps-ng"
short_desc="LiSt Open Files"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="custom:lsof"
homepage="https://github.com/lsof-org/lsof"
changelog="https://raw.githubusercontent.com/lsof-org/lsof/master/00DIST"
-distfiles="https://github.com/lsof-org/lsof/archive/refs/tags/${version}/${version}.tar.gz"
-checksum=2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c
+distfiles="https://github.com/lsof-org/lsof/releases/download/${version}/lsof-${version}.tar.gz"
+checksum=2f8efa62cdf8715348b8f76bf32abf59f109a1441df35c686d23dccdeed34d99
post_extract() {
- # See: https://github.com/lsof-org/lsof/issues/61
- # The TestDB was meant for storing known-good configurations, and
- # skipping tests if the current system configuration exists in the
- # TestDB. But we don't want that.
- rm tests/CkTestDB
- ln -s /bin/true tests/CkTestDB
-}
-
-pre_configure() {
- export LSOF_CC="$CC"
- export LSOF_CFGF="$CFLAGS"
- export LSOF_CFGL="$LDFLAGS"
- export LSOF_INCLUDE="${XBPS_CROSS_BASE}/usr/include"
- export LSOF_MAKE="$(command -v make)"
+ # Fix GitHub CI quirks
+ if [ $XBPS_BUILD_ENVIRONMENT = void-packages-ci ]; then
+ patch -Np1 <"$FILESDIR/fix-github-ci.patch"
+ fi
- vsed "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
- -i dialects/linux/machine.h
-
- soelim Lsof.8 | grep -vi '^\.lf ' > lsof.8
+ # Ensure tests always run
+ ln -sf /bin/true tests/CkTestDB
}
-do_install() {
- vbin lsof
- vman lsof.8
-
- # extract license from readme
- sed -n 00README -e '/^License/,/\*\/$/p' > License
- vlicense License
+post_install() {
+ vlicense COPYING
}
From 735753b18fcab030b781c088f4e2c449af2d7935 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sun, 7 May 2023 22:51:55 -0500
Subject: [PATCH 50/94] X.org fonts: updated fonts and adjusted source URLs
---
srcpkgs/font-adobe-100dpi/template | 8 ++++----
srcpkgs/font-adobe-75dpi/template | 8 ++++----
srcpkgs/font-adobe-utopia-100dpi/template | 8 ++++----
srcpkgs/font-adobe-utopia-75dpi/template | 8 ++++----
srcpkgs/font-adobe-utopia-type1/template | 8 ++++----
srcpkgs/font-alias/template | 8 ++++----
srcpkgs/font-bh-100dpi/template | 10 +++++-----
srcpkgs/font-bh-75dpi/template | 10 +++++-----
srcpkgs/font-bh-lucidatypewriter-100dpi/template | 10 +++++-----
srcpkgs/font-bh-lucidatypewriter-75dpi/template | 10 +++++-----
srcpkgs/font-bh-ttf/template | 10 +++++-----
srcpkgs/font-bh-type1/template | 10 +++++-----
srcpkgs/font-bitstream-100dpi/template | 10 +++++-----
srcpkgs/font-bitstream-75dpi/template | 10 +++++-----
srcpkgs/font-bitstream-speedo/template | 4 ++--
srcpkgs/font-bitstream-type1/template | 6 +++---
srcpkgs/font-cursor-misc/template | 10 +++++-----
srcpkgs/font-daewoo-misc/template | 10 +++++-----
srcpkgs/font-dec-misc/template | 10 +++++-----
srcpkgs/font-ibm-type1/template | 11 ++++++-----
srcpkgs/font-isas-misc/template | 6 +++---
srcpkgs/font-jis-misc/template | 5 +++--
srcpkgs/font-misc-misc/template | 6 +++---
srcpkgs/font-mutt-misc/template | 6 +++---
24 files changed, 102 insertions(+), 100 deletions(-)
diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template
index 0043b1810eff..ae5a79066d0f 100644
--- a/srcpkgs/font-adobe-100dpi/template
+++ b/srcpkgs/font-adobe-100dpi/template
@@ -1,7 +1,7 @@
# Template file for 'font-adobe-100dpi'
pkgname=font-adobe-100dpi
-version=1.0.3
-revision=7
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
@@ -10,8 +10,8 @@ short_desc="Standard 100dpi Adobe PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=f11f4776f53fa9663dce71b71978f3fde07a1fc87c6995623e30bf3c5d05a2a1
font_dirs="/usr/share/fonts/X11/100dpi"
post_install() {
diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template
index e1abd11a928b..6e8e829b69b5 100644
--- a/srcpkgs/font-adobe-75dpi/template
+++ b/srcpkgs/font-adobe-75dpi/template
@@ -1,7 +1,7 @@
# Template file for 'font-adobe-75dpi'
pkgname=font-adobe-75dpi
-version=1.0.3
-revision=7
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
@@ -10,8 +10,8 @@ short_desc="Standard 75pi Adobe PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=6a2be7148406fc5df4f1b5258955418fdacb17ee19946613164517ff501c41c7
font_dirs="/usr/share/fonts/X11/75dpi"
post_install() {
diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template
index 495998ba7324..a7e812566661 100644
--- a/srcpkgs/font-adobe-utopia-100dpi/template
+++ b/srcpkgs/font-adobe-utopia-100dpi/template
@@ -1,7 +1,7 @@
# Template file for 'font-adobe-utopia-100dpi'
pkgname=font-adobe-utopia-100dpi
-version=1.0.4
-revision=7
+version=1.0.5
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
@@ -10,8 +10,8 @@ short_desc="100dpi Adobe Utopia PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=1a67e926dc13e46181ad6106dc0cdc4d1767500865444709dc28e9262a640f4f
font_dirs="/usr/share/fonts/X11/100dpi"
post_install() {
diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template
index 78d1c28a7b75..fd738ccb80df 100644
--- a/srcpkgs/font-adobe-utopia-75dpi/template
+++ b/srcpkgs/font-adobe-utopia-75dpi/template
@@ -1,7 +1,7 @@
# Template file for 'font-adobe-utopia-75dpi'
pkgname=font-adobe-utopia-75dpi
-version=1.0.4
-revision=7
+version=1.0.5
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
@@ -10,8 +10,8 @@ short_desc="100dpi Adobe Utopia PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=92575acc11a3b2f8375de649605dcb00950b7b6f94373b48ef14b34cf81a808d
font_dirs="/usr/share/fonts/X11/75dpi"
post_install() {
diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template
index e2ab4f439d9f..98f7b7564451 100644
--- a/srcpkgs/font-adobe-utopia-type1/template
+++ b/srcpkgs/font-adobe-utopia-type1/template
@@ -1,7 +1,7 @@
# Template file for 'font-adobe-utopia-type1'
pkgname=font-adobe-utopia-type1
-version=1.0.4
-revision=7
+version=1.0.5
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
@@ -10,8 +10,8 @@ short_desc="Adobe Utopia Type1 fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=cd0b5acf8413d5a28afca6432c03ad0c9910fa707a38709bc9f235e9d7545e4d
font_dirs="/usr/share/fonts/X11/Type1"
post_install() {
diff --git a/srcpkgs/font-alias/template b/srcpkgs/font-alias/template
index 6f92d7d498e4..fe0b5b4ed794 100644
--- a/srcpkgs/font-alias/template
+++ b/srcpkgs/font-alias/template
@@ -1,14 +1,14 @@
# Template file for 'font-alias'
pkgname=font-alias
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
build_style=gnu-configure
short_desc="Standard aliases for X11 PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=f3111ae8bf2e980f5f56af400e8eefe5fc9f4207f4a412ea79637fd66c945276
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=f8e0ca6537003f11fcaf36c598f7de9c0428f8ed587388a8a37ff18ccc597730
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bh-100dpi/template b/srcpkgs/font-bh-100dpi/template
index 77166e7a996d..555b593ac32d 100644
--- a/srcpkgs/font-bh-100dpi/template
+++ b/srcpkgs/font-bh-100dpi/template
@@ -1,18 +1,18 @@
# Template file for 'font-bh-100dpi'
pkgname=font-bh-100dpi
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="Standard 100dpi Bigelow and Holmes PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=cfd9b6bf6dae77eb7186afa296ad7233bb43d9c2f840d8010e197d55a2cc21dc
+font_dirs="/usr/share/fonts/X11/100dpi"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bh-75dpi/template b/srcpkgs/font-bh-75dpi/template
index 6f00073e87cc..96d04443ad04 100644
--- a/srcpkgs/font-bh-75dpi/template
+++ b/srcpkgs/font-bh-75dpi/template
@@ -1,18 +1,18 @@
# Template file for 'font-bh-75dpi'
pkgname=font-bh-75dpi
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="Standard 75dpi Bigelow and Holmes PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=1d1be5cfe1a929d440acc6132fd50312d982815ba284cd6504d8cf457ef853b6
+font_dirs="/usr/share/fonts/X11/75dpi"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bh-lucidatypewriter-100dpi/template b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
index 8b1872813d7e..de31fe2b5acd 100644
--- a/srcpkgs/font-bh-lucidatypewriter-100dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
@@ -1,18 +1,18 @@
# Template file for 'font-bh-lucidatypewriter-100dpi'
pkgname=font-bh-lucidatypewriter-100dpi
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="100dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=28dbf07022e608ecca198dfee9455a33bf1efa1323936a853b894515fbb4992a
+font_dirs="/usr/share/fonts/X11/100dpi"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bh-lucidatypewriter-75dpi/template b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
index 085d457bc9a1..d588fb77bcd0 100644
--- a/srcpkgs/font-bh-lucidatypewriter-75dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
@@ -1,18 +1,18 @@
# Template file for 'font-bh-lucidatypewriter-75dpi'
pkgname=font-bh-lucidatypewriter-75dpi
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="75dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=8e502a1a7e81c1b95f08725f40e7e137d4d06700794d006b327d54b7c8d07f88
+font_dirs="/usr/share/fonts/X11/75dpi"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bh-ttf/template b/srcpkgs/font-bh-ttf/template
index f5da584e74aa..931a95b049ac 100644
--- a/srcpkgs/font-bh-ttf/template
+++ b/srcpkgs/font-bh-ttf/template
@@ -1,18 +1,18 @@
# Template file for 'font-bh-ttf'
pkgname=font-bh-ttf
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/TTF"
short_desc="Standard Bigelow and Holmes TrueType fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=bf662d20107d60a964ade831b8ad575a58510e0f2fb9f67e8f064bbbeaae45b4
+font_dirs="/usr/share/fonts/X11/TTF"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bh-type1/template b/srcpkgs/font-bh-type1/template
index 521cae386db1..8779c1024e01 100644
--- a/srcpkgs/font-bh-type1/template
+++ b/srcpkgs/font-bh-type1/template
@@ -1,18 +1,18 @@
# Template file for 'font-bh-type1'
pkgname=font-bh-type1
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/Type1"
short_desc="Standard Bigelow and Holmes Type1 fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=2ec07192aa73197958d65900c7048e8abd8fd00b187ea3d4871121a5c76aee99
+font_dirs="/usr/share/fonts/X11/Type1"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bitstream-100dpi/template b/srcpkgs/font-bitstream-100dpi/template
index 4750001aec3c..ac779e4a1b10 100644
--- a/srcpkgs/font-bitstream-100dpi/template
+++ b/srcpkgs/font-bitstream-100dpi/template
@@ -1,18 +1,18 @@
# Template file for 'font-bitstream-100dpi'
pkgname=font-bitstream-100dpi
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="Standard 100dpi Bitstream PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=1d4b38aaf700b13c17c5d7c7816a1abe7edf8fcfd5b584fc619d42b13a10e751
+font_dirs="/usr/share/fonts/X11/100dpi"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bitstream-75dpi/template b/srcpkgs/font-bitstream-75dpi/template
index 421dc06c860a..1b08434c92aa 100644
--- a/srcpkgs/font-bitstream-75dpi/template
+++ b/srcpkgs/font-bitstream-75dpi/template
@@ -1,18 +1,18 @@
# Template file for 'font-bitstream-75dpi'
pkgname=font-bitstream-75dpi
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="Standard 100dpi Bitstream PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=4d48e8e02ee6434eb44afc228ac78aea70ba2f1bf7a635082c13662864e3d522
+font_dirs="/usr/share/fonts/X11/75dpi"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
index d47bf80bc071..387e883defb2 100644
--- a/srcpkgs/font-bitstream-speedo/template
+++ b/srcpkgs/font-bitstream-speedo/template
@@ -9,8 +9,8 @@ short_desc="Standard Speedo Bitstream PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/${pkgname}-${version}.tar.bz2"
-checksum=0708fe0046947b88c082b55844af8a861741dcdf087f0624bdf23fb773d76763
+distfiles="${XORG_SITE}/font/${pkgname}-${version}.tar.gz"
+checksum=aeea5f130480a3f05149bde13d240e668d8fb4b32c02b18914fcccd1182abe72
font_dirs="/usr/share/fonts/X11/Speedo"
diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template
index ac7a35921af9..82a18792bbf8 100644
--- a/srcpkgs/font-bitstream-type1/template
+++ b/srcpkgs/font-bitstream-type1/template
@@ -6,13 +6,13 @@ build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/Type1"
short_desc="Standard Type1 Bitstream PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=3399b7586c18be509cdaeceeebf754b861faa1d8799dda1aae01aeb2a7a30f01
+font_dirs="/usr/share/fonts/X11/Type1"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-cursor-misc/template b/srcpkgs/font-cursor-misc/template
index 12cd3e48733c..81807ba494d5 100644
--- a/srcpkgs/font-cursor-misc/template
+++ b/srcpkgs/font-cursor-misc/template
@@ -1,18 +1,18 @@
# Template file for 'font-cursor-misc'
pkgname=font-cursor-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/misc"
short_desc="Standard X11 cursors in PCF format"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=37ef2363b3cfa6f5e20b65feab736db77fad484127c267b78de95d55fa39f61d
+font_dirs="/usr/share/fonts/X11/misc"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-daewoo-misc/template b/srcpkgs/font-daewoo-misc/template
index 15c61eeb87cb..f4efe53da493 100644
--- a/srcpkgs/font-daewoo-misc/template
+++ b/srcpkgs/font-daewoo-misc/template
@@ -1,18 +1,18 @@
# Template file for 'font-daewoo-misc'
pkgname=font-daewoo-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/misc"
short_desc="Daewoo Gothic PCF format"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=54d9c3778a676f1ad4e467d6cc6e4c596147a85ac2dd4cfee2ba0e893a6eaf59
+font_dirs="/usr/share/fonts/X11/misc"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-dec-misc/template b/srcpkgs/font-dec-misc/template
index ebd4fd7575bc..d1b1518d1a64 100644
--- a/srcpkgs/font-dec-misc/template
+++ b/srcpkgs/font-dec-misc/template
@@ -1,18 +1,18 @@
# Template file for 'font-dec-misc'
pkgname=font-dec-misc
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/misc"
short_desc="DEC cursor and session PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=a2273c3a06df0b6a61b56a82a06cd86a5721ac26251dab2e3f4173a4ce954729
+font_dirs="/usr/share/fonts/X11/misc"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-ibm-type1/template b/srcpkgs/font-ibm-type1/template
index 9ee99e8de4c7..01235daddbe4 100644
--- a/srcpkgs/font-ibm-type1/template
+++ b/srcpkgs/font-ibm-type1/template
@@ -1,18 +1,19 @@
# Template file for 'font-ibm-type1'
pkgname=font-ibm-type1
-version=1.0.3
-revision=6
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/Type1"
short_desc="IBM Courier Type1 fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=9129d73e3037709b03ea2bf61658ffa65e9a259a25b1df9a1e19c9ed8fcd1518
+font_dirs="/usr/share/fonts/X11/Type1"
+
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template
index ffe1644acc1d..cdd4b235f7fc 100644
--- a/srcpkgs/font-isas-misc/template
+++ b/srcpkgs/font-isas-misc/template
@@ -6,13 +6,13 @@ build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/misc"
short_desc="72dpi PCF versions of the Chinese Song Ti fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=493965263070a5ee2a301dfdb2e87c1ca3c00c7882bfb3dd99368565ba558ff5
+font_dirs="/usr/share/fonts/X11/misc"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-jis-misc/template b/srcpkgs/font-jis-misc/template
index 72c254fea829..f3c1c652e4d0 100644
--- a/srcpkgs/font-jis-misc/template
+++ b/srcpkgs/font-jis-misc/template
@@ -10,10 +10,11 @@ short_desc="78dpi PCF versions of the Japanese fixed fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=57c2db8824865117287d57d47f2c8cf4b2842d036c7475534b5054be69690c73
font_dirs="/usr/share/fonts/X11/misc"
+
post_install() {
vlicense COPYING
rm -f ${DESTDIR}/${font_dirs}/fonts.*
diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template
index dc97041c16b8..7f9b85edc86f 100644
--- a/srcpkgs/font-misc-misc/template
+++ b/srcpkgs/font-misc-misc/template
@@ -6,13 +6,13 @@ build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/misc"
short_desc="Standard X11 fixed PCF fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=46142c876e176036c61c0c24c0a689079704d5ca5b510d48c025861ee2dbf829
+font_dirs="/usr/share/fonts/X11/misc"
post_install() {
vlicense COPYING
diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template
index 6bed3e0cd741..ab1735f89a10 100644
--- a/srcpkgs/font-mutt-misc/template
+++ b/srcpkgs/font-mutt-misc/template
@@ -6,13 +6,13 @@ build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf font-util"
makedepends="font-util"
depends="font-util"
-font_dirs="/usr/share/fonts/X11/misc"
short_desc="100dpi PCF versions of the ClearlyU fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-checksum=bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.gz"
+checksum=fcecbfc475dfe5826d137f8edc623ba27d58d32f069165c248a013b3c566bb59
+font_dirs="/usr/share/fonts/X11/misc"
post_install() {
vlicense COPYING
From 115f72a42e6eb4968a9abcf9e067e58d5db21275 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sun, 7 May 2023 19:52:51 -0300
Subject: [PATCH 51/94] oil: update to 0.15.0
---
srcpkgs/oil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 422eb51b7075..72f6708e5157 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
# Template file for 'oil'
pkgname=oil
-version=0.14.2
+version=0.15.0
revision=1
build_style=configure
configure_args="--prefix=/usr"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="https://www.oilshell.org/download/oil-${version}.tar.xz"
-checksum=23faff0e110b2e928c9d9a9487ce3b17fb953e20981796f9ef87233f9f7e646d
+checksum=d6860ffec461606da825863cd163b1a925f0ab250c6e32197739c11dc9c63318
register_shell="/usr/bin/osh /usr/bin/oil"
nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
From 4e51b62a9a64c58aab9aeea91ee4b1608585a36f Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 1 May 2023 08:51:11 +0200
Subject: [PATCH 52/94] perl-Sub-Name: update to 0.27
---
srcpkgs/perl-Sub-Name/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Sub-Name/template b/srcpkgs/perl-Sub-Name/template
index 6d83d19fea93..e7a6b04884f7 100644
--- a/srcpkgs/perl-Sub-Name/template
+++ b/srcpkgs/perl-Sub-Name/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Sub-Name'
pkgname=perl-Sub-Name
-version=0.26
-revision=4
+version=0.27
+revision=1
build_style=perl-module
hostmakedepends="perl"
makedepends="perl"
@@ -11,4 +11,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/Sub-Name"
distfiles="${CPAN_SITE}/Sub/${pkgname/perl-/}-$version.tar.gz"
-checksum=2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105
+checksum=ecf36fba1c47ca93e1daa394968ed39c4186867459d9cd173c421e2b972043e8
From db9ff07d05b2f1f9685eb10c72d1f43f4be24566 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 1 May 2023 08:44:08 +0200
Subject: [PATCH 53/94] perl-CryptX: update to 0.078
---
srcpkgs/perl-CryptX/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index 0db7d1ba93cb..c664486a030d 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,7 +1,7 @@
# Template file for 'perl-CryptX'
pkgname=perl-CryptX
-version=0.077
-revision=2
+version=0.078
+revision=1
build_style=perl-module
hostmakedepends="perl"
makedepends="perl"
@@ -13,4 +13,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later, Unlicense"
homepage="https://metacpan.org/release/CryptX"
changelog="https://raw.githubusercontent.com/DCIT/perl-CryptX/master/Changes"
distfiles="${CPAN_SITE}/Crypt/${pkgname#perl-}-${version}.tar.gz"
-checksum=f741cd3a371f7754e790d174ff80c8f7fc1b120f95a0ab482bbe26a5246726a9
+checksum=93160b1242f7d5743cb3c931b8efc7cb39821d0e32f94f96933f1e88e618bcbd
From d84661d8ac96a27e48f6caf00ba41a810507ca90 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 7 May 2023 10:25:46 +0200
Subject: [PATCH 54/94] perl-CGI: update to 4.57
---
srcpkgs/perl-CGI/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 8698681a8153..2c8d94b911f2 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,6 +1,6 @@
# Template file for 'perl-CGI'
pkgname=perl-CGI
-version=4.56
+version=4.57
revision=1
build_style=perl-module
hostmakedepends="perl"
@@ -12,4 +12,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://metacpan.org/release/CGI"
distfiles="${CPAN_SITE}/CGI/CGI-${version}.tar.gz"
-checksum=2d36d930b89ecdfbcc7d6d4740821bd466a0218abf1bd413568640b2f43799b7
+checksum=4e6ca634fe0d5621bb55b0fce5c1d08e6f643c65eecdfffbb4b344fd51b963ac
From 04734413d3c59c4062a7e303dfc6d4e0ed434f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 5 May 2023 18:52:33 +0200
Subject: [PATCH 55/94] exiftool: update to 12.62.
---
srcpkgs/exiftool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 20f315c65fad..58c4d4c7a9d4 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
# Template file for 'exiftool'
pkgname=exiftool
-version=12.61
+version=12.62
revision=1
build_style=perl-module
short_desc="Reader and rewriter of EXIF information that supports raw files"
@@ -9,4 +9,4 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://exiftool.org/"
changelog="https://exiftool.org/history.html"
distfiles="https://exiftool.org/Image-ExifTool-${version}.tar.gz"
-checksum=a7871cd083b84a53d81d29e86cb70c22a79084e11062539ebbe327f1fa67ec30
+checksum=4990a46c69b656888d7d5732baf4039da964688edddf7a1c2eeb51404999ec1d
From 730ef99ef1de970d44c3a25ac76e4bff0677c210 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Fri, 5 May 2023 14:18:16 +0200
Subject: [PATCH 56/94] got: update to 0.88
---
srcpkgs/got/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/got/template b/srcpkgs/got/template
index 87522f8ea434..6cae12702ada 100644
--- a/srcpkgs/got/template
+++ b/srcpkgs/got/template
@@ -1,6 +1,6 @@
# Template file for 'got'
pkgname=got
-version=0.86
+version=0.88
revision=1
build_style=gnu-configure
hostmakedepends="byacc pkg-config"
@@ -11,7 +11,7 @@ license="ISC"
homepage="https://gameoftrees.org"
changelog="https://gameoftrees.org/releases/CHANGES"
distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
-checksum="1478cb124c6cbe4633e2d2b593fa4451f0d3f6b7ef37e2baf2045cf1f3d5a7b0"
+checksum="17c10730a010abf7d5fe2ebe55fe3686656385ba6dbae88ef337c4f647f3cea0"
post_install() {
sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE
From 503389c67da0797950a891e37e027c0a37df82bc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Thu, 4 May 2023 20:14:47 +0300
Subject: [PATCH 57/94] cpio: update to 2.14.
---
srcpkgs/cpio/template | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template
index 8b4d56155fe8..d26c85531b36 100644
--- a/srcpkgs/cpio/template
+++ b/srcpkgs/cpio/template
@@ -1,19 +1,15 @@
# Template file for 'cpio'
pkgname=cpio
-version=2.13
+version=2.14
revision=1
build_style=gnu-configure
configure_args="--with-rmt=/usr/bin/rmt"
-hostmakedepends="automake gettext-devel tar"
+hostmakedepends="gettext-devel tar"
short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/cpio/"
distfiles="${GNU_SITE}/cpio/cpio-${version}.tar.bz2"
-checksum=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d
+checksum=fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12
CFLAGS="-fcommon"
-
-pre_configure() {
- autoreconf -if
-}
From a0a4b09cd2fe17fba189035bd88e88728dd4785d Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Thu, 4 May 2023 07:20:33 +0200
Subject: [PATCH 58/94] emptty: update to 0.10.0
---
srcpkgs/emptty/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index c03864ab5279..111af0ee9d55 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
# Template file for 'emptty'
pkgname=emptty
-version=0.9.1
-revision=2
+version=0.10.0
+revision=1
build_style=go
go_import_path=github.com/tvrzna/emptty
makedepends="pam-devel libX11-devel"
@@ -10,7 +10,7 @@ maintainer="tvrzna <emporeor@gmail.com>"
license="MIT"
homepage="https://github.com/tvrzna/emptty"
distfiles="https://github.com/tvrzna/emptty/archive/v${version}.tar.gz"
-checksum=1b3c940da8d60705306525bf5a7619a7b30d954679e30a978a03ac53357e57d4
+checksum=d75c6b582067f8c96d292370d6ec8ae3da6410999d3d34a29cd4e3295577cc1d
conf_files="/etc/emptty/conf /etc/pam.d/emptty"
post_install() {
From 12da2e04c97762599ef423d62ee235c7fbff308f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 10 May 2023 11:58:39 -0400
Subject: [PATCH 59/94] New package: pyright-1.1.307
---
srcpkgs/pyright/template | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 srcpkgs/pyright/template
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
new file mode 100644
index 000000000000..b2f91256799b
--- /dev/null
+++ b/srcpkgs/pyright/template
@@ -0,0 +1,38 @@
+# Template file for 'pyright'
+pkgname=pyright
+version=1.1.307
+revision=1
+build_wrksrc="packages/pyright"
+hostmakedepends="nodejs python3"
+depends="nodejs"
+short_desc="Static type checker and language server for Python"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="MIT"
+homepage="https://microsoft.github.io/pyright"
+changelog="https://github.com/microsoft/pyright/releases"
+distfiles="https://github.com/microsoft/pyright/archive/refs/tags/${version}.tar.gz"
+checksum=434343c13bd470078c0184d7ac6383b5c0e43fabf79efaaef8e501d2a39933e3
+
+do_configure() {
+ cd "$wrksrc"
+ npm ci
+}
+
+do_build() {
+ npm run build
+}
+
+do_install() {
+ local _targetdir="/usr/lib/pyright"
+ vmkdir "$_targetdir"
+ vinstall index.js 755 "$_targetdir"
+ vinstall langserver.index.js 755 "$_targetdir"
+ vinstall package.json 644 "$_targetdir"
+ vcopy dist "$_targetdir"
+
+ vmkdir /usr/bin
+ ln -s "$_targetdir/index.js" "${DESTDIR}/usr/bin/pyright"
+ ln -s "$_targetdir/langserver.index.js" "${DESTDIR}/usr/bin/pyright-langserver"
+
+ vlicense "$wrksrc/LICENSE.txt"
+}
From 6fd96d91bb67fa1b5da2b7b08d1ca75ccea0e56a Mon Sep 17 00:00:00 2001
From: Andrewb Benson <abenson+void@gmail.com>
Date: Wed, 10 May 2023 19:29:25 -0500
Subject: [PATCH 60/94] steam: update to 1.0.0.78.
---
srcpkgs/steam/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 42e8e7cfa0e3..80d9aa80e610 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,7 +1,7 @@
# Template file for 'steam'
pkgname=steam
-version=1.0.0.76
-revision=2
+version=1.0.0.78
+revision=1
archs="i686 x86_64"
depends="zenity xz curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils
liberation-fonts-ttf file tar bash coreutils lsof"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom: Proprietary license"
homepage="https://steampowered.com/"
distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=5fb8b104ba1434b94c6e44373edfbb6188c8ef305f02bcd519b809f5e28f23fd
+checksum=104259755d7211b5f101db247ff70ebfed6ae6ca3e14da61195d1fbf91c7200d
repository=nonfree
do_install() {
From c367f5b172413e61c23f878b50c9722e5ec41d21 Mon Sep 17 00:00:00 2001
From: Andrewb Benson <abenson+void@gmail.com>
Date: Wed, 10 May 2023 19:35:51 -0500
Subject: [PATCH 61/94] Amass: update to 3.23.2.
---
srcpkgs/Amass/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 1454de9f5149..285fdfb6dd08 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
# Template file for 'Amass'
pkgname=Amass
-version=3.23.1
-revision=2
+version=3.23.2
+revision=1
build_style=go
go_import_path="github.com/owasp-amass/amass/v3/..."
short_desc="In-depth Attack Surface Mapping and Asset Discovery"
@@ -9,4 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
distfiles="https://github.com/owasp-amass/amass/archive/v${version}.tar.gz"
-checksum=5408e9691bc44c5280e2ba1800e19ea0eede9774d0f21fa13371fb9292fe677e
+checksum=a308036757d8505cf5cb420b4bfebdc8f57f35ee247e6b01aa9192e9eae8d342
From 1fc0cfcee5cc10844677605a501cc7a760537490 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 10 May 2023 20:21:11 -0500
Subject: [PATCH 62/94] nvidia: update to 525.116.04.
---
srcpkgs/nvidia/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index b7cee3debc25..633aea354dbc 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
_desc="NVIDIA drivers for linux"
pkgname=nvidia
-version=525.116.03
+version=525.116.04
revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
_pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=5c295b02ebec2e9a9ec0d79ba9292eb623b4b2fbba8a6ed619060929a30d0469
+checksum=8610ec82447cff72cb5f18b3657ee9a634a5151662b8ad901eb81f4c4fb617fe
# subpackages need to be processed in this specific order
subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
depends="nvidia-libs-${version}_${revision}
From fa11edf8f4decec9e109beeb0563c252c5fe0fe7 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Sun, 7 May 2023 22:59:32 -0500
Subject: [PATCH 63/94] font-ionicons-ttf: update to 7.1.0.
---
srcpkgs/font-ionicons-ttf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/font-ionicons-ttf/template b/srcpkgs/font-ionicons-ttf/template
index 83cb2d5898da..1ceb8db0ab82 100644
--- a/srcpkgs/font-ionicons-ttf/template
+++ b/srcpkgs/font-ionicons-ttf/template
@@ -1,6 +1,6 @@
# Template file for 'font-ionicons-ttf'
pkgname=font-ionicons-ttf
-version=6.0.3
+version=7.1.0
revision=1
depends="font-util"
short_desc="Icon font from the Ionic Framework"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://ionicons.com/"
distfiles="https://github.com/ionic-team/ionicons/archive/v${version}.tar.gz"
-checksum=8dbe10f679877d78fe958d182aa5e381a394d55ad06573bace2bbba2ae3979ff
+checksum=18a4a32ae7726fe21e041914179d1c91d7f90b2cc66d9391ddef3cb8b3075e73
font_dirs="/usr/share/fonts/TTF"
From f6b2591c4c8fbfe9583bf7d6f0e9f053a40c4f9e Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Tue, 9 May 2023 16:58:33 -0500
Subject: [PATCH 64/94] Signal-Desktop: update to 6.17.0.
---
srcpkgs/Signal-Desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index ceb85537b780..3d0f4e937144 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,11 +1,11 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=6.16.0
+version=6.17.0
revision=1
# Signal officially only supports x86_64
-# x86_64-musl could potentially based on the Alpine port:
+# x86_64-musl could potentially work based on the Alpine port:
# https://git.alpinelinux.org/aports/tree/testing/signal-desktop
-# armv7hf/arm64: https://github.com/signalapp/Signal-Desktop/issues/3410
+# ARM: https://github.com/signalapp/Signal-Desktop/issues/3410
archs="x86_64"
hostmakedepends="git git-lfs nodejs python3 tar yarn"
depends="cairo gtk+3 libvips pango"
@@ -14,7 +14,7 @@ maintainer="anelki <akierig@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=cfd68731007b41f72026a1cb32fb8f25c7131eb6e61edb0db4f9ebfd4878300c
+checksum=791aa4712cbf4072dc7498cb427a548809f28159b2b2a25cde80adea38b50a30
nostrip_files="signal-desktop"
post_extract() {
From c9552e3aa7ae56aef7c23a4434da9af996c0087e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 21:55:07 -0400
Subject: [PATCH 65/94] pythran: update to 0.13.1.
---
srcpkgs/pythran/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pythran/template b/srcpkgs/pythran/template
index a37e61e6de56..9bafb295de76 100644
--- a/srcpkgs/pythran/template
+++ b/srcpkgs/pythran/template
@@ -1,6 +1,6 @@
# Template file for 'pythran'
pkgname=pythran
-version=0.12.1
+version=0.13.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://pythran.readthedocs.io/"
distfiles="${PYPI_SITE}/p/pythran/pythran-${version}.tar.gz"
-checksum=702c2701187cfb38f66c0c20cc85d04d0e156d260a8d92892da65947faa5360e
+checksum=8aad08162f010e5425a7b254dd68d83311b430bb29f9252dce2eff3ba39497dd
# Upstream defines no tests
make_check=no
From 179d5da9a63bfa5a24eb001b94cb32b94420c55e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:00:26 -0400
Subject: [PATCH 66/94] maturin: update to 0.15.1.
---
srcpkgs/maturin/template | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index c2b3a615e320..de041d3039fd 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,8 +1,8 @@
# Template file for 'maturin'
pkgname=maturin
-version=0.14.17
+version=0.15.1
revision=1
-build_style=python3-module
+build_style=python3-pep517
build_helper="qemu rust"
hostmakedepends="python3-setuptools-rust python3-tomli python3-wheel cargo"
makedepends="openssl-devel"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0, MIT"
homepage="https://github.com/PyO3/maturin"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d47bd483c2748a64d245b4ee34d32d869a30bc7683f2603487dcd54ff08cf846
+checksum=15ab24cc43da24ceca5175847a43ac59b31447b8b545cecca902d219110faee9
# Tests use unstable features and fail to build
make_check=no
@@ -22,15 +22,4 @@ fi
post_install() {
vlicense license-mit LICENSE-MIT
- python3 setup.py install --prefix=/usr --root=${DESTDIR}
-
- # Generate and install some completions
- local _matbin="${DESTDIR}/usr/bin/maturin"
- vtargetrun "${_matbin}" completions zsh > maturin.zsh
- vtargetrun "${_matbin}" completions fish > maturin.fish
- vtargetrun "${_matbin}" completions bash > maturin.bash
-
- vcompletion maturin.zsh zsh
- vcompletion maturin.fish fish
- vcompletion maturin.bash bash
}
From 395364a41490105e7a1418cb088e67e445d95dfc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:04:51 -0400
Subject: [PATCH 67/94] python3-bokeh: update to 3.1.1.
---
srcpkgs/python3-bokeh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index e7e3af59b98d..54a98e016096 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
# Template file for 'python3-bokeh'
pkgname=python3-bokeh
-version=3.1.0
+version=3.1.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-colorama"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://bokeh.org"
changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=9047dfe50a671b5e19ca588fd90a8e6bff197114a5dbd6a59cc2678942c27887
+checksum=ba0fc6bae4352d307541293256dee930a42d0acf92e760c72dc0e7397c3a28e9
# Tests have unpackaged dependencies and require fetching data; skipping
make_check=no
From ba9d2e67df151bbcfb54dbdcbc1d65b88e8710af Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:05:01 -0400
Subject: [PATCH 68/94] python3-gast: update to 0.5.4.
---
srcpkgs/python3-gast/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-gast/template b/srcpkgs/python3-gast/template
index cb1d24516d10..7df2dc9c20e5 100644
--- a/srcpkgs/python3-gast/template
+++ b/srcpkgs/python3-gast/template
@@ -1,7 +1,7 @@
# Template file for 'python3-gast'
pkgname=python3-gast
-version=0.5.3
-revision=2
+version=0.5.4
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://github.com/serge-sans-paille/gast"
distfiles="${PYPI_SITE}/g/gast/gast-${version}.tar.gz"
-checksum=cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea
+checksum=9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97
post_install() {
vlicense LICENSE
From e833620fea46c14347d67b50a4be565158e6a38c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:05:44 -0400
Subject: [PATCH 69/94] python3-imageio: update to 2.28.1.
---
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 5729ac4dd9ca..28cd2454bea9 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.28.0
+version=2.28.1
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=5b61086f349f8531474a720b85714dac48cab2dbc204064850d5e0aee85285b6
+checksum=27c7c0004c62fc890198e0534177b4fad1a31d2ee9cfe0e957abacf597e37230
post_install() {
vlicense LICENSE
From c69e397a66353df1859c61c85bf17fbb194877b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:07:16 -0400
Subject: [PATCH 70/94] python3-hypothesis: update to 6.75.0.
---
srcpkgs/python3-hypothesis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 6bd0300e7622..30def188b53f 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-hypothesis'
pkgname=python3-hypothesis
-version=6.74.0
+version=6.75.0
revision=1
build_wrksrc=hypothesis-python
build_style=python3-module
@@ -14,7 +14,7 @@ license="MPL-2.0"
homepage="https://hypothesis.works/"
changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=fb7f50720c870e6cfb6fcb6a63e5c7a9bbcd30571a2362668857b968fb9220e1
+checksum=b5aae201b1758beb00c6d8eea3d860a461fe9f628c14d01f7a90a978b23e9178
do_check() {
# Manually run the tests that tox considers part of the "full" suite,
From 7f28b14e1debdc539d7640a278df66ed11dbda89 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:08:12 -0400
Subject: [PATCH 71/94] python3-pyopencl: update to 2023.1.
---
srcpkgs/python3-pyopencl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index d7d988be5e7e..4b76973a5312 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyopencl'
pkgname=python3-pyopencl
-version=2022.3.1
+version=2023.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="X11, Apache-2.0, BSD-3-Clause"
homepage="https://mathema.tician.de/software/pyopencl"
distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz"
-checksum=4a3db0fe61b5cdc95267526deebd71a7e1d795694d4b0fe2761f0630bcca3621
+checksum=d9de607272919a507a9c24c3dfeeeafe72c05f7cd6c9e37b2119e8ee3c53a891
# Tests require a working OpenCL platform
make_check=no
From aa14aa91c1601023e206fc18c58276f2f52c4913 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:08:20 -0400
Subject: [PATCH 72/94] python3-redis: update to 4.5.5.
---
srcpkgs/python3-redis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index 5a9c5c7edb20..8df9f112be2e 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-redis'
pkgname=python3-redis
-version=4.5.4
+version=4.5.5
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/redis/redis-py"
changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES"
distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=73ec35da4da267d6847e47f68730fdd5f62e2ca69e3ef5885c6a78a9374c3893
+checksum=dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880
replaces="python3-aioredis<=2.0.1_1"
make_check=no # tests require a running redis server
From c1cffad334f256c0691e584dc59229f74cb25c0b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:08:29 -0400
Subject: [PATCH 73/94] python3-setuptools-rust: update to 1.6.0.
---
srcpkgs/python3-setuptools-rust/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index accc9f22a921..3c4540d5bd49 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,7 +1,7 @@
# Template file for 'python3-setuptools-rust'
pkgname=python3-setuptools-rust
-version=1.5.2
-revision=2
+version=1.6.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
depends="python3-semanticversion python3-setuptools python3-typing_extensions"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/PyO3/setuptools-rust"
changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=d8daccb14dc0eae1b6b6eb3ecef79675bd37b4065369f79c35393dd5c55652c7
+checksum=c86e734deac330597998bfbc08da45187e6b27837e23bd91eadb320732392262
# Tests have unpackaged dependencies
make_check=no
From a70a046a1c23185546b974ecd764eee8cf378812 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 10 May 2023 22:08:37 -0400
Subject: [PATCH 74/94] python3-websockets: update to 11.0.3.
---
srcpkgs/python3-websockets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 0d8f2f6c2299..458eb953b92a 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,6 +1,6 @@
# Template file for 'python3-websockets'
pkgname=python3-websockets
-version=11.0.2
+version=11.0.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://websockets.readthedocs.io/en/stable/"
changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html"
distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
-checksum=b1a69701eb98ed83dd099de4a686dc892c413d974fa31602bc00aca7cb988ac9
+checksum=88fc51d9a26b10fc331be344f1781224a375b78488fc343620184e95a4b27016
# Package ships no tests
make_check=no
From 2c3b5d3e48bec0a7dd30850246f0f8ca879c729a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 8 Mar 2023 23:17:40 +0700
Subject: [PATCH 75/94] boost: update to 1.82.0
---
common/shlibs | 73 ++---
srcpkgs/boost/patches/boost-sort.patch | 116 -------
.../container-failed-static-vector.patch | 10 +-
srcpkgs/boost/patches/filesystem-test.patch | 24 --
.../patches/fix-boost-filesystem-285.patch | 306 ++++++++++++++++++
srcpkgs/boost/patches/gil-test-failure.patch | 20 +-
.../boost/patches/install-strip-destdir.patch | 4 +-
srcpkgs/boost/patches/iostream-test.patch | 8 +-
.../boost/patches/ptr-container-failure.patch | 14 -
.../patches/revert-boost-phoenix-104.patch | 26 +-
srcpkgs/boost/template | 74 ++---
srcpkgs/libboost_sync | 1 +
12 files changed, 398 insertions(+), 278 deletions(-)
delete mode 100644 srcpkgs/boost/patches/boost-sort.patch
delete mode 100644 srcpkgs/boost/patches/filesystem-test.patch
create mode 100644 srcpkgs/boost/patches/fix-boost-filesystem-285.patch
delete mode 100644 srcpkgs/boost/patches/ptr-container-failure.patch
create mode 120000 srcpkgs/libboost_sync
diff --git a/common/shlibs b/common/shlibs
index 89f7e53081f8..e4d69419cfa7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -631,42 +631,43 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.81.0 libboost_context-1.81.0_1
-libboost_coroutine.so.1.81.0 libboost_coroutine-1.81.0_1
-libboost_container.so.1.81.0 libboost_container-1.81.0_1
-libboost_prg_exec_monitor.so.1.81.0 libboost_prg_exec_monitor-1.81.0_1
-libboost_timer.so.1.81.0 libboost_timer-1.81.0_1
-libboost_random.so.1.81.0 libboost_random-1.81.0_1
-libboost_filesystem.so.1.81.0 libboost_filesystem-1.81.0_1
-libboost_unit_test_framework.so.1.81.0 libboost_unit_test_framework-1.81.0_1
-libboost_math_c99.so.1.81.0 libboost_math_c99-1.81.0_1
-libboost_math_tr1.so.1.81.0 libboost_math_tr1-1.81.0_1
-libboost_nowide.so.1.81.0 libboost_nowide-1.81.0_1
-libboost_json.so.1.81.0 libboost_json-1.81.0_1
-libboost_regex.so.1.81.0 libboost_regex-1.81.0_1
-libboost_serialization.so.1.81.0 libboost_serialization-1.81.0_1
-libboost_chrono.so.1.81.0 libboost_chrono-1.81.0_1
-libboost_wserialization.so.1.81.0 libboost_wserialization-1.81.0_1
-libboost_graph.so.1.81.0 libboost_graph-1.81.0_1
-libboost_graph_parallel.so.1.81.0 libboost_graph_parallel-1.81.0_1
-libboost_log.so.1.81.0 libboost_log-1.81.0_1
-libboost_locale.so.1.81.0 libboost_locale-1.81.0_1
-libboost_program_options.so.1.81.0 libboost_program_options-1.81.0_1
-libboost_iostreams.so.1.81.0 libboost_iostreams-1.81.0_1
-libboost_system.so.1.81.0 libboost_system-1.81.0_1
-libboost_thread.so.1.81.0 libboost_thread-1.81.0_1
-libboost_log_setup.so.1.81.0 libboost_log_setup-1.81.0_1
-libboost_date_time.so.1.81.0 libboost_date_time-1.81.0_1
-libboost_wave.so.1.81.0 libboost_wave-1.81.0_1
-libboost_atomic.so.1.81.0 libboost_atomic-1.81.0_1
-libboost_type_erasure.so.1.81.0 libboost_type_erasure-1.81.0_1
-libboost_fiber.so.1.81.0 libboost_fiber-1.81.0_1
-libboost_stacktrace_noop.so.1.81.0 libboost_stacktrace_noop-1.81.0_1
-libboost_stacktrace_addr2line.so.1.81.0 libboost_stacktrace_addr2line-1.81.0_1
-libboost_stacktrace_basic.so.1.81.0 libboost_stacktrace_basic-1.81.0_1
-libboost_mpi.so.1.81.0 libboost_mpi-1.81.0_1
-libboost_mpi_python311.so.1.81.0 libboost_mpi-python3-1.81.0_1
-libboost_python311.so.1.81.0 boost-python3-1.81.0_1
+libboost_context.so.1.82.0 libboost_context-1.82.0.alpha_1
+libboost_coroutine.so.1.82.0 libboost_coroutine-1.82.0.alpha_1
+libboost_container.so.1.82.0 libboost_container-1.82.0.alpha_1
+libboost_prg_exec_monitor.so.1.82.0 libboost_prg_exec_monitor-1.82.0.alpha_1
+libboost_timer.so.1.82.0 libboost_timer-1.82.0.alpha_1
+libboost_random.so.1.82.0 libboost_random-1.82.0.alpha_1
+libboost_filesystem.so.1.82.0 libboost_filesystem-1.82.0.alpha_1
+libboost_unit_test_framework.so.1.82.0 libboost_unit_test_framework-1.82.0.alpha_1
+libboost_math_c99.so.1.82.0 libboost_math_c99-1.82.0.alpha_1
+libboost_math_tr1.so.1.82.0 libboost_math_tr1-1.82.0.alpha_1
+libboost_nowide.so.1.82.0 libboost_nowide-1.82.0.alpha_1
+libboost_json.so.1.82.0 libboost_json-1.82.0.alpha_1
+libboost_regex.so.1.82.0 libboost_regex-1.82.0.alpha_1
+libboost_serialization.so.1.82.0 libboost_serialization-1.82.0.alpha_1
+libboost_chrono.so.1.82.0 libboost_chrono-1.82.0.alpha_1
+libboost_wserialization.so.1.82.0 libboost_wserialization-1.82.0.alpha_1
+libboost_graph.so.1.82.0 libboost_graph-1.82.0.alpha_1
+libboost_graph_parallel.so.1.82.0 libboost_graph_parallel-1.82.0.alpha_1
+libboost_log.so.1.82.0 libboost_log-1.82.0.alpha_1
+libboost_locale.so.1.82.0 libboost_locale-1.82.0.alpha_1
+libboost_program_options.so.1.82.0 libboost_program_options-1.82.0.alpha_1
+libboost_iostreams.so.1.82.0 libboost_iostreams-1.82.0.alpha_1
+libboost_system.so.1.82.0 libboost_system-1.82.0.alpha_1
+libboost_sync.so.1.82.0 libboost_system-1.82.0.alpha_1
+libboost_thread.so.1.82.0 libboost_thread-1.82.0.alpha_1
+libboost_log_setup.so.1.82.0 libboost_log_setup-1.82.0.alpha_1
+libboost_date_time.so.1.82.0 libboost_date_time-1.82.0.alpha_1
+libboost_wave.so.1.82.0 libboost_wave-1.82.0.alpha_1
+libboost_atomic.so.1.82.0 libboost_atomic-1.82.0.alpha_1
+libboost_type_erasure.so.1.82.0 libboost_type_erasure-1.82.0.alpha_1
+libboost_fiber.so.1.82.0 libboost_fiber-1.82.0.alpha_1
+libboost_stacktrace_noop.so.1.82.0 libboost_stacktrace_noop-1.82.0.alpha_1
+libboost_stacktrace_addr2line.so.1.82.0 libboost_stacktrace_addr2line-1.82.0.alpha_1
+libboost_stacktrace_basic.so.1.82.0 libboost_stacktrace_basic-1.82.0.alpha_1
+libboost_mpi.so.1.82.0 libboost_mpi-1.82.0.alpha_1
+libboost_mpi_python311.so.1.82.0 libboost_mpi-python3-1.82.0.alpha_1
+libboost_python311.so.1.82.0 boost-python3-1.82.0.alpha_1
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost/patches/boost-sort.patch b/srcpkgs/boost/patches/boost-sort.patch
deleted file mode 100644
index 906c694ba1e2..000000000000
--- a/srcpkgs/boost/patches/boost-sort.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 2e6674d63f2f541a3fd32f50d593be0c71f686f8 Mon Sep 17 00:00:00 2001
-From: spreadsort <spreadsort@gmail.com>
-Date: Sat, 17 Dec 2022 17:18:17 -0500
-Subject: [PATCH] Delete non-critical
-
----
- .../boost/sort/spreadsort/detail/float_sort.hpp | 2 --
- .../boost/sort/spreadsort/detail/integer_sort.hpp | 6 ------
- .../boost/sort/spreadsort/detail/string_sort.hpp | 15 +++++----------
- 3 files changed, 5 insertions(+), 18 deletions(-)
-
-diff --git a/boost/sort/spreadsort/detail/float_sort.hpp b/boost/sort/spreadsort/detail/float_sort.hpp
-index 8d20bef..8682afd 100644
---- a/boost/sort/spreadsort/detail/float_sort.hpp
-+++ b/boost/sort/spreadsort/detail/float_sort.hpp
-@@ -777,7 +777,6 @@ namespace spreadsort {
- float_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift rshift)
- {
-- BOOST_STATIC_ASSERT(sizeof(boost::uintmax_t) >= sizeof(Div_type));
- boost::sort::pdqsort(first, last);
- }
-
-@@ -819,7 +818,6 @@ namespace spreadsort {
- float_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift rshift, Compare comp)
- {
-- BOOST_STATIC_ASSERT(sizeof(boost::uintmax_t) >= sizeof(Div_type));
- boost::sort::pdqsort(first, last, comp);
- }
- }
-diff --git a/boost/sort/spreadsort/detail/integer_sort.hpp b/boost/sort/spreadsort/detail/integer_sort.hpp
-index 77576d0..fad55b3 100644
---- a/boost/sort/spreadsort/detail/integer_sort.hpp
-+++ b/boost/sort/spreadsort/detail/integer_sort.hpp
-@@ -390,8 +390,6 @@ namespace spreadsort {
- //defaulting to boost::sort::pdqsort when integer_sort won't work
- integer_sort(RandomAccessIter first, RandomAccessIter last, Div_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though integer_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Div_type) <= sizeof(size_t) );
- boost::sort::pdqsort(first, last);
- }
-
-@@ -437,8 +435,6 @@ namespace spreadsort {
- integer_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift shift, Compare comp)
- {
-- //Warning that we're using boost::sort::pdqsort, even though integer_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Div_type) <= sizeof(size_t) );
- boost::sort::pdqsort(first, last, comp);
- }
-
-@@ -481,8 +477,6 @@ namespace spreadsort {
- integer_sort(RandomAccessIter first, RandomAccessIter last, Div_type,
- Right_shift shift)
- {
-- //Warning that we're using boost::sort::pdqsort, even though integer_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Div_type) <= sizeof(size_t) );
- boost::sort::pdqsort(first, last);
- }
- }
-diff --git a/boost/sort/spreadsort/detail/string_sort.hpp b/boost/sort/spreadsort/detail/string_sort.hpp
-index fd67a55..e0c3f74 100644
---- a/boost/sort/spreadsort/detail/string_sort.hpp
-+++ b/boost/sort/spreadsort/detail/string_sort.hpp
-@@ -699,8 +699,7 @@ namespace spreadsort {
- string_sort(RandomAccessIter first, RandomAccessIter last,
- Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last);
- }
-
-@@ -725,8 +724,7 @@ namespace spreadsort {
- {
- typedef typename std::iterator_traits<RandomAccessIter>::value_type
- Data_type;
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last, std::greater<Data_type>());
- }
-
-@@ -751,8 +749,7 @@ namespace spreadsort {
- string_sort(RandomAccessIter first, RandomAccessIter last,
- Get_char get_character, Get_length length, Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last);
- }
-
-@@ -779,8 +776,7 @@ namespace spreadsort {
- string_sort(RandomAccessIter first, RandomAccessIter last,
- Get_char get_character, Get_length length, Compare comp, Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last, comp);
- }
-
-@@ -806,8 +802,7 @@ namespace spreadsort {
- reverse_string_sort(RandomAccessIter first, RandomAccessIter last,
- Get_char get_character, Get_length length, Compare comp, Unsigned_char_type)
- {
-- //Warning that we're using boost::sort::pdqsort, even though string_sort was called
-- BOOST_STATIC_ASSERT( sizeof(Unsigned_char_type) <= 2 );
-+ // Use boost::sort::pdqsort if the char_type is too large for string_sort.
- boost::sort::pdqsort(first, last, comp);
- }
- }
diff --git a/srcpkgs/boost/patches/container-failed-static-vector.patch b/srcpkgs/boost/patches/container-failed-static-vector.patch
index 98391ccf8ac2..90f984e67125 100644
--- a/srcpkgs/boost/patches/container-failed-static-vector.patch
+++ b/srcpkgs/boost/patches/container-failed-static-vector.patch
@@ -1,8 +1,6 @@
-Index: boost-1.81.0/libs/container/test/static_vector_test.cpp
-===================================================================
---- boost-1.81.0.orig/libs/container/test/static_vector_test.cpp
-+++ boost-1.81.0/libs/container/test/static_vector_test.cpp
-@@ -633,6 +633,7 @@ bool default_init_test()//Test for defau
+--- a/libs/container/test/static_vector_test.cpp
++++ b/libs/container/test/static_vector_test.cpp
+@@ -632,6 +632,7 @@ bool default_init_test()//Test for defau
{
di_vector_t v(Capacity, default_init);
}
@@ -10,7 +8,7 @@ Index: boost-1.81.0/libs/container/test/static_vector_test.cpp
{
di_vector_t v;
int *p = v.data();
-@@ -654,6 +655,7 @@ bool default_init_test()//Test for defau
+@@ -653,6 +654,7 @@ bool default_init_test()//Test for defau
v.~di_vector_t();
}
diff --git a/srcpkgs/boost/patches/filesystem-test.patch b/srcpkgs/boost/patches/filesystem-test.patch
deleted file mode 100644
index 593938d91c0d..000000000000
--- a/srcpkgs/boost/patches/filesystem-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d204b41dba231ffbb648d11c5bcbd3cd3c84f519 Mon Sep 17 00:00:00 2001
-From: Andrey Semashev <andrey.semashev@gmail.com>
-Date: Thu, 15 Dec 2022 15:53:42 +0300
-Subject: [PATCH] Use access() to check if the root directory is writable.
-
-This is more reliable than testing if the user is root as in some
-chroot environments root directory may be writable by a non-root user.
----
- test/operations_test.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/filesystem/test/operations_test.cpp b/libs/filesystem/test/operations_test.cpp
-index 4e3c2b966..65858a4e6 100644
---- a/libs/filesystem/test/operations_test.cpp
-+++ b/libs/filesystem/test/operations_test.cpp
-@@ -1232,7 +1232,7 @@ void create_directories_tests()
- BOOST_TEST(!ec);
-
- #ifdef BOOST_POSIX_API
-- if (geteuid() > 0)
-+ if (access("/", W_OK) != 0)
- {
- ec.clear();
- BOOST_TEST(!fs::create_directories("/foo", ec)); // may be OK on Windows
diff --git a/srcpkgs/boost/patches/fix-boost-filesystem-285.patch b/srcpkgs/boost/patches/fix-boost-filesystem-285.patch
new file mode 100644
index 000000000000..28f6f4734bfb
--- /dev/null
+++ b/srcpkgs/boost/patches/fix-boost-filesystem-285.patch
@@ -0,0 +1,306 @@
+From 396eef1398a87463a234e7d313d637ea67df96b5 Mon Sep 17 00:00:00 2001
+From: Andrey Semashev <andrey.semashev@gmail.com>
+Date: Sun, 7 May 2023 20:58:27 +0300
+Subject: [PATCH] Restrict generic path comparison operators to avoid
+ ambiguities with std lib.
+
+Path comparison operators that accept arbitrary path source types now require
+the other argument to be exactly path. This prevents the compiler from picking
+those operators when the other argument is convertible to path. This can happen
+even when neither of the arguments are actually paths, e.g. when the
+comparison operators are brought into the current scope by a using directive.
+
+Fixes https://github.com/boostorg/filesystem/issues/285.
+---
+diff --git a/boost/filesystem/path.hpp b/boost/filesystem/path.hpp
+index 61278ef74..729e18812 100644
+--- a/boost/filesystem/path.hpp
++++ b/boost/filesystem/path.hpp
+@@ -1287,20 +1287,26 @@ BOOST_FORCEINLINE bool operator==(path const& lhs, path const& rhs)
+ return lhs.compare(rhs) == 0;
+ }
+
+-template< typename Source >
++template< typename Path, typename Source >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator==(path const& lhs, Source const& rhs)
++>::type operator==(Path const& lhs, Source const& rhs)
+ {
+ return lhs.compare(rhs) == 0;
+ }
+
+-template< typename Source >
++template< typename Source, typename Path >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator==(Source const& lhs, path const& rhs)
++>::type operator==(Source const& lhs, Path const& rhs)
+ {
+ return rhs.compare(lhs) == 0;
+ }
+@@ -1310,20 +1316,26 @@ BOOST_FORCEINLINE bool operator!=(path const& lhs, path const& rhs)
+ return lhs.compare(rhs) != 0;
+ }
+
+-template< typename Source >
++template< typename Path, typename Source >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator!=(path const& lhs, Source const& rhs)
++>::type operator!=(Path const& lhs, Source const& rhs)
+ {
+ return lhs.compare(rhs) != 0;
+ }
+
+-template< typename Source >
++template< typename Source, typename Path >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator!=(Source const& lhs, path const& rhs)
++>::type operator!=(Source const& lhs, Path const& rhs)
+ {
+ return rhs.compare(lhs) != 0;
+ }
+@@ -1333,20 +1345,26 @@ BOOST_FORCEINLINE bool operator<(path const& lhs, path const& rhs)
+ return lhs.compare(rhs) < 0;
+ }
+
+-template< typename Source >
++template< typename Path, typename Source >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator<(path const& lhs, Source const& rhs)
++>::type operator<(Path const& lhs, Source const& rhs)
+ {
+ return lhs.compare(rhs) < 0;
+ }
+
+-template< typename Source >
++template< typename Source, typename Path >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator<(Source const& lhs, path const& rhs)
++>::type operator<(Source const& lhs, Path const& rhs)
+ {
+ return rhs.compare(lhs) > 0;
+ }
+@@ -1356,20 +1374,26 @@ BOOST_FORCEINLINE bool operator<=(path const& lhs, path const& rhs)
+ return lhs.compare(rhs) <= 0;
+ }
+
+-template< typename Source >
++template< typename Path, typename Source >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator<=(path const& lhs, Source const& rhs)
++>::type operator<=(Path const& lhs, Source const& rhs)
+ {
+ return lhs.compare(rhs) <= 0;
+ }
+
+-template< typename Source >
++template< typename Source, typename Path >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator<=(Source const& lhs, path const& rhs)
++>::type operator<=(Source const& lhs, Path const& rhs)
+ {
+ return rhs.compare(lhs) >= 0;
+ }
+@@ -1379,20 +1403,26 @@ BOOST_FORCEINLINE bool operator>(path const& lhs, path const& rhs)
+ return lhs.compare(rhs) > 0;
+ }
+
+-template< typename Source >
++template< typename Path, typename Source >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator>(path const& lhs, Source const& rhs)
++>::type operator>(Path const& lhs, Source const& rhs)
+ {
+ return lhs.compare(rhs) > 0;
+ }
+
+-template< typename Source >
++template< typename Source, typename Path >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator>(Source const& lhs, path const& rhs)
++>::type operator>(Source const& lhs, Path const& rhs)
+ {
+ return rhs.compare(lhs) < 0;
+ }
+@@ -1402,35 +1432,41 @@ BOOST_FORCEINLINE bool operator>=(path const& lhs, path const& rhs)
+ return lhs.compare(rhs) >= 0;
+ }
+
+-template< typename Source >
++template< typename Path, typename Source >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator>=(path const& lhs, Source const& rhs)
++>::type operator>=(Path const& lhs, Source const& rhs)
+ {
+ return lhs.compare(rhs) >= 0;
+ }
+
+-template< typename Source >
++template< typename Source, typename Path >
+ BOOST_FORCEINLINE typename boost::enable_if_c<
+- detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >::value,
++ boost::conjunction<
++ boost::is_same< Path, path >,
++ detail::path_traits::is_convertible_to_path_source< typename boost::remove_cv< Source >::type >
++ >::value,
+ bool
+->::type operator>=(Source const& lhs, path const& rhs)
++>::type operator>=(Source const& lhs, Path const& rhs)
+ {
+ return rhs.compare(lhs) <= 0;
+ }
+
+
+ // Note: Declared as a template to delay binding to Boost.ContainerHash functions and make the dependency optional
+-template< typename T >
++template< typename Path >
+ inline typename boost::enable_if_c<
+- boost::is_same< T, path >::value,
++ boost::is_same< Path, path >::value,
+ std::size_t
+->::type hash_value(T const& p) BOOST_NOEXCEPT
++>::type hash_value(Path const& p) BOOST_NOEXCEPT
+ {
+ #ifdef BOOST_WINDOWS_API
+ std::size_t seed = 0u;
+- for (typename T::value_type const* it = p.c_str(); *it; ++it)
++ for (typename Path::value_type const* it = p.c_str(); *it; ++it)
+ hash_combine(seed, *it == L'/' ? L'\\' : *it);
+ return seed;
+ #else // BOOST_POSIX_API
+diff --git a/libs/filesystem/test/Jamfile.v2 b/libs/filesystem/test/Jamfile.v2
+index d1ffc2a6f..5d70b08ec 100644
+--- a/libs/filesystem/test/Jamfile.v2
++++ b/libs/filesystem/test/Jamfile.v2
+@@ -85,6 +85,7 @@ run operations_test.cpp : : : <link>static <define>BOOST_FILESYSTEM_VERSION=4 :
+ run operations_unit_test.cpp : $(HERE) : : <link>shared <define>BOOST_FILESYSTEM_VERSION=4 <test-info>always_show_run_output ;
+ run copy_test.cpp : : : <define>BOOST_FILESYSTEM_VERSION=4 ;
+ compile-fail cf_path_nullptr_test.cpp ;
++compile path_operator_ambiguity.cpp : <toolset>gcc:<warnings-as-errors>on ;
+ run path_test.cpp : : : <link>shared <define>BOOST_FILESYSTEM_VERSION=4 ;
+ run path_test.cpp : : : <link>static <define>BOOST_FILESYSTEM_VERSION=4 : path_test_static ;
+ run path_test.cpp : : : <link>shared <define>BOOST_FILESYSTEM_VERSION=3 : path_test_v3 ;
+diff --git a/libs/filesystem/test/path_operator_ambiguity.cpp b/libs/filesystem/test/path_operator_ambiguity.cpp
+new file mode 100644
+index 000000000..5a43a63b6
+--- /dev/null
++++ b/libs/filesystem/test/path_operator_ambiguity.cpp
+@@ -0,0 +1,53 @@
++// Copyright Andrey Semashev 2023
++//
++// Use, modification, and distribution is subject to the Boost Software
++// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
++// http://www.boost.org/LICENSE_1_0.txt)
++//
++// See library home page at http://www.boost.org/libs/filesystem
++//
++// This test verifies that a using directive does not introduce operator
++// ambiguity with the standard library.
++// https://github.com/boostorg/filesystem/issues/285
++
++#include <string>
++#include <boost/filesystem.hpp>
++
++using namespace boost::filesystem;
++
++bool test_eq(char* arg)
++{
++ return std::string("abc") == arg;
++}
++
++bool test_ne(char* arg)
++{
++ return std::string("def") != arg;
++}
++
++bool test_lt(char* arg)
++{
++ return std::string("ghi") < arg;
++}
++
++bool test_gt(char* arg)
++{
++ return std::string("jkl") > arg;
++}
++
++bool test_le(char* arg)
++{
++ return std::string("mno") <= arg;
++}
++
++bool test_ge(char* arg)
++{
++ return std::string("pqr") >= arg;
++}
++
++int main(int, char* argv[])
++{
++ return test_eq(argv[0]) + test_ne(argv[0]) +
++ test_lt(argv[0]) + test_gt(argv[0]) +
++ test_le(argv[0]) + test_ge(argv[0]);
++}
diff --git a/srcpkgs/boost/patches/gil-test-failure.patch b/srcpkgs/boost/patches/gil-test-failure.patch
index ae7b57c0a2ec..8774943021c8 100644
--- a/srcpkgs/boost/patches/gil-test-failure.patch
+++ b/srcpkgs/boost/patches/gil-test-failure.patch
@@ -1,7 +1,5 @@
-Index: boost-1.81.0/libs/gil/test/extension/image_processing/hough_parameter.cpp
-===================================================================
---- boost-1.81.0.orig/libs/gil/test/extension/image_processing/hough_parameter.cpp
-+++ boost-1.81.0/libs/gil/test/extension/image_processing/hough_parameter.cpp
+--- a/libs/gil/test/extension/image_processing/hough_parameter.cpp
++++ b/libs/gil/test/extension/image_processing/hough_parameter.cpp
@@ -26,7 +26,8 @@ void from_step_count_test()
for (std::size_t i = 0; i < param.step_count; ++i)
{
@@ -27,14 +25,12 @@ Index: boost-1.81.0/libs/gil/test/extension/image_processing/hough_parameter.cpp
const auto bigger_dim = width > height ? width : height;
const double expected_angle = std::atan2(1.0, bigger_dim);
- BOOST_TEST(expected_angle == gil::minimum_angle_step({width, height}));
-+ BOOST_TEST(std::abs(expected_angle == gil::minimum_angle_step({width, height})) <= 0.00001);
++ BOOST_TEST(std::abs(expected_angle - gil::minimum_angle_step({width, height})) <= 0.00001);
}
int main()
-Index: boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
-===================================================================
---- boost-1.81.0.orig/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
-+++ boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
+--- a/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
++++ b/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
@@ -83,7 +83,10 @@ void test_image_assign_hsl()
float const hue = (x + 1.f) / w;
gil::hsl32f_pixel_t const p(hue, 1.0, v);
@@ -47,10 +43,8 @@ Index: boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsl.cpp
}
}
}
-Index: boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
-===================================================================
---- boost-1.81.0.orig/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
-+++ boost-1.81.0/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
+--- a/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
++++ b/libs/gil/test/extension/toolbox/color_convert_hsv.cpp
@@ -58,7 +58,10 @@ void test_image_assign_hsv()
float const hue = (x + 1.f) / w;
gil::hsv32f_pixel_t const p(hue, 1.0, v);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
index d931a5d41177..a50534a43c6d 100644
--- a/srcpkgs/boost/patches/install-strip-destdir.patch
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -6,7 +6,7 @@ its cmake config. This patch strips $DESTDIR out
of cmake config
--- a/tools/boost_install/boost-install.jam
+++ b/tools/boost_install/boost-install.jam
-@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+@@ -703,6 +703,16 @@ local rule path-native-fwd ( path )
return $(path) ;
}
@@ -23,7 +23,7 @@ of cmake config
local rule get-dir ( name : dir )
{
if [ path.is-rooted $(dir) ]
-@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+@@ -781,6 +791,7 @@ rule generate-cmake-config- ( target : s
if [ path.is-rooted $(cmakedir) ]
{
local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
diff --git a/srcpkgs/boost/patches/iostream-test.patch b/srcpkgs/boost/patches/iostream-test.patch
index f8f736cb55af..38ad90b7b358 100644
--- a/srcpkgs/boost/patches/iostream-test.patch
+++ b/srcpkgs/boost/patches/iostream-test.patch
@@ -1,11 +1,9 @@
-Index: boost-1.81.0/libs/iostreams/test/stream_state_test.cpp
-===================================================================
---- boost-1.81.0.orig/libs/iostreams/test/stream_state_test.cpp
-+++ boost-1.81.0/libs/iostreams/test/stream_state_test.cpp
+--- a/libs/iostreams/test/stream_state_test.cpp
++++ b/libs/iostreams/test/stream_state_test.cpp
@@ -165,7 +165,8 @@ test_suite* init_unit_test_suite(int, ch
#endif
- // MSSTL and libc++ don't handle exceptions from seek correctly
+ // MSSTL and libc++ don't handle exceptions from seekg correctly
-#if !defined(_CPPLIB_VER) && !defined(_LIBCPP_VERSION)
+// libstdc++?
+#if !defined(_CPPLIB_VER) && !defined(_LIBCPP_VERSION) && 0
diff --git a/srcpkgs/boost/patches/ptr-container-failure.patch b/srcpkgs/boost/patches/ptr-container-failure.patch
deleted file mode 100644
index e8f1889c9092..000000000000
--- a/srcpkgs/boost/patches/ptr-container-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/boostorg/ptr_container/issues/36
-Index: boost-1.81.0/libs/ptr_container/test/serialization.cpp
-===================================================================
---- boost-1.81.0.orig/libs/ptr_container/test/serialization.cpp
-+++ boost-1.81.0/libs/ptr_container/test/serialization.cpp
-@@ -203,8 +203,6 @@ void test_serialization_unordered_set_he
- std::remove( fn.c_str() );
-
- BOOST_CHECK_EQUAL( vec.size(), vec2.size() );
-- BOOST_CHECK_EQUAL( (*vec2.begin()).i, -1 );
-- BOOST_CHECK_EQUAL( (*++vec2.begin()).i, 0 );
- }
-
- template< class Map, class OArchive, class IArchive >
diff --git a/srcpkgs/boost/patches/revert-boost-phoenix-104.patch b/srcpkgs/boost/patches/revert-boost-phoenix-104.patch
index 439b201d4c5d..7db361cd9b70 100644
--- a/srcpkgs/boost/patches/revert-boost-phoenix-104.patch
+++ b/srcpkgs/boost/patches/revert-boost-phoenix-104.patch
@@ -1,12 +1,14 @@
-See https://github.com/boostorg/phoenix/issues/111
-Index: boost-1.81.0.beta1/boost/phoenix/stl.hpp
-===================================================================
---- boost-1.81.0.beta1.orig/boost/phoenix/stl.hpp
-+++ boost-1.81.0.beta1/boost/phoenix/stl.hpp
-@@ -11,6 +11,5 @@
-
- #include <boost/phoenix/stl/algorithm.hpp>
- #include <boost/phoenix/stl/container.hpp>
--#include <boost/phoenix/stl/tuple.hpp>
-
- #endif
+https://github.com/boostorg/phoenix/pull/112
+diff --git a/boost/phoenix/stl/tuple.hpp b/boost/phoenix/stl/tuple.hpp
+index a83014ac..d04ad16e 100644
+--- a/boost/phoenix/stl/tuple.hpp
++++ b/boost/phoenix/stl/tuple.hpp
+@@ -110,7 +110,7 @@ namespace boost { namespace phoenix {
+ namespace placeholders {
+ #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
+ #define BOOST_PP_LOCAL_MACRO(N) \
+- auto uarg##N = \
++ const auto uarg##N = \
+ boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
+ #include BOOST_PP_LOCAL_ITERATE()
+ }
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 339ae920ed34..743ed9850772 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
# Template file for 'boost'
pkgname=boost
-version=1.81.0
-revision=2
-_version=${version/beta/b}
+version=1.82.0
+revision=1
+build_style=meta
hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config openmpi"
makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
libzstd-devel openmpi-devel"
@@ -11,10 +11,18 @@ short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="https://www.boost.org/"
-distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
+distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version%.rc*}/source/boost_${version//./_}.tar.bz2"
+checksum=a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6
python_version=3
+# please do NOT delete below lines,
+# upgrade boost requires patching a lot of software,
+# which requires months of planning
+if [ "${version%beta*}" != "$version" ]; then
+ _version=${version/beta/b}
+ distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version%.rc*}/source/boost_${_version//./_}.tar.bz2"
+fi
+
replaces="libboost_program_options1.80>=0 libboost_math_c99f1.80>=0
libboost_stacktrace_basic1.80>=0 libboost_stacktrace_noop1.80>=0
libboost_iostreams1.80>=0 libboost_math_tr1l1.80>=0 libboost_filesystem1.80>=0
@@ -124,7 +132,7 @@ do_check() {
# required by boost::math
mkdir -p .temps
- for _testcase in libs/histogram/test/ libs/*/test/; do
+ for _testcase in libs/gil/test/ libs/*/test/; do
_testcase=${_testcase%/test/}
_component=${_testcase#libs/}
case " $_fail " in
@@ -171,13 +179,12 @@ do_install() {
cd $wrksrc
vconf site-config.jam
- # license
+ # license, not required for binary distribution
vlicense LICENSE_1_0.txt
}
boost-python3_package() {
- depends="boost python3"
- replaces="boost-python3-1.80>=0"
+ depends="python3"
shlib_requires="libpython${py3_ver}${py3_abiver}.so.1.0"
short_desc+=" - Python3 bindings"
pkg_install() {
@@ -185,6 +192,7 @@ boost-python3_package() {
}
}
boost-build_package() {
+ depends="boost"
conf_files="/etc/site-config.jam"
short_desc+=" - Boost.Build utility and framework"
provides="boost-jam-${version}_${revision}"
@@ -209,7 +217,6 @@ boost-devel_package() {
}
libboost_atomic_package() {
- depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
vmove usr/lib/libboost_atomic.so.*
@@ -217,7 +224,6 @@ libboost_atomic_package() {
}
libboost_chrono_package() {
- depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
vmove usr/lib/libboost_chrono.so.*
@@ -225,7 +231,6 @@ libboost_chrono_package() {
}
libboost_container_package() {
- depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
vmove usr/lib/libboost_container.so.*
@@ -233,7 +238,6 @@ libboost_container_package() {
}
libboost_context_package() {
- depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
vmove usr/lib/libboost_context.so.*
@@ -241,7 +245,6 @@ libboost_context_package() {
}
libboost_contract_package() {
- depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
vmove usr/lib/libboost_contract.so.*
@@ -249,7 +252,6 @@ libboost_contract_package() {
}
libboost_coroutine_package() {
- depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
vmove usr/lib/libboost_coroutine.so.*
@@ -257,7 +259,6 @@ libboost_coroutine_package() {
}
libboost_date_time_package() {
- depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
vmove usr/lib/libboost_date_time.so.*
@@ -265,7 +266,6 @@ libboost_date_time_package() {
}
libboost_fiber_package() {
- depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
vmove usr/lib/libboost_fiber.so.*
@@ -273,7 +273,6 @@ libboost_fiber_package() {
}
libboost_filesystem_package() {
- depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
vmove usr/lib/libboost_filesystem.so.*
@@ -281,7 +280,6 @@ libboost_filesystem_package() {
}
libboost_graph_package() {
- depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
vmove usr/lib/libboost_graph.so.*
@@ -289,7 +287,6 @@ libboost_graph_package() {
}
libboost_graph_parallel_package() {
- depends="boost"
short_desc+=" - libboost_graph_parallel"
pkg_install() {
vmove usr/lib/libboost_graph_parallel.so.*
@@ -297,7 +294,6 @@ libboost_graph_parallel_package() {
}
libboost_iostreams_package() {
- depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
vmove usr/lib/libboost_iostreams.so.*
@@ -305,7 +301,6 @@ libboost_iostreams_package() {
}
libboost_locale_package() {
- depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
vmove usr/lib/libboost_locale.so.*
@@ -313,7 +308,6 @@ libboost_locale_package() {
}
libboost_log_package() {
- depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
vmove usr/lib/libboost_log.so.*
@@ -321,7 +315,6 @@ libboost_log_package() {
}
libboost_log_setup_package() {
- depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
vmove usr/lib/libboost_log_setup.so.*
@@ -329,7 +322,6 @@ libboost_log_setup_package() {
}
libboost_math_c99_package() {
- depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
vmove usr/lib/libboost_math_c99.so.*
@@ -337,7 +329,6 @@ libboost_math_c99_package() {
}
libboost_math_c99f_package() {
- depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
vmove usr/lib/libboost_math_c99f.so.*
@@ -345,7 +336,6 @@ libboost_math_c99f_package() {
}
libboost_math_c99l_package() {
- depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
vmove usr/lib/libboost_math_c99l.so.*
@@ -353,7 +343,6 @@ libboost_math_c99l_package() {
}
libboost_json_package() {
- depends="boost"
short_desc+=" - libboost_json"
pkg_install() {
vmove usr/lib/libboost_json.so.*
@@ -361,7 +350,6 @@ libboost_json_package() {
}
libboost_math_tr1_package() {
- depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
vmove usr/lib/libboost_math_tr1.so.*
@@ -369,7 +357,6 @@ libboost_math_tr1_package() {
}
libboost_math_tr1f_package() {
- depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
vmove usr/lib/libboost_math_tr1f.so.*
@@ -377,7 +364,6 @@ libboost_math_tr1f_package() {
}
libboost_math_tr1l_package() {
- depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
vmove usr/lib/libboost_math_tr1l.so.*
@@ -385,7 +371,6 @@ libboost_math_tr1l_package() {
}
libboost_mpi_package() {
- depends="boost"
short_desc+=" - libboost_mpi"
pkg_install() {
vmove usr/lib/libboost_mpi.so.*
@@ -393,7 +378,6 @@ libboost_mpi_package() {
}
libboost_mpi-python3_package() {
- depends="boost"
short_desc+=" - libboost_mpi - Python 3 bindings"
shlib_requires="libpython${py3_ver}${py3_abiver}.so.1.0"
pkg_install() {
@@ -403,7 +387,6 @@ libboost_mpi-python3_package() {
}
libboost_nowide_package() {
- depends="boost"
short_desc+=" - libboost_nowide"
pkg_install() {
vmove usr/lib/libboost_nowide.so.*
@@ -411,7 +394,6 @@ libboost_nowide_package() {
}
libboost_prg_exec_monitor_package() {
- depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
vmove usr/lib/libboost_prg_exec_monitor.so.*
@@ -419,7 +401,6 @@ libboost_prg_exec_monitor_package() {
}
libboost_program_options_package() {
- depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
vmove usr/lib/libboost_program_options.so.*
@@ -427,7 +408,6 @@ libboost_program_options_package() {
}
libboost_random_package() {
- depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
vmove usr/lib/libboost_random.so.*
@@ -435,7 +415,6 @@ libboost_random_package() {
}
libboost_regex_package() {
- depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
vmove usr/lib/libboost_regex.so.*
@@ -443,7 +422,6 @@ libboost_regex_package() {
}
libboost_serialization_package() {
- depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
vmove usr/lib/libboost_serialization.so.*
@@ -451,7 +429,6 @@ libboost_serialization_package() {
}
libboost_stacktrace_addr2line_package() {
- depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
vmove usr/lib/libboost_stacktrace_addr2line.so.*
@@ -459,7 +436,6 @@ libboost_stacktrace_addr2line_package() {
}
libboost_stacktrace_basic_package() {
- depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
vmove usr/lib/libboost_stacktrace_basic.so.*
@@ -467,15 +443,20 @@ libboost_stacktrace_basic_package() {
}
libboost_stacktrace_noop_package() {
- depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
vmove usr/lib/libboost_stacktrace_noop.so.*
}
}
+libboost_sync_package() {
+ short_desc+=" - libboost_sync"
+ pkg_install() {
+ vmove usr/lib/libboost_sync.so.*
+ }
+}
+
libboost_system_package() {
- depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
vmove usr/lib/libboost_system.so.*
@@ -483,7 +464,6 @@ libboost_system_package() {
}
libboost_thread_package() {
- depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
vmove usr/lib/libboost_thread.so.*
@@ -491,7 +471,6 @@ libboost_thread_package() {
}
libboost_timer_package() {
- depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
vmove usr/lib/libboost_timer.so.*
@@ -499,7 +478,6 @@ libboost_timer_package() {
}
libboost_type_erasure_package() {
- depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
vmove usr/lib/libboost_type_erasure.so.*
@@ -507,7 +485,6 @@ libboost_type_erasure_package() {
}
libboost_unit_test_framework_package() {
- depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
vmove usr/lib/libboost_unit_test_framework.so.*
@@ -515,7 +492,6 @@ libboost_unit_test_framework_package() {
}
libboost_url_package() {
- depends="boost"
short_desc+=" - libboost_url"
pkg_install() {
vmove usr/lib/libboost_url.so.*
@@ -523,7 +499,6 @@ libboost_url_package() {
}
libboost_wave_package() {
- depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
vmove usr/lib/libboost_wave.so.*
@@ -531,7 +506,6 @@ libboost_wave_package() {
}
libboost_wserialization_package() {
- depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
vmove usr/lib/libboost_wserialization.so.*
diff --git a/srcpkgs/libboost_sync b/srcpkgs/libboost_sync
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_sync
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From d35a024c4600cef1244d0fcf57e12a11e5ddb183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 11 May 2023 14:02:28 +0700
Subject: [PATCH 76/94] libreoffice: update to 7.5.3.2.
---
srcpkgs/libreoffice/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 496d0f76d0c2..9414ffd34b9b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.5.1.2
-revision=2
+version=7.5.3.2
+revision=1
build_style=meta
make_build_target="build"
nocross="Several dependencies are nocross=yes"
@@ -94,10 +94,10 @@ distfiles="
${_addurl}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
${_addurl}/dragonbox-1.1.3.tar.gz
"
-checksum="920ddd15bc84cf60a33cf0c68bb66a8ded78d150463c15ebaa27cfb7f3a6c0b7
- 0e4e3d6388f9849d91afedac6126e1583c3a809cc28d095c909bf36eb82fd93a
- e9a892fcb7616379efde8724366a8450f7157ce03b8893e385425d6f34f7a8b3
- a3fc9e7b6a8b3cbc853d5bc52cacac773737ec33a2fb4c0a62e08faf1b29b91a
+checksum="14367aeed3a8ae01e17438679d93c4905ca7f9d2f2cb99e716ea297b8af2e048
+ c558daabf366ab9eb26dcae14b25b7ec725817c4dd06205fced685493793d468
+ c9c4edf276c1c024550455b9c98762ab8bfdc1a10df417dd78e469aa8b8baad3
+ aef14e7808c10a78bbb6723029ecafb1e6a693e376ac2260ec935d45c098064f
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
From 08e2509ca440ca88b7beabda50c9416b423f5f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 25 Apr 2023 16:14:41 +0700
Subject: [PATCH 77/94] logstalgia: for boost-1.82
---
srcpkgs/logstalgia/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/logstalgia/template b/srcpkgs/logstalgia/template
index f8a6cc94065e..34363498a6b3 100644
--- a/srcpkgs/logstalgia/template
+++ b/srcpkgs/logstalgia/template
@@ -1,14 +1,14 @@
# Template file for 'logstalgia'
pkgname=logstalgia
version=1.1.4
-revision=2
+revision=3
build_style=gnu-configure
-hostmakedepends="pkg-config"
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
+hostmakedepends="pkg-config"
makedepends="freetype-devel glew-devel SDL2_image-devel boost-devel glm pcre2-devel"
short_desc="Replay or stream website access logs as a retro arcade game"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/acaudwell/Logstalgia/"
distfiles="$homepage/releases/download/$pkgname-$version/$pkgname-$version.tar.gz"
checksum=c049eff405e924035222edb26bcc6c7b5f00a08926abdb7b467e2449242790a9
From 8d004f74a08d5258f833a92096a7235328df2713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:28:32 +0700
Subject: [PATCH 78/94] fcitx5: update to 5.0.23.
---
srcpkgs/fcitx5/patches/no-which.patch | 188 ------------------
.../fcitx5/patches/xbps-src-download.patch | 10 +
srcpkgs/fcitx5/template | 4 +-
3 files changed, 12 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/fcitx5/patches/no-which.patch
create mode 100644 srcpkgs/fcitx5/patches/xbps-src-download.patch
diff --git a/srcpkgs/fcitx5/patches/no-which.patch b/srcpkgs/fcitx5/patches/no-which.patch
deleted file mode 100644
index 4ef85bc54155..000000000000
--- a/srcpkgs/fcitx5/patches/no-which.patch
+++ /dev/null
@@ -1,188 +0,0 @@
---- a/data/fcitx5-configtool.sh
-+++ b/data/fcitx5-configtool.sh
-@@ -5,14 +5,14 @@
-
- export TEXTDOMAIN=fcitx5
-
--if which kdialog > /dev/null 2>&1; then
-+if command -v kdialog > /dev/null 2>&1; then
- message() {
- kdialog --msgbox "$1"
- }
- error() {
- kdialog --error "$1"
- }
--elif which zenity > /dev/null 2>&1; then
-+elif command -v zenity > /dev/null 2>&1; then
- message() {
- zenity --info --text="$1"
- }
-@@ -28,7 +28,7 @@ else
- }
- fi
-
--if which gettext > /dev/null 2>&1; then
-+if command -v gettext > /dev/null 2>&1; then
- _() {
- gettext "$@"
- }
-@@ -108,7 +108,7 @@ detectDE() {
- if [ x"$DE" = x"gnome" ]; then
- # gnome-default-applications-properties is only available in GNOME 2.x
- # but not in GNOME 3.x
-- which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3"
-+ command -v gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome3"
- fi
- }
-
-@@ -119,7 +119,7 @@ run_kde() {
- }
-
- run_qt() {
-- if which fcitx5-config-qt > /dev/null 2>&1; then
-+ if command -v fcitx5-config-qt > /dev/null 2>&1; then
- exec fcitx5-config-qt
- fi
- return 1
-@@ -135,13 +135,13 @@ run_xdg() {
- ;;
- esac
-
-- if command="$(which xdg-open 2>/dev/null)"; then
-+ if command="$(command -v xdg-open 2>/dev/null)"; then
- exec "$command" "$HOME/.config/fcitx5"
- fi
- }
-
- _which_cmdline() {
-- cmd="$(which "$1")" || return 1
-+ cmd="$(command -v "$1")" || return 1
- shift
- echo "$cmd $*"
- }
---- a/data/fcitx5-diagnose.sh
-+++ b/data/fcitx5-diagnose.sh
-@@ -123,7 +123,7 @@ __get_pretty_name() {
- fi
- }
-
--fcitx_exe="$(which fcitx5 2> /dev/null)"
-+fcitx_exe="$(command -v fcitx5 2> /dev/null)"
-
- __conf_dir_init() {
- # Don't do any fancy check here, it's the user's fault, which we should detect
-@@ -214,9 +214,9 @@ if type dbus-send &> /dev/null; then
- /controller org.fcitx.Fcitx.Controller1.DebugInfo 2> /dev/null) || return 1
- echo -n "${debuginfo}"
- }
--elif qdbus_exe=$(which qdbus 2> /dev/null) || \
-- qdbus_exe=$(which qdbus-qt4 2> /dev/null) || \
-- qdbus_exe=$(which qdbus-qt5 2> /dev/null); then
-+elif qdbus_exe=$(command -v qdbus 2> /dev/null) || \
-+ qdbus_exe=$(command -v qdbus-qt4 2> /dev/null) || \
-+ qdbus_exe=$(command -v qdbus-qt5 2> /dev/null); then
- dbus_exe=${qdbus_exe}
- dbus_get_name_owner() {
- "${qdbus_exe}" org.freedesktop.DBus /org/freedesktop/DBus \
-@@ -345,15 +345,15 @@ detectDE() {
- if [ x"$DE" = x"gnome" ]; then
- # gnome-default-applications-properties is only available in GNOME 2.x
- # but not in GNOME 3.x
-- which gnome-default-applications-properties > /dev/null 2>&1 || \
-+ command -v gnome-default-applications-properties > /dev/null 2>&1 || \
- DE="gnome3"
-- which gnome-shell &> /dev/null && DE="gnome3"
-+ command -v gnome-shell &> /dev/null && DE="gnome3"
- fi
- }
-
- maybe_gnome3() {
- [[ $DE = gnome3 ]] && return 0
-- [[ $DE = generic ]] && which gnome-shell &> /dev/null && return 0
-+ [[ $DE = generic ]] && command -v gnome-shell &> /dev/null && return 0
- return 1
- }
-
-@@ -362,7 +362,7 @@ detectDE
- # user and uid
-
- detect_user() {
-- if which id &> /dev/null; then
-+ if command -v id &> /dev/null; then
- cur_user=$(id -un)
- cur_uid=$(id -u)
- else
-@@ -373,7 +373,7 @@ detect_user() {
- else
- cur_uid=""
- fi
-- if which whoami &> /dev/null; then
-+ if command -v whoami &> /dev/null; then
- cur_user=$(whoami)
- elif [[ -d /proc/$$/ ]]; then
- cur_user=$(stat -c %U /proc/$$/)
-@@ -395,7 +395,7 @@ _check_open_root() {
- for f in /proc/1/environ /proc/1/mem /proc/kcore /proc/kmem; do
- try_open "$f" && return 0
- done
-- if which readlink &> /dev/null; then
-+ if command -v readlink &> /dev/null; then
- for f in /proc/1/exe /proc/1/cwd /proc/1/root; do
- readlink "$f" &> /dev/null && return 0
- done
-@@ -992,7 +992,7 @@ _find_config_gtk() {
- return 0
- }
- local config_gtk
-- config_gtk="$(which "fcitx5-config-gtk" 2> /dev/null)" || return 1
-+ config_gtk="$(command -v "fcitx5-config-gtk" 2> /dev/null)" || return 1
- echo "${config_gtk}"
- _config_tool_gtk_exe="${config_gtk}"
- }
-@@ -1019,7 +1019,7 @@ _check_config_gtk() {
- local version=$1
- local config_gtk config_gtk_name
- write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}"
-- if ! config_gtk="$(which "fcitx5-config-gtk${version}" 2> /dev/null)"; then
-+ if ! config_gtk="$(command -v "fcitx5-config-gtk${version}" 2> /dev/null)"; then
- if ! _check_config_gtk_version "${version}"; then
- write_error_eval \
- "$(_ 'Config GUI for gtk${1} not found.')" "${version}"
-@@ -1040,7 +1040,7 @@ _check_config_qt() {
- local config_qt config_qt_name
- config_qt_name="fcitx5-config-qt"
- write_order_list_eval "$(_ 'Config GUI for qt:')" "${version}"
-- if ! config_qt="$(which "${config_qt_name}" 2> /dev/null)"; then
-+ if ! config_qt="$(command -v "${config_qt_name}" 2> /dev/null)"; then
- write_error "$(_ 'Config GUI for qt not found.')"
- return 1
- fi
-@@ -1053,7 +1053,7 @@ _check_config_kcm() {
- local version=$1
- local kcm_shell config_kcm
- write_order_list "$(_ 'Config GUI for kde:')"
-- if ! kcm_shell="$(which "kcmshell${version}" 2> /dev/null)"; then
-+ if ! kcm_shell="$(command -v "kcmshell${version}" 2> /dev/null)"; then
- write_error "$(print_not_found "kcmshell${version}")"
- return 1
- fi
-@@ -1069,7 +1069,7 @@ check_config_ui() {
- local IFS=$'\n'
- write_title 1 "$(_ 'Fcitx Configure UI:')"
- write_order_list "$(_ 'Config Tool Wrapper:')"
-- if ! fcitx_configtool="$(which fcitx5-configtool 2> /dev/null)"; then
-+ if ! fcitx_configtool="$(command -v fcitx5-configtool 2> /dev/null)"; then
- write_error_eval "$(_ 'Cannot find ${1} executable!')" fcitx5-configtool
- else
- write_eval "$(_ 'Found ${1} at ${2}.')" \
---- a/test/xvfb_wrapper.sh
-+++ b/test/xvfb_wrapper.sh
-@@ -20,7 +20,7 @@ finish()
-
- trap finish EXIT
-
--if which xprop >/dev/null 2>&1; then
-+if command -v xprop >/dev/null 2>&1; then
- i=1
- while [ "$i" -lt 5 ]; do
- if xprop -root >/dev/null 2>&1; then
diff --git a/srcpkgs/fcitx5/patches/xbps-src-download.patch b/srcpkgs/fcitx5/patches/xbps-src-download.patch
new file mode 100644
index 000000000000..2a380fb64459
--- /dev/null
+++ b/srcpkgs/fcitx5/patches/xbps-src-download.patch
@@ -0,0 +1,10 @@
+--- a/src/lib/fcitx-utils/Fcitx5Download.cmake.in
++++ b/src/lib/fcitx-utils/Fcitx5Download.cmake.in
+@@ -1,4 +1,7 @@
+ if (NOT EXISTS "@FCITX5_DOWNLOAD_DEST@")
++ if (DEFINED ENV{XBPS_MACHINE})
++ message(FATAL_ERROR "Downloading @FCITX5_DOWNLOAD_URL@ is forbidden inside xbps-src")
++ endif()
+ message(STATUS "Downloading '@FCITX5_DOWNLOAD_URL@' to '@FCITX5_DOWNLOAD_DEST@'...")
+ file(DOWNLOAD
+ "@FCITX5_DOWNLOAD_URL@"
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index 88a52d3063d6..1a6a84562397 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5'
pkgname=fcitx5
-version=5.0.21
+version=5.0.23
revision=1
build_style=cmake
build_helper=qemu
@@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
_en_dict_ver=20121020
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
-checksum="4e31c3ae5588134e2ef33494d6f71aa047a5c407edbcba27b016a74567308dbe
+checksum="04f209a6406225ce19785f8d9d3bdb253944586edcfa9601414fcdda8a1b13a0
c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
skip_extraction=en_dict-${_en_dict_ver}.tar.gz
lib32disabled=yes
From 4bab4d1a5dc825e59f602281886019e34f38318d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:28:38 +0700
Subject: [PATCH 79/94] fcitx5-anthy: update to 5.0.14.
---
.../fcitx5-anthy/patches/fix-build-musl.patch | 18 ------------------
srcpkgs/fcitx5-anthy/template | 4 ++--
2 files changed, 2 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch
diff --git a/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch b/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch
deleted file mode 100644
index bc19b7c5c406..000000000000
--- a/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: fcitx5-anthy-5.0.4/src/utils.h
-===================================================================
---- fcitx5-anthy-5.0.4.orig/src/utils.h
-+++ fcitx5-anthy-5.0.4/src/utils.h
-@@ -28,11 +28,11 @@ bool key_is_keypad(const fcitx::Key &key
- std::string keypad_to_string(const fcitx::KeyEvent &key);
- void launch_program(std::string command);
-
--bool surrounding_get_safe_delta(uint from, uint to, int32_t *delta);
-+bool surrounding_get_safe_delta(unsigned from, unsigned to, int32_t *delta);
-
- bool surrounding_get_anchor_pos_from_selection(
- const std::string &surrounding_text, const std::string &selected_text,
-- uint cursor_pos, uint *anchor_pos);
-+ unsigned cursor_pos, unsigned *anchor_pos);
-
- inline char get_ascii_code(const fcitx::Key &key) {
- auto chr = fcitx::Key::keySymToUnicode(key.sym());
diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 9492882522a7..653a78bb8f45 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-anthy'
pkgname=fcitx5-anthy
-version=5.0.13
+version=5.0.14
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
-checksum=106a7262235a966e049f739afbe8723923cb8636e455c0f266ddcba9a99f48e2
+checksum=0a874d70df4ef22f1eb868c27eaf66e3354e1609db8ded392544f8f6bc54a7b7
fcitx5-anthy-icons_package() {
short_desc+=" - icons"
From 86b4add13b2adf2794e89c61fe57e87763b4ba2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:28:42 +0700
Subject: [PATCH 80/94] fcitx5-chewing: update to 5.0.14.
---
srcpkgs/fcitx5-chewing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
index d46eb2f53618..33bbfff524eb 100644
--- a/srcpkgs/fcitx5-chewing/template
+++ b/srcpkgs/fcitx5-chewing/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-chewing'
pkgname=fcitx5-chewing
-version=5.0.13
+version=5.0.14
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz"
-checksum=5967dca77a6f12344a1028d699139613d08f8ce24123b4fb03e9877dbe15ed02
+checksum=7000d66a341e3bdb5bdf8c948c20bf1b6f4cb08b458d13d4d3c2e3fd6e30e6f8
lib32disabled=yes
fcitx5-chewing-icons_package() {
From 3c1f024539a811140b76dc98712c1cb591ef8dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:28:50 +0700
Subject: [PATCH 81/94] fcitx5-chinese-addons: update to 5.0.17.
---
srcpkgs/fcitx5-chinese-addons/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index 7e9b8a24eedd..63829a2d3063 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
-version=5.0.16
-revision=2
+version=5.0.17
+revision=1
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
@@ -17,7 +17,7 @@ _pystroke_version=20121124
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
-checksum="a46a66cc203ce34d473a2d6a9c742984378faa2b1a3678d6208b3d35c2bafcf0
+checksum="9822aeac6b772d38df8bca4f806798d0cef8e8493cc601ddbe060b50b6f75f46
42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
skip_extraction="
From 80adfbaf515c883e68841ac4fc7d05cc565bb3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:28:56 +0700
Subject: [PATCH 82/94] fcitx5-configtool: update to 5.0.17.
---
srcpkgs/fcitx5-configtool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index 59ee0e6c406e..768e536c5133 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-configtool'
pkgname=fcitx5-configtool
-version=5.0.16
+version=5.0.17
revision=1
build_style=cmake
configure_args="-DENABLE_KCM=ON -DENABLE_CONFIG_QT=ON -DENABLE_TEST=ON"
@@ -19,7 +19,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
-checksum=ee2bce5a65508b804ac8eb6b2ec06b200ed548e0ea830d2d01b956352bf4c81a
+checksum=f8b6196d23d14a6acc9a2b3dbc3772b6e5b2e3a5147b78b649238a3d775786d5
lib32disabled=yes
post_install() {
From 585f13b401d24344fab2760dffab25085b3354fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:02 +0700
Subject: [PATCH 83/94] fcitx5-gtk: update to 5.0.23.
---
srcpkgs/fcitx5-gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index f5f42dde3c5e..6d5d0605a749 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-gtk'
pkgname=fcitx5-gtk
-version=5.0.21
+version=5.0.23
revision=1
build_style=cmake
build_helper=gir
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=12375289971e5b95d358238f7737cc97d05a27874b33af7019e8599b924e2011
+checksum=ad124ce7f1bbca650dda47cb73c5572913419513eacf9ebe84c9f6753c920868
lib32disabled=yes
build_options="gir"
From cab40ecb8ae0ceff5ffba54de431a5f777520e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:07 +0700
Subject: [PATCH 84/94] fcitx5-hangul: update to 5.0.11.
---
srcpkgs/fcitx5-hangul/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
index 9f515573712c..2796d4203b7f 100644
--- a/srcpkgs/fcitx5-hangul/template
+++ b/srcpkgs/fcitx5-hangul/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-hangul'
pkgname=fcitx5-hangul
-version=5.0.10
+version=5.0.11
revision=1
build_style=cmake
hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz"
-checksum=35d9233d3904c47abaf8d58910e183e351c7a657dd9d1964acd8fce4109d2bb9
+checksum=6894702e73ef431c7699698b55421494419383170b502aa98209a7eff3fdd0d3
lib32disabled=yes
fcitx5-hangul-icons_package() {
From 5aa8b7233b512a850172f146f673dc899a910cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:12 +0700
Subject: [PATCH 85/94] fcitx5-qt: update to 5.0.17.
---
srcpkgs/fcitx5-qt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index 2db07188cc1c..ee483190bc8a 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-qt'
pkgname=fcitx5-qt
-version=5.0.16
+version=5.0.17
revision=1
build_style=cmake
configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
-checksum=583ac1055f4bba32a60a41b502b8125409f3f424b2228d9b643c266180a04af3
+checksum=4268e7a1277692a79dcff08e662d1e74407e598a61d3d0386bc64a51809e91f4
lib32disabled=yes
post_install() {
From be7c1d8f7e3aab78245843ddb7a9820b2cbee1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:18 +0700
Subject: [PATCH 86/94] fcitx5-rime: update to 5.0.16.
---
srcpkgs/fcitx5-rime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index 9ea510625429..9173ad893952 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-rime'
pkgname=fcitx5-rime
-version=5.0.15
+version=5.0.16
revision=1
build_style=cmake
configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
-checksum=705210aca13ef19fc5fa9223791eba8cc2d5d485b2094e075bda0414189c0263
+checksum=5076d90b95d67bde6beffb48a3c9d643c60f54e82dc6e7243eb794cada8c7834
lib32disabled=yes
fcitx5-rime-icons_package() {
From a43bea92709f7d7a2326347f4cd3e227f0de07cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:25 +0700
Subject: [PATCH 87/94] fcitx5-table-extra: update to 5.0.13.
---
srcpkgs/fcitx5-table-extra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index f1dd248d1822..cba0aac14413 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-table-extra'
pkgname=fcitx5-table-extra
-version=5.0.12
+version=5.0.13
revision=1
build_style=cmake
hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="Public Domain"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
-checksum=9a202b608c64f4733e940e479b403b3b63c68e531324cd20f9dac81d27bbe977
+checksum=6aec03e6cb1408d8447898226132e7226071535c0584e35e04159e4c5f74a016
From 7db6dbb80bb101b6d5fc856bc3741941b40c8d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:31 +0700
Subject: [PATCH 88/94] fcitx5-table-other: update to 5.0.11.
---
srcpkgs/fcitx5-table-other/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
index 2ba318f70da4..d83454814928 100644
--- a/srcpkgs/fcitx5-table-other/template
+++ b/srcpkgs/fcitx5-table-other/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-table-other'
pkgname=fcitx5-table-other
-version=5.0.10
+version=5.0.11
revision=1
build_style=cmake
hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz"
-checksum=cb4d4231878eb4b1fe60994e091b4279c8810b518f7da45630d5dfac7f2daa51
+checksum=3f61b7f0364cb7149eaeaeac6fce3d00ab72d6cb5bb884760a41d4738df3244c
From 18d9a0ed2a82e5b67226c5650a9d3efe44a5f69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:36 +0700
Subject: [PATCH 89/94] fcitx5-unikey: update to 5.0.13.
---
srcpkgs/fcitx5-unikey/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index 3c0571ba7e28..962e30d790fc 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-unikey'
pkgname=fcitx5-unikey
-version=5.0.12
+version=5.0.13
revision=1
build_style=cmake
#configure_args=""
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=80f3e7329b2871fea51bb750e1107870b9864ac153ef6eabd11710e19e63ae89
+checksum=7e6db370927d5c76782c129fe39c142c83f85bc2abfd1d599bc91364b473d78e
conflicts="fcitx-unikey>=0"
fcitx5-unikey-macro-editor_package() {
From ccef43c26758afc0c9b71c91242fafff6fc3fbcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 14:29:43 +0700
Subject: [PATCH 90/94] fcitx5-zhuyin: update to 5.0.12.
---
srcpkgs/fcitx5-zhuyin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
index eb5695dff280..80228061da1f 100644
--- a/srcpkgs/fcitx5-zhuyin/template
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-zhuyin'
pkgname=fcitx5-zhuyin
-version=5.0.11
-revision=2
+version=5.0.12
+revision=1
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
@@ -13,7 +13,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx"
_model_version=20161206
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz
https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz"
-checksum="f4aa14ae98700ce001add589f2ec79b2faa97b7000ba6162bd8f19f7b236af71
+checksum="5d9b9f78d2992c672e5bd85a2a89397f02d56dfb48134733ee4d408c96e110b8
5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704"
skip_extraction="model.text.${_model_version}.tar.gz"
lib32disabled=yes
From 5f663e55a5269e0e2c8f5142766eafa8d206f990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:21 +0700
Subject: [PATCH 91/94] libime: update to 1.0.17.
---
srcpkgs/libime/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index 93b7c6c59194..dcf29ea8959e 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,6 +1,6 @@
# Template file for 'libime'
pkgname=libime
-version=1.0.16
+version=1.0.17
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
https://download.fcitx-im.org/data/${_lm_sc}
https://download.fcitx-im.org/data/${_dict}
https://download.fcitx-im.org/data/table.tar.gz"
-checksum="07b1518f41747f0bff988135892da4b6d29b4b5a336bdf86361acbbce30a6608
+checksum="23f87b8104b9161bdc41fbac44294fef825d586260afc698f6a85ff20ea65407
a11bc97d275adaf195f9bac854368ae06cdb4a0fe1eecf59db5ae580615db4fa
971752f413188007e8d19158c11b85c955e25d7b321ec2275c4b3af6d8a85d26
6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
From e69377d1360989426b8fd7f8a18c5b5ef1d5b8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:36 +0700
Subject: [PATCH 92/94] libime-jyutping: update to 1.0.6.
---
srcpkgs/libime-jyutping/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 8dc8415e6017..aa2e219ae572 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,6 +1,6 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
-version=1.0.5
+version=1.0.6
revision=1
build_style=cmake
build_helper=qemu
@@ -16,7 +16,7 @@ _model_version=20180103
distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz
https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz
https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz"
-checksum="316e6b485f428536abaab9d7ec45a2a0179447725f2c8b8066accbf84f4ebc3a
+checksum="3ba22518003650f9608870ace491b9bd48eef449bb763a5f8919c8e294716499
e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
skip_extraction="jyutping-dict-${_dict_version}.tar.xz
From 51535bf039663f3be291bf2c7e2faaa978182e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:40:36 +0700
Subject: [PATCH 93/94] xcb-imdkit: update to 1.0.5.
---
srcpkgs/xcb-imdkit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
index b2e8947fe7d7..5700eec00567 100644
--- a/srcpkgs/xcb-imdkit/template
+++ b/srcpkgs/xcb-imdkit/template
@@ -1,6 +1,6 @@
# Template file for 'xcb-imdkit'
pkgname=xcb-imdkit
-version=1.0.4
+version=1.0.5
revision=1
build_style=cmake
hostmakedepends="pkg-config extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-only"
homepage="https://github.com/fcitx/xcb-imdkit"
distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz"
-checksum=824f6dd0c259a90314f628f7f4219465a413fb0d7651722b9f39bf8430ced0c9
+checksum=373fcd26d99254b1260fd0254bcea1d346e1061cc5707f4d71b4a091418f03cc
post_install() {
sed -i '/prefix=/!s,/usr,${exec_prefix},' \
From ef384f2ab6ab9502d07c261328de2ed20448608f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 25 Apr 2023 16:14:30 +0700
Subject: [PATCH 94/94] *: revbump for boost-1.82
---
srcpkgs/0ad/template | 2 +-
srcpkgs/Aegisub/template | 2 +-
srcpkgs/Field3D/template | 2 +-
srcpkgs/LGOGDownloader/template | 2 +-
srcpkgs/Lucene++/template | 2 +-
srcpkgs/PrusaSlicer/template | 2 +-
srcpkgs/TSC/template | 2 +-
srcpkgs/astroid/template | 2 +-
srcpkgs/bastet/template | 2 +-
srcpkgs/bitcoin/template | 2 +-
srcpkgs/blender/template | 2 +-
srcpkgs/cclive/template | 2 +-
srcpkgs/cgal/template | 2 +-
srcpkgs/codeblocks/template | 2 +-
srcpkgs/colobot/template | 2 +-
srcpkgs/cpp-hocon/template | 2 +-
srcpkgs/cryfs/template | 2 +-
srcpkgs/eclib/template | 2 +-
srcpkgs/facter/template | 2 +-
srcpkgs/fifengine/template | 2 +-
srcpkgs/freecad/template | 2 +-
srcpkgs/freeorion/template | 2 +-
srcpkgs/gnucash/template | 2 +-
srcpkgs/gnuradio-osmosdr/template | 2 +-
srcpkgs/gnuradio-rds/template | 2 +-
srcpkgs/gnuradio/template | 2 +-
srcpkgs/gource/template | 2 +-
srcpkgs/grive2/template | 2 +-
srcpkgs/guitarix2/template | 2 +-
srcpkgs/heaptrack/template | 2 +-
srcpkgs/hugin/template | 2 +-
srcpkgs/i2pd/template | 2 +-
srcpkgs/icinga2/template | 2 +-
srcpkgs/imagescan/template | 2 +-
srcpkgs/imath/template | 2 +-
srcpkgs/inkscape/template | 2 +-
srcpkgs/innoextract/template | 2 +-
srcpkgs/juCi++/template | 2 +-
srcpkgs/kea/template | 2 +-
srcpkgs/kig/template | 2 +-
srcpkgs/leatherman/template | 2 +-
srcpkgs/ledger/template | 2 +-
srcpkgs/libbitcoin-blockchain/template | 2 +-
srcpkgs/libbitcoin-client/template | 2 +-
srcpkgs/libbitcoin-database/template | 2 +-
srcpkgs/libbitcoin-explorer/template | 2 +-
srcpkgs/libbitcoin-network/template | 2 +-
srcpkgs/libbitcoin-node/template | 2 +-
srcpkgs/libbitcoin-protocol/template | 2 +-
srcpkgs/libbitcoin-server/template | 2 +-
srcpkgs/libbitcoin-system/template | 2 +-
srcpkgs/libcmis/template | 2 +-
srcpkgs/libixion/template | 2 +-
srcpkgs/liborcus/template | 2 +-
srcpkgs/libphonenumber/template | 2 +-
srcpkgs/librime/template | 2 +-
srcpkgs/libtorrent-rasterbar/template | 2 +-
srcpkgs/litecoin/template | 2 +-
srcpkgs/mkvtoolnix/template | 2 +-
srcpkgs/monero-gui/template | 2 +-
srcpkgs/monero/template | 2 +-
srcpkgs/mupen64plus/template | 2 +-
srcpkgs/namecoin/template | 2 +-
srcpkgs/ncmpcpp/template | 2 +-
srcpkgs/opencamlib/template | 2 +-
srcpkgs/openimageio/template | 2 +-
srcpkgs/openmw/template | 2 +-
srcpkgs/openscad/template | 2 +-
srcpkgs/openvdb/template | 2 +-
srcpkgs/osm2pgsql/template | 2 +-
srcpkgs/poedit/template | 2 +-
srcpkgs/povray/template | 2 +-
srcpkgs/pulseeffects-legacy/template | 2 +-
srcpkgs/pulseview/template | 2 +-
srcpkgs/remwharead/template | 2 +-
srcpkgs/rstudio/template | 2 +-
srcpkgs/schroot/template | 2 +-
srcpkgs/snapper/template | 2 +-
srcpkgs/source-highlight/template | 2 +-
srcpkgs/supercollider/template | 2 +-
srcpkgs/supertux2/template | 2 +-
srcpkgs/swiften/template | 2 +-
srcpkgs/syncthingtray/template | 2 +-
srcpkgs/tmfs/template | 2 +-
srcpkgs/tomahawk/template | 2 +-
srcpkgs/uhd/template | 2 +-
srcpkgs/wesnoth/template | 2 +-
srcpkgs/wsjtx/template | 2 +-
88 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 8ad54317f15e..f085facb1fdd 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.26
-revision=4
+revision=5
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 64f141ed6dd6..7a2bf765d3af 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=7
+revision=8
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 5e430c0d86e4..6e4a351327ae 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=6
+revision=7
build_style=cmake
makedepends="boost-devel hdf5-devel imath-devel libopenexr-devel"
short_desc="Library for storing voxel data on disk and in memory"
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index fd0f265685bc..f9d281820035 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=4
+revision=5
build_style=cmake
configure_args="$(vopt_bool qt USE_QT_GUI)"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 287271b6b8fe..5cbc5262c63a 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=13
+revision=14
build_style=cmake
configure_args="-Wno-dev"
makedepends="boost-devel gtest-devel"
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..e645926e76f7 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=4
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 6ae1f4fbfbd3..86ac15a7a2e3 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=4
+revision=5
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index c9deaa7548c7..25d3da44e024 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=7
+revision=8
build_style=cmake
build_helper=gir
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
diff --git a/srcpkgs/bastet/template b/srcpkgs/bastet/template
index 4de219d38955..fabf4b51d5c7 100644
--- a/srcpkgs/bastet/template
+++ b/srcpkgs/bastet/template
@@ -1,7 +1,7 @@
# Template file for 'bastet'
pkgname=bastet
version=0.43.2
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=yes
makedepends="boost-devel ncurses-devel"
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 83c404962c30..cf464ce35c46 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 61b42eb2e51e..d18bc88838ff 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.4.1
-revision=3
+revision=4
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index 2c8c56ff7110..365246f9ba33 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 5079bea9217b..272ad67aed14 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=5
+revision=6
build_style=cmake
build_helper="qemu"
makedepends="boost-devel eigen mpfr-devel"
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 8aa7529a7bf2..af2c062d43c9 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,7 +1,7 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index f0ab974ea202..bc73eac1cf88 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
hostmakedepends="gettext librsvg-utils perl po4a xmlstarlet"
diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template
index 7e344c3d19c2..189bd97e8d1e 100644
--- a/srcpkgs/cpp-hocon/template
+++ b/srcpkgs/cpp-hocon/template
@@ -1,7 +1,7 @@
# Template file for 'cpp-hocon'
pkgname=cpp-hocon
version=0.3.0
-revision=6
+revision=7
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 2167f25c54bc..58d4fdd5d7d7 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.2
-revision=3
+revision=4
create_wrksrc=yes
build_style=cmake
configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 9faf35e9f42f..b20fb852a5ba 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20230424
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
makedepends="pari-devel ntl-devel flintlib-devel boost-devel"
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 22c3e97a242a..56eb4c3dca73 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=6
+revision=7
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 814e68990dbd..b5cf789320c3 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=11
+revision=12
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index f62023ee8ce4..e301f32d3540 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.2
-revision=3
+revision=4
build_style=cmake
_inst_prefix=/usr/lib/${pkgname}
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index d4c079dd3af0..c57e2ccc0359 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=5
+revision=6
_release=${version}_2021-08-01.f663dad
build_style=cmake
hostmakedepends="cppcheck doxygen python3-pycodestyle"
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 3b3d1a4390e2..c648d0bff35d 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.13
-revision=2
+revision=3
build_style=cmake
make_check_target=check
configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index c8680ff1d478..a4cb14a2ac1e 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
-revision=1
+revision=2
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 09a928d3759b..b1bc96848bf8 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=6
+revision=7
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 7c74168e8f59..3308afa6e2c3 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.5.1
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index ff427d1f2751..453e7e328f27 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.54
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index f29c4aa90cc1..5c524f78958d 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.3
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 1aa3c491db87..6a294f6b962f 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.44.1
-revision=1
+revision=2
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
$(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index 74bc604993a5..7388dd050647 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index a8ab70e7eb5b..19cee114c73a 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2022.0.0
-revision=5
+revision=6
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 209f52225e96..237ee28d4db8 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.46.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 8eeec55181d7..ea12ab75e114 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=8
+revision=9
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index baf4f27023c2..9a4101e582a6 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
index 6570b51fbf69..ee47207a3e51 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
# Template file for 'imath'
pkgname=imath
version=3.1.7
-revision=1
+revision=2
build_style=cmake
configure_args="-DPYTHON=ON"
hostmakedepends="python3-numpy"
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 2e434be00841..870a4512a8e0 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=7
+revision=8
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index d468c0f0a51a..7d2e50b62245 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules"
makedepends="boost-devel liblzma-devel"
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=3
+revision=4
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5ab6b9199976..b0167032b111 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=2.2.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 378da975c2ce..e479f46c3bea 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.12.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index 16dcefe1852b..d0e44a5e970c 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=5
+revision=6
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index 9b5c1b6d0ce4..53335b1671e9 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=3
+revision=4
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 5127fd26bc64..9afd8560a287 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=9
+revision=10
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 423b6d8d8109..e2bdc9933ec8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 78ccb8e6ea40..552a1eee211c 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=9
+revision=10
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 13bf082be10b..dfe13ab89d3c 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 81964af81a3f..2600e50c6096 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 07a4051a038e..bbf5ee272453 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=9
+revision=10
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index fcd902174bf4..9458a9b2836b 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index e2b5d9550f57..186bf2befbcc 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=9
+revision=10
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 81e1bf29918b..ac13e044c276 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index aadba05fd19d..80239ba34f9a 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index e44c9f9dc9c4..91f9956b0448 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index 571429c9cd81..276b3b3a5989 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 767c0ec9a7a7..0af9ced1bcff 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=10
+revision=11
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index b9916393765f..f4736e3b712d 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=6
+revision=7
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 745f4b043a70..b34c92df1ee2 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.18
-revision=2
+revision=3
build_style=cmake
configure_args="-Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON -Dbuild_tests=ON"
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index b92b4dc9ad54..a7ed18603c20 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=10
+revision=11
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 3cc62053b26d..27c83737e430 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=75.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 46668d1a9a85..3a60a8d91b0f 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=3
+revision=4
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 311324873e82..93a3c82fe4d6 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=3
+revision=4
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 1d93ec87c24d..9f8e98249408 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=5
+revision=6
archs="x86_64* i686*"
hostmakedepends="pkg-config which nasm"
makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index de76d4464b29..5a77aabf8e5a 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index e9958d9043ba..a66f5f7e9e0c 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=8
+revision=9
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index a04c5eb69f60..704b13d1da61 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=8
+revision=9
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b661bbf7ba57..9b38ace50f7e 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.4.9.0
-revision=2
+revision=3
build_style=cmake
build_helper=qemu
configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 5251a0283dc1..e3771c7aaf1a 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=4
+revision=5
build_style=cmake
_recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea
_bullet_tag=3.17
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 12d7cfbdeeb8..a31b34b5fe39 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=4
+revision=5
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index d8ef5b4496b9..0084a3cb85ba 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index c3cd45f42116..4281609e911b 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 813e7af7f95e..ed5827782484 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.2.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 5ae25f1363f5..e7cf16f4b089 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=8
+revision=9
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 72b296eb9575..ca614d7a5eae 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=5
+revision=6
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
makedepends="boost-devel gsettings-desktop-schemas-devel
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index a2520301eda7..0eb44a822c46 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=4
+revision=5
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 4af548c46743..12366e47c006 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=5
+revision=6
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index d667cb554e79..bf4826d62773 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=5
+revision=6
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index 36f6ee83b9a9..e6f6b9f171ad 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -2,7 +2,7 @@
pkgname=schroot
reverts="1.7.2_9"
version=1.6.10
-revision=14
+revision=15
_debian_version=12+deb11u1
build_style=cmake
configure_args="
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 64498d5f7ed4..07a8e34530f9 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index 216f1c89f534..5a8a4ac60d38 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 4b4326be2013..42b58d5b6e3e 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=5
+revision=6
build_style=cmake
make_cmd=make
configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 8611f947722f..2fa412a4199f 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=3
+revision=4
build_style=cmake
configure_args="
-DAPPDATADIR=/usr/share/supertux2
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 4b02da4cd80b..ad439860c881 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,7 +1,7 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=4
+revision=5
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 049eb1aebde9..55d1086bd533 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.4.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 8e6f44d3b5f0..af0dcf154082 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=9
+revision=10
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 5b251d6a464f..341645af8e44 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=23
+revision=24
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
configure_args="-Wno-dev -DBUILD_RELEASE=ON \
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 954a08055844..46731dcdaf03 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=3
+revision=4
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 9b0397647569..2d12c4038b9c 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 20bc4737410d..44310303ab59 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.6.1
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE=
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] zoxide: update to 0.9.1
2023-05-07 17:20 [PR PATCH] zoxide: update to 0.9.1 RAR27
` (2 preceding siblings ...)
2023-05-11 20:24 ` RAR27
@ 2023-05-11 20:26 ` RAR27
2023-06-09 7:48 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: RAR27 @ 2023-05-11 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
There is an updated pull request by RAR27 against master on the void-packages repository
https://github.com/RAR27/void-packages zoxide
https://github.com/void-linux/void-packages/pull/43792
zoxide: update to 0.9.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zoxide-43792.patch --]
[-- Type: text/x-diff, Size: 1053 bytes --]
From e0f7dec2b98ce3d4bcfd5e6b634901027d512028 Mon Sep 17 00:00:00 2001
From: Rehan <rehanalirana@tuta.io>
Date: Sun, 7 May 2023 13:15:48 -0400
Subject: [PATCH] zoxide: update to 0.9.1
---
srcpkgs/zoxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 37ed24b2ae25..7c7b04e3c08d 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
# Template file for 'zoxide'
pkgname=zoxide
-version=0.9.0
+version=0.9.1
revision=1
build_style=cargo
short_desc="Faster way to navigate your filesystem"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://github.com/ajeetdsouza/zoxide"
changelog="https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/CHANGELOG.md"
distfiles="https://github.com/ajeetdsouza/zoxide/archive/refs/tags/v${version}.tar.gz"
-checksum=16f7e0ddb7ab52b0c8c29be0f5bdecae285ac7a88019220ba534357388ddefa6
+checksum=7af5965e0f0779a5ea9135ee03c51b1bb1d84b578af0a7eb2bd13dbf34a342dd
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: zoxide: update to 0.9.1
2023-05-07 17:20 [PR PATCH] zoxide: update to 0.9.1 RAR27
` (3 preceding siblings ...)
2023-05-11 20:26 ` RAR27
@ 2023-06-09 7:48 ` classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2023-06-09 7:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There's a merged pull request on the void-packages repository
zoxide: update to 0.9.1
https://github.com/void-linux/void-packages/pull/43792
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-09 7:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-07 17:20 [PR PATCH] zoxide: update to 0.9.1 RAR27
2023-05-11 20:11 ` [PR PATCH] [Updated] " RAR27
2023-05-11 20:18 ` RAR27
2023-05-11 20:24 ` RAR27
2023-05-11 20:26 ` RAR27
2023-06-09 7:48 ` [PR PATCH] [Merged]: " classabbyamp
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).