[PR PATCH] New package: ouch-0.3.1

[PR PATCH] New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

There is a new pull request by ElDifinitivo against master on the void-packages repository

https://github.com/ElDifinitivo/void-packages ouch
https://github.com/void-linux/void-packages/pull/34931

New package: ouch-0.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/34931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ouch-34931.patch --]
[-- Type: text/x-diff, Size: 1023 bytes --]

From 946a783a1c66ddeb357f307ccff103cb0dc6b0c1 Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Fri, 7 Jan 2022 15:34:41 -0600
Subject: [PATCH] New package: ouch-0.3.1

---
 srcpkgs/ouch/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/ouch/template

diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template
new file mode 100644
index 000000000000..6818cfc7d11b
--- /dev/null
+++ b/srcpkgs/ouch/template
@@ -0,0 +1,16 @@
+# Template file for 'ouch'
+pkgname=ouch
+version=0.3.1
+revision=1
+build_style=cargo
+hostmakedepends="liblzma-devel bzip2-devel libzip-devel"
+short_desc="CLI utility for easily compressing and decompressing files and dirs"
+maintainer="Savoy <savoy@liberation.red>"
+license="MIT"
+homepage="https://github.com/ouch-org/ouch"
+distfiles="https://github.com/ouch-org/ouch/archive/refs/tags/${version}.tar.gz"
+checksum=269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d
+
+post_install() {
+	vlicense LICENSE license.txt
+}

Re: [PR REVIEW] New package: ouch-0.3.1

[abenson]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#discussion_r780544200

Comment:
This should be `makedepends`

Re: [PR REVIEW] New package: ouch-0.3.1

[abenson]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#discussion_r780544353

Comment:
Just `vlicense LICENSE`, don't rename it

Re: [PR PATCH] [Updated] New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

There is an updated pull request by ElDifinitivo against master on the void-packages repository

https://github.com/ElDifinitivo/void-packages ouch
https://github.com/void-linux/void-packages/pull/34931

New package: ouch-0.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/34931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ouch-34931.patch --]
[-- Type: text/x-diff, Size: 1007 bytes --]

From 15441817c514de39aeb1a7676217f87cb78b7bea Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Fri, 7 Jan 2022 15:34:41 -0600
Subject: [PATCH] New package: ouch-0.3.1

---
 srcpkgs/ouch/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/ouch/template

diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template
new file mode 100644
index 000000000000..90ce1466ddfb
--- /dev/null
+++ b/srcpkgs/ouch/template
@@ -0,0 +1,16 @@
+# Template file for 'ouch'
+pkgname=ouch
+version=0.3.1
+revision=1
+build_style=cargo
+makedepends="liblzma-devel bzip2-devel libzip-devel"
+short_desc="CLI utility for easily compressing and decompressing files and dirs"
+maintainer="Savoy <savoy@liberation.red>"
+license="MIT"
+homepage="https://github.com/ouch-org/ouch"
+distfiles="https://github.com/ouch-org/ouch/archive/refs/tags/${version}.tar.gz"
+checksum=269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d
+
+post_install() {
+	vlicense LICENSE
+}

Re: New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by ElDifinitivo on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1013222689

Comment:
Forgot to mention but template issues have been resolved

Re: New package: ouch-0.3.1

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 748 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1037958445

Comment:
So, I was nerd-sniped a bit by this, and wanted to get the completions working at least locally. This turned out to be a slight bit more difficult than anticipated, resulting in two patches I'll submit upstream. One for allowing to override the location of the completions, and one for working around https://github.com/clap-rs/clap/issues/1596.

The resulting template and patches can be found at https://github.com/void-linux/void-packages/commit/44cefdee00b3b8ac0a309819fd3fbfce5e24bb08.

@ElDifinitivo Which one would you prefer, including those changes into your PR, or me opening a PR myself?

Re: New package: ouch-0.3.1

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 891 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1037958445

Comment:
So, I was nerd-sniped a bit by this, and wanted to get the completions working at least locally. This turned out to be a slight bit more difficult than anticipated, resulting in two patches I've submit upstream (https://github.com/ouch-org/ouch/pull/251 and https://github.com/ouch-org/ouch/pull/252). One for allowing to override the location of the completions, and one for working around https://github.com/clap-rs/clap/issues/1596, which caused the generated completions to be faulty.

The resulting template and patches can be found at https://github.com/void-linux/void-packages/commit/44cefdee00b3b8ac0a309819fd3fbfce5e24bb08.

@ElDifinitivo Which one would you prefer, including those changes into your PR, or me opening a PR myself?

Re: New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

New comment by ElDifinitivo on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1038266200

Comment:
@jcgruenhage If you don't mind I'm also good with just including the changes here, helps to keep the reasoning behind the patches in the same issue thread.

Re: New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by ElDifinitivo on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1038266200

Comment:
@jcgruenhage If you don't mind I'm also good with just including the changes here, helps to keep the reasoning behind the patches in the same issue thread. I can build the changes locally and push later today.

Re: New package: ouch-0.3.1

[jcgruenhage]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1038274894

Comment:
Sounds good to me :)

Re: [PR PATCH] [Updated] New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

There is an updated pull request by ElDifinitivo against master on the void-packages repository

https://github.com/ElDifinitivo/void-packages ouch
https://github.com/void-linux/void-packages/pull/34931

New package: ouch-0.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/34931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ouch-34931.patch --]
[-- Type: text/x-diff, Size: 5617 bytes --]

From 02db46ad8bd73b3eda672c32cac9185cbe0f8db7 Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Fri, 7 Jan 2022 15:34:41 -0600
Subject: [PATCH] New package: ouch-0.3.1

---
 ...riding-the-completions-output-direct.patch | 40 ++++++++++++++++
 ...single-quotes-from-clap-doc-comments.patch | 46 +++++++++++++++++++
 srcpkgs/ouch/template                         | 24 ++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch
 create mode 100644 srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch
 create mode 100644 srcpkgs/ouch/template

diff --git a/srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch b/srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch
new file mode 100644
index 000000000000..da97e65e7658
--- /dev/null
+++ b/srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch
@@ -0,0 +1,40 @@
+From 60763a64c1b7268050bb61fb8cef1c982bbd4aca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Sun, 13 Feb 2022 09:53:28 +0100
+Subject: [PATCH 1/2] chore: allow overriding the completions output directory
+
+---
+ build.rs | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index 5372154..b5c56c4 100644
+--- a/build.rs
++++ b/build.rs
+@@ -1,7 +1,7 @@
+ use clap::{ArgEnum, IntoApp};
+ use clap_generate::{generate_to, Shell};
+ 
+-use std::{env, fs::create_dir_all, path::Path};
++use std::{env, fs::create_dir_all};
+ 
+ include!("src/opts.rs");
+ 
+@@ -12,7 +12,13 @@ fn main() {
+         return;
+     }
+ 
+-    let out = &Path::new(&env::var_os("OUT_DIR").unwrap()).join("completions");
++    let out = &env::var_os("OUCH_COMPLETIONS_DIR")
++        .map(|path| PathBuf::from(&path))
++        .or_else(|| env::var_os("OUT_DIR")
++                 .map(|path| PathBuf::from(&path))
++                 .map(|path| path.join("completions"))
++        ).unwrap();
++
+     create_dir_all(out).unwrap();
+     let app = &mut Opts::into_app();
+ 
+-- 
+2.35.1
diff --git a/srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch b/srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch
new file mode 100644
index 000000000000..a44a7d183e0b
--- /dev/null
+++ b/srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch
@@ -0,0 +1,46 @@
+From b6279d75db53ddc34dd6ba727df1b7fd0ad134dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Sun, 13 Feb 2022 10:09:29 +0100
+Subject: [PATCH 2/2] fix: remove single quotes from clap doc comments
+
+Apparently, clap_complete doesn't properly escape single quotes in doc
+comments, leading to broken shell completions for zsh. To circumvent
+this, I've removed the single quote in the one place where it shouldn't
+have been in the first place ("it's" vs "its", contraction vs possessive
+pronoun), and replaced "it's" with "it is" in the other place.
+
+Reference to upstream issue: https://github.com/clap-rs/clap/issues/1596
+---
+ src/commands.rs | 2 +-
+ src/opts.rs     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/commands.rs b/src/commands.rs
+index 106e36d..692dceb 100644
+--- a/src/commands.rs
++++ b/src/commands.rs
+@@ -99,7 +99,7 @@ pub fn run(args: Opts, question_policy: QuestionPolicy) -> crate::Result<()> {
+             let output_file = fs::File::create(&output_path)?;
+ 
+             if !represents_several_files(&files) {
+-                // It's possible the file is already partially compressed so we don't want to compress it again
++                // It is possible the file is already partially compressed so we don't want to compress it again
+                 // `ouch compress file.tar.gz file.tar.gz.xz` should produce `file.tar.gz.xz` and not `file.tar.gz.tar.gz.xz`
+                 let input_extensions = extension::extensions_from_path(&files[0]);
+ 
+diff --git a/src/opts.rs b/src/opts.rs
+index 14d6997..e532e7b 100644
+--- a/src/opts.rs
++++ b/src/opts.rs
+@@ -39,7 +39,7 @@ pub enum Subcommand {
+         #[clap(required = true, min_values = 1)]
+         files: Vec<PathBuf>,
+ 
+-        /// The resulting file. It's extensions can be used to specify the compression formats.
++        /// The resulting file. Its extensions can be used to specify the compression formats.
+         #[clap(required = true, value_hint = ValueHint::FilePath)]
+         output: PathBuf,
+     },
+-- 
+2.35.1
diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template
new file mode 100644
index 000000000000..9e585cdda85e
--- /dev/null
+++ b/srcpkgs/ouch/template
@@ -0,0 +1,24 @@
+# Template file for 'ouch'
+pkgname=ouch
+version=0.3.1
+revision=1
+build_style=cargo
+makedepends="liblzma-devel bzip2-devel libzip-devel"
+short_desc="CLI utility for easily compressing and decompressing files and dirs"
+maintainer="Savoy <savoy@liberation.red>"
+license="MIT"
+homepage="https://github.com/ouch-org/ouch"
+distfiles="https://github.com/ouch-org/ouch/archive/refs/tags/${version}.tar.gz"
+checksum=269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d
+
+pre_build() {
+	export GEN_COMPLETIONS=1
+	export OUCH_COMPLETIONS_DIR=completions
+}
+
+post_install() {
+	vlicense LICENSE
+	vcompletion "completions/_ouch" zsh
+	vcompletion "completions/ouch.fish" fish
+	vcompletion "completions/ouch.bash" bash
+}

Re: New package: ouch-0.3.1

[paper42]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34931#issuecomment-1038738940

Comment:
@ElDifinitivo please rebase on top of master to fix CI

Re: [PR PATCH] [Updated] New package: ouch-0.3.1

[ElDifinitivo]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

There is an updated pull request by ElDifinitivo against master on the void-packages repository

https://github.com/ElDifinitivo/void-packages ouch
https://github.com/void-linux/void-packages/pull/34931

New package: ouch-0.3.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

A patch file from https://github.com/void-linux/void-packages/pull/34931.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ouch-34931.patch --]
[-- Type: text/x-diff, Size: 5919642 bytes --]

From 02db46ad8bd73b3eda672c32cac9185cbe0f8db7 Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Fri, 7 Jan 2022 15:34:41 -0600
Subject: [PATCH 0001/1427] New package: ouch-0.3.1

---
 ...riding-the-completions-output-direct.patch | 40 ++++++++++++++++
 ...single-quotes-from-clap-doc-comments.patch | 46 +++++++++++++++++++
 srcpkgs/ouch/template                         | 24 ++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch
 create mode 100644 srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch
 create mode 100644 srcpkgs/ouch/template

diff --git a/srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch b/srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch
new file mode 100644
index 000000000000..da97e65e7658
--- /dev/null
+++ b/srcpkgs/ouch/patches/0001-chore-allow-overriding-the-completions-output-direct.patch
@@ -0,0 +1,40 @@
+From 60763a64c1b7268050bb61fb8cef1c982bbd4aca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Sun, 13 Feb 2022 09:53:28 +0100
+Subject: [PATCH 1/2] chore: allow overriding the completions output directory
+
+---
+ build.rs | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index 5372154..b5c56c4 100644
+--- a/build.rs
++++ b/build.rs
+@@ -1,7 +1,7 @@
+ use clap::{ArgEnum, IntoApp};
+ use clap_generate::{generate_to, Shell};
+ 
+-use std::{env, fs::create_dir_all, path::Path};
++use std::{env, fs::create_dir_all};
+ 
+ include!("src/opts.rs");
+ 
+@@ -12,7 +12,13 @@ fn main() {
+         return;
+     }
+ 
+-    let out = &Path::new(&env::var_os("OUT_DIR").unwrap()).join("completions");
++    let out = &env::var_os("OUCH_COMPLETIONS_DIR")
++        .map(|path| PathBuf::from(&path))
++        .or_else(|| env::var_os("OUT_DIR")
++                 .map(|path| PathBuf::from(&path))
++                 .map(|path| path.join("completions"))
++        ).unwrap();
++
+     create_dir_all(out).unwrap();
+     let app = &mut Opts::into_app();
+ 
+-- 
+2.35.1
diff --git a/srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch b/srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch
new file mode 100644
index 000000000000..a44a7d183e0b
--- /dev/null
+++ b/srcpkgs/ouch/patches/0002-fix-remove-single-quotes-from-clap-doc-comments.patch
@@ -0,0 +1,46 @@
+From b6279d75db53ddc34dd6ba727df1b7fd0ad134dd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Sun, 13 Feb 2022 10:09:29 +0100
+Subject: [PATCH 2/2] fix: remove single quotes from clap doc comments
+
+Apparently, clap_complete doesn't properly escape single quotes in doc
+comments, leading to broken shell completions for zsh. To circumvent
+this, I've removed the single quote in the one place where it shouldn't
+have been in the first place ("it's" vs "its", contraction vs possessive
+pronoun), and replaced "it's" with "it is" in the other place.
+
+Reference to upstream issue: https://github.com/clap-rs/clap/issues/1596
+---
+ src/commands.rs | 2 +-
+ src/opts.rs     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/commands.rs b/src/commands.rs
+index 106e36d..692dceb 100644
+--- a/src/commands.rs
++++ b/src/commands.rs
+@@ -99,7 +99,7 @@ pub fn run(args: Opts, question_policy: QuestionPolicy) -> crate::Result<()> {
+             let output_file = fs::File::create(&output_path)?;
+ 
+             if !represents_several_files(&files) {
+-                // It's possible the file is already partially compressed so we don't want to compress it again
++                // It is possible the file is already partially compressed so we don't want to compress it again
+                 // `ouch compress file.tar.gz file.tar.gz.xz` should produce `file.tar.gz.xz` and not `file.tar.gz.tar.gz.xz`
+                 let input_extensions = extension::extensions_from_path(&files[0]);
+ 
+diff --git a/src/opts.rs b/src/opts.rs
+index 14d6997..e532e7b 100644
+--- a/src/opts.rs
++++ b/src/opts.rs
+@@ -39,7 +39,7 @@ pub enum Subcommand {
+         #[clap(required = true, min_values = 1)]
+         files: Vec<PathBuf>,
+ 
+-        /// The resulting file. It's extensions can be used to specify the compression formats.
++        /// The resulting file. Its extensions can be used to specify the compression formats.
+         #[clap(required = true, value_hint = ValueHint::FilePath)]
+         output: PathBuf,
+     },
+-- 
+2.35.1
diff --git a/srcpkgs/ouch/template b/srcpkgs/ouch/template
new file mode 100644
index 000000000000..9e585cdda85e
--- /dev/null
+++ b/srcpkgs/ouch/template
@@ -0,0 +1,24 @@
+# Template file for 'ouch'
+pkgname=ouch
+version=0.3.1
+revision=1
+build_style=cargo
+makedepends="liblzma-devel bzip2-devel libzip-devel"
+short_desc="CLI utility for easily compressing and decompressing files and dirs"
+maintainer="Savoy <savoy@liberation.red>"
+license="MIT"
+homepage="https://github.com/ouch-org/ouch"
+distfiles="https://github.com/ouch-org/ouch/archive/refs/tags/${version}.tar.gz"
+checksum=269abaf5ac2f80da3796dbf5e73419c1b64104d1295f3ff57965141f079e6f6d
+
+pre_build() {
+	export GEN_COMPLETIONS=1
+	export OUCH_COMPLETIONS_DIR=completions
+}
+
+post_install() {
+	vlicense LICENSE
+	vcompletion "completions/_ouch" zsh
+	vcompletion "completions/ouch.fish" fish
+	vcompletion "completions/ouch.bash" bash
+}

From 8f6383ec0ee1d554b174b4f45810ea9a065c72fd Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 7 Jan 2022 15:17:56 +0200
Subject: [PATCH 0002/1427] gtk+3: update to 3.24.31.

Additionally includes the following fixes to unit tests:

  1. Adding cantarell-fonts to checkdepends fixed over 100 tests
  2. Some reftests were broken by upstream by removing the .ui files[1]
  3. UNEXPECTEDPASS of quit-mnemonic.ui is a known "somehow broken" test[2]
  4. Fix reftests/icon-effect-missing.ui by adding hicolor-icon-theme to
     checkdepends

[1] https://gitlab.gnome.org/GNOME/gtk/-/commit/93e1f7f1
[2] https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.31/testsuite/reftests/meson.build#L430
---
 srcpkgs/gtk+3/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index c6660b618f10..8f3092774739 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk+3'
 pkgname=gtk+3
-version=3.24.30
+version=3.24.31
 revision=1
 wrksrc="gtk+-${version}"
 build_style=meson
@@ -26,13 +26,13 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if cloudproviders 'libcloudproviders-devel')"
 depends="gtk-update-icon-cache adwaita-icon-theme
  librsvg shared-mime-info $(vopt_if x11 'dbus-x11')"
-checkdepends="$depends xvfb-run dbus"
+checkdepends="$depends xvfb-run dbus cantarell-fonts hicolor-icon-theme"
 short_desc="GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9
+checksum=423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9
 _broken_tests="
  a11y/scale-drawvalue
  a11y/menu
@@ -42,9 +42,13 @@ _broken_tests="
  a11y/tooltips
  reftests/button-wrapping.ui
  reftests/cellrenderer-pixbuf-stock-rtl.ui
- reftests/icon-effect-missing.ui
  reftests/symbolic-icon-translucent-color.ui
- reftests/window-height-for-width.ui"
+ reftests/window-height-for-width.ui
+ reftests/label-text-shadow-changes-modify-clip.ui
+ reftests/toplevel-vs-popup.ui
+ reftests/treeview-crash-too-wide.ui
+ reftests/quit-mnemonic.ui
+"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) _broken_tests+=" gtk/cellarea" ;;

From 567750079177df870f194b91b344654ee01a54b0 Mon Sep 17 00:00:00 2001
From: aemmame <aemmame@disroot.org>
Date: Fri, 7 Jan 2022 11:49:34 +0700
Subject: [PATCH 0003/1427] musikcube: update to 0.96.10

---
 srcpkgs/musikcube/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c786f86bef31..d8d4e73d6b4b 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,6 +1,6 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.7
+version=0.96.10
 revision=1
 build_style=cmake
 make_cmd=make
@@ -16,7 +16,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=81922ec6e86c06061dc009be3ec7c4bc8e8fd5ed3bb92231dabede8bbccaf723
+checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a07d4a0e72472ec8b36d35e3c7ab348408dd4d45 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 6 Jan 2022 16:42:17 -0500
Subject: [PATCH 0004/1427] chezmoi: update to 2.9.5.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 2cea539ebd8d..747ab1944418 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.9.4
+version=2.9.5
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=fca10c19bea51e4e17ddd077f855c3d09be0730997ae50987552ce05190a54a5
+checksum=10a27e4569c0cd6951a8509a39443f8a918d22d61db0026b78e88ef83fa43e04
 
 export CGO_ENABLED=1
 

From 5f193295f8861de1a6b82957b5862328dd2c2554 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 6 Jan 2022 00:55:05 -0500
Subject: [PATCH 0005/1427] elvish: update to 0.17.0

---
 srcpkgs/elvish/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 9b14c52c86d3..85fb6c24d25c 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,6 +1,6 @@
 # Template file for 'elvish'
 pkgname=elvish
-version=0.16.3
+version=0.17.0
 revision=1
 build_style=go
 go_import_path="src.elv.sh/cmd/elvish"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="https://elv.sh/"
 changelog="https://elv.sh/blog/${version}-release-notes.html"
 distfiles="https://github.com/elves/elvish/archive/v${version}.tar.gz"
-checksum=ea9d594070cff58ed9caedf4619ee195bfce179f79b9a8d5e7a635ce5cbba551
+checksum=0e255849723129d8c4dc24f67656e651b4e4b7566bc16009109ba76099681fa1
 register_shell="/bin/elvish"
 
 # fix: collect2: fatal error: cannot find 'ld'

From c71d279a6d91e36457fdf2f24a47c4d6adf502bc Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Wed, 5 Jan 2022 18:45:06 +0100
Subject: [PATCH 0006/1427] curl: update to 7.81.0.

Closes: #34870 [via git-merge-pr]
---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index b493e7e04778..50fb520bf651 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.80.0
+version=7.81.0
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -24,7 +24,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=dd0d150e49cd950aff35e16b628edf04927f0289df42883750cf952bb858189c
+checksum=1e7a38d7018ec060f1f16df839854f0889e94e122c4cfa5d3a37c2dc56f1e258
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

From 5ff0d4758570020f8d66f3d3da0e0d6248f1f12f Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Wed, 5 Jan 2022 14:48:40 +0000
Subject: [PATCH 0007/1427] cri-tools: update to 1.22.0.

---
 srcpkgs/cri-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 755fd3d1fabf..10248607c7ad 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
-version=1.18.0
+version=1.22.0
 revision=1
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
@@ -9,14 +9,14 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://github.com/kubernetes-sigs/cri-tools"
 distfiles="https://github.com/kubernetes-sigs/cri-tools/archive/v${version}.tar.gz"
-checksum=d3c9af8b895465d0790589246b5e41d7ebd41f18da5a07b77dd7e0c85d8ba549
+checksum=76fc230a73dd7e8183f499c88effaf734540808f2f90287031a85d0a4d8512d9
 
 do_build() {
 	make ${makejobs}
 }
 
 do_install() {
-	for bin in _output/*; do
-		vbin $bin
+	for bin in build/bin/*; do
+	    vbin $bin
 	done
 }

From ebfb1a89eee7d24e2a7548bd1e6a3d86450c8547 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 7 Jan 2022 10:35:23 +0100
Subject: [PATCH 0008/1427] sqlite: update to 3.37.2

---
 srcpkgs/sqlite/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 7aaccdefae46..a2cb06763b8d 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.1
+version=3.37.2
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -12,8 +12,8 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
-distfiles="${homepage}/2021/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e
+distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
+checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From 4250c276223815fe2bc767c9acb1a0189641dddb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 7 Jan 2022 12:25:56 -0600
Subject: [PATCH 0009/1427] mongo-c-driver: update to 1.20.1.

---
 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 b3eec27c4bab..a4e2ec086406 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.20.0
+version=1.20.1
 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=a97242866212bdcf9dfb8030b31a32eef9ff83082b34e1027339c805a3c50b0d
+checksum=c2e17ed23dc6aae72c8da8a81ad34957c35c270f7b56349c107865afeaf10d65
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From cbb4e28e254d416f90cd9e00e29c08ff747ebeaa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 7 Jan 2022 12:26:29 -0600
Subject: [PATCH 0010/1427] python3-httpx: update to 0.21.3.

---
 srcpkgs/python3-httpx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template
index 55f843ed478c..8c2d0a7ba44e 100644
--- a/srcpkgs/python3-httpx/template
+++ b/srcpkgs/python3-httpx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-httpx'
 pkgname=python3-httpx
-version=0.21.1
+version=0.21.3
 revision=1
 wrksrc="httpx-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://www.python-httpx.org"
 changelog="https://raw.githubusercontent.com/encode/httpx/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/h/httpx/httpx-${version}.tar.gz"
-checksum=02af20df486b78892a614a7ccd4e4e86a5409ec4981ab0e422c579a887acad83
+checksum=7a3eb67ef0b8abbd6d9402248ef2f84a76080fa1c839f8662e6eb385640e445a
 # the pypi tarball doesn't contain tests
 # the tests need unpackaged dependencies trustme and uvicorn
 make_check=no

From 894d2b1b9d098d2b4524ec706112a765bdb7025d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0011/1427] filelight: update to 21.12.1.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index cf8be4623a2d..9e381d614bf7 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=d2ca036e99f9bd95fafc6da958fb70685e9b87cf2cffa8f90ed8e2aa412976f0
+checksum=7fa07a8433cc0b4583601fefa6423fa78b88d31b5cf4090472f7636aab257e66

From e2679a7f45227e8f6f972d857f83c018e5e85723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0012/1427] kaccounts-integration: update to 21.12.1.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index dee1f9c00f9a..1e7e2d16d4c2 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=c71237afb05be595d4ef308694476d1b9f491637f98decfa7023b22f5fb08a36
+checksum=28ff0e9fc35670a375bf20464d808e2761ec0c44014e0836c4fb1f90d1394996
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From e2df990f370df4e67edf2532b64e9dd5ce5e9006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0013/1427] kaccounts-providers: update to 21.12.1.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index d9600bb68a86..cc9de3799bfe 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=5121c11837830b234a563ff9a9a0fa8051bfbaa781cc115d9e3760a07f8e7078
+checksum=6413be53fbb2229a55ec73161d53791a7c4e3ccbc70ea1a2e14d8d49a32d948a
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From f2135f074c8dd90ecbb06a42f6247b8f549ed750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0014/1427] kcachegrind: update to 21.12.1.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index d66628dc7c74..6bac50d0831b 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=9e8a59946d54508217f865ab343d26c50165c8d593b651bc4ac798d33c7eaecc
+checksum=325669fe0d33d819207b72e9b77c7c131d24685ee1586aeb54e1ecac6942a547
 python_version=2

From 7f795d8f0dc829d7a15f13911fbd679729205689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0015/1427] kcron: update to 21.12.1.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 3b353adc6baf..b4f391e8c919 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=2ada43d13cb2f27cdf84415c607af1a138928214a3f113a9eb598f559563b2c8
+checksum=87293e56f90714a99a22656f3cdcd058b6cba3f61457d2973d8d8845eae6bc24

From d7946e67acf0a156a37ac2509c3c8da5eef6ea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0016/1427] kdialog: update to 21.12.1.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index bdbf6c97e088..ba44781f9dcc 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=07dcc9e73eed23bfd6f2bcd5562e24ffdb2b6b0614b7106b422b0fc23b389fce
+checksum=9aeb4da004608e7c8d9ae001b5921d6526c2ccba8c8782982a6c6247187c2a9c

From e521dd413bd14f0d198b4d286c1b236d49fd09e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0017/1427] keditbookmarks: update to 21.12.1.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 8112948608dc..902a5a3e875b 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=4158996f881f6901a65d3292a88b3cfcfde2a192242afc1fa4070608919ef4dd
+checksum=a1d2cf9d4eddd553f39539359500d4fe9adfab265cb0a61b9470d315ee4a74f5

From f162e8f643d33c830d64d080050ce5e9a0969d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0018/1427] kfind: update to 21.12.1.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 39ca7b9548dc..a9a1a7d83fce 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=c5bdcf7b93aee88e10ec6f9b8d1e0448f28e544ee4de834ae08414368e41b7a8
+checksum=10071d6a047447ab6bffede44149a41124392a10d3ed3a5c80cc1c8287a1c68c

From 4afa004b6ae26769320d8a42a0a20dd677d07d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0019/1427] kig: update to 21.12.1.

---
 srcpkgs/kig/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 9357250443cd..697b3d061f22 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -10,5 +10,6 @@ short_desc="KDE education tool for interactive geometry"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
+changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=8c763c66348ef8f3b1e99ff06df38210e21ba1eddb3cb19a80c63dcdd2b32702
+checksum=9a62ac2fe00c4ac99f5d0018e6ffa46db1f54c78f2de62fbb280b9472fed8508

From 8228e5ed697aba3b743f98f910cc45445d07ef62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0020/1427] kio-gdrive: update to 21.12.1.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 29d9a41b34f0..69d47dd4e6c0 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=b2c3e280a852e0210ce89056ac975a27f74a24d49b4629127384aa87cc084d7b
+checksum=468a92aff34725fa3a871b25a40a04d12892aa9cb52e504c9ca5ce70abc81405

From 03dad72697551428a4277c0e51b25498eae900a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0021/1427] kmag: update to 21.12.1.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index d2b780820ba4..098fce2b26c6 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=ae5505588eaa569ca00a4ff344d6aa514e64d23877aa69cd951fb1f928ff3525
+checksum=10e18eb26b7c19cbf91d036570ceba95cc1a3a413b678f9a4df1c68187afbfec

From 8e840d23521255da9504d8bd4d4e237299aad9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:11 +0100
Subject: [PATCH 0022/1427] kmix: update to 21.12.1.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 7ae0a92319d1..0faab0e9ae64 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=609d220c63750c0c2fe8aea570a5deee7592c0b2a1f4e40e1e2c76f0085c990b
+checksum=c424425a4dfed4153abf9a583f2cdb6528e01c0d27d452313eed8897c2b331b1

From 0bc768c23ad2dc5595e8a19a963416a1b65a1672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0023/1427] kolourpaint: update to 21.12.1.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index a5b42edb8550..aad5b5a4f345 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=55b9064d5c476f04bb911582fc34ae552b9e5e04b8312862289f3ca8e34feb98
+checksum=59dbb86ded22c31f87d565c9cc02f3e19ad5e0ed4ccaa4f39892bf099b877c4c
 
 post_install() {
 	vlicense COPYING

From 916c04f85161c2d8d27e6c15a4ffc1af838f791e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0024/1427] kompare: update to 21.12.1.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 35cb762309fa..5c0d50cb2ebb 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=7a9a0b9c582da081a8e8fbb43e907c74f1257379819b18dceaedad03ad89e915
+checksum=e1aa0c11b09371ca8d211e1af0fdc7725bae1eadce6d6ad4b6b692beb585a77d

From 0af807ab722713fd36ad5f5e6367979a6cad02ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0025/1427] konversation: update to 21.12.1.

---
 srcpkgs/konversation/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index e389e38cf1e7..22b4927836cb 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -13,5 +13,5 @@ license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=540e4ed10453e250fc5f887b98745b4b7c9f6e9fde04c1cbf0e4fe6813afaed2
+checksum=2eb800c95b205053feb0abb1124855d32a17372bdb9d01bc692c52467c3f8c69
 python_version=3

From 0b7807aded2979dbc2f4b2ec96a0ce0b18f6033e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0026/1427] kpat: update to 21.12.1.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 13e7d90780f4..3764e8c7bd43 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=e24f697a6cdba583c4628f39571b477160686236bb89e6a615653f45f96e4a0c
+checksum=c24bc57ab0f0f13e26498561be1b8bf880415f9fb2e8f9357929e4e14b2a5d92

From 6e81fbf0902d3f6da6db8e1a1dd7b0dc6895ee40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0027/1427] kruler: update to 21.12.1.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index a9d47226e374..af4f8dc09647 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=b192dae359b20345f5d4ce1e67df5a3748fd3332637733b14bfbf7fbe17925ce
+checksum=a2b9aedd39d1a1ac858bbf8bfe1217a878868dd032f970cb01a5e6ec01be9e25

From aa1f739bc44d65a663c5ada2770f4abd9db29361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0028/1427] ksystemlog: update to 21.12.1.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 78052e186318..1ac88c96678e 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=4f506b5227bfb2081096d3f7b505e85f8fc58a8ae5bcb102ab61bbffcc5cb806
+checksum=b414ef3a6bee078d576b7bc8c5b51c32b24817166f6dde68de5a0d56bc4b09e7

From 98d621e175bccb6f086edfe4d71e54414da852ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0029/1427] kteatime: update to 21.12.1.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index ce8cb28d15b6..4bea362ab2b8 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=48ac97c05829ec613828643734fe5169c23e39d905fbd82406627f193d1b997b
+checksum=5e20b67f9d717d4bcbf3cacd59687c29305ae150889e3b20820f90bfc9a0578d

From 796fdfd6281149d8badc81916ff9b9806a69d797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0030/1427] kturtle: update to 21.12.1.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 4f1f7ef5e3d9..6a7d28c617e7 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=1794ff87b288a80705012f251eddefac6effffcf25b581e2dd389605aec44cd5
+checksum=1da6aeac23d132df7857057693dd1f4e70151152c1fbab4b8a15eb5878726b14

From feb32661a27b29064dfa1d1a02eb074654d85ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0031/1427] kwalletmanager: update to 21.12.1.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 785fc9177e62..3bc50129a262 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=1e927369a843944a6332257f4fcee8f633a3b017848d6643942274b5a7211559
+checksum=0c756e981ff0afb006a13eb32b4bc5228980d6af1844f4a676fbebf67fd4c8e1

From fbee58f275d7e8005c87d4cd38e70ed104cde0dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0032/1427] libkcddb: update to 21.12.1.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 46ba00c220d4..d1e362fb932d 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=cd6c05bfae0d9b0ba37e30a34a3e995492a82bb9d370ff68db85c39406c83762
+checksum=4b2acd5a945de27e81e518e9613641e1244149a6c2413c906cddebd70891460a
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 8279503f44e2b773d0e74bdc9af6d712b2e2eade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0033/1427] libkdegames: update to 21.12.1.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index f0087a7d4f61..f264cb8b7217 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=821b5e4fe68e8a3a5ab72caec240dd603baf100aae0e48658bba0aa6b5db9426
+checksum=9e7152d377b916feba04dcdea723e8c52888f0ca24604fea8aa274539c3fad40
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a2a01143afe52ddb140b0951a7e92c15b0079306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0034/1427] libkomparediff2: update to 21.12.1.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index eddd2a4a81ef..1610a1d0d056 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=0d0d85ddb687e3c2e8e8550558f48eac898500cc0fd607a3dc6b387ab44172cd
+checksum=bc64d0ae804efe2ea16b41ca2b4bf91032a3f4cdc1cd970109e260b22c748c0f
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d53b39aad2b515de044c7e9495648c89b402ea97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0035/1427] marble5: update to 21.12.1.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index fa5d852fa1b9..f110884ea112 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=bc66e9e80480bd281ffbc9263139806349316bbd8eea9baaa59b008aa6d901b0
+checksum=568b6d9ab39683f6a2ca4ea78daaf4ca66db7eb13ca587333f54291e17831c49
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From fba1f3c7df8b84fb2ef2ba2b95f6006d60b3a90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0036/1427] signon-kwallet-extension: update to 21.12.1.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 2f9201711b35..6b36f13bc73d 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=bd49fb147f3b96e162e94130c16950d58b806ae0f47025994a4b77eeb4ae0a29
+checksum=b3f7e76e230dee1785a3e54ab37ff4e5860167b6d0a2c339f553dbc867884226

From 52665809307530cf76e304ad7b6c8c8d750ca0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:12 +0100
Subject: [PATCH 0037/1427] svgpart: update to 21.12.1.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 6178cf51b67b..e7f7cc4a5f16 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=c1c6cf7cedca6d2deec765bcf678e2f267a9f3063ca56865d2cc6637789e1be3
+checksum=9cd7f1580fcd01d2c7a7b67e05800ef305b8afe0100ddc32c78bbc60c3933b0e

From 0a84edbd33f9269effb5eb697716f0235eba094b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:13 +0100
Subject: [PATCH 0038/1427] umbrello: update to 21.12.1.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 636aba83b5d0..99737558f5f1 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=4e8c76d48a9cdc7f03171590825a01d0573e04cfdc95f971474442a41a69d468
+checksum=49e7c9a67fb68a3095dc14c4ca343bde7fc8cec6f965ade089c195025ab6907c
 python_version=2
 
 pre_configure() {

From a29fc9253d0c13cb3e0503d4b638c32d935a0c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 21:17:13 +0100
Subject: [PATCH 0039/1427] yakuake: update to 21.12.1.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dfec2b11fc52..e0670fe52256 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=817d6447c96e0c8e0b6c112e6ddb05d6b8fef687ed6974e9d8cd9d30acfc35f3
+checksum=f41b97f155cff6b15fb8e4cbceb7e51010f090beaa9da0c7e0d0b215004722db

From c38d6fd5ffdeb66d3675d9c81eabefaacc4be52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:26 +0100
Subject: [PATCH 0040/1427] hunspell-pl_PL: update to 20211201.

---
 srcpkgs/hunspell-pl_PL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hunspell-pl_PL/template b/srcpkgs/hunspell-pl_PL/template
index 85a401af5976..4935419acc47 100644
--- a/srcpkgs/hunspell-pl_PL/template
+++ b/srcpkgs/hunspell-pl_PL/template
@@ -1,6 +1,6 @@
 # Template file for 'hunspell-pl_PL'
 pkgname=hunspell-pl_PL
-version=20210731
+version=20211201
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
@@ -9,7 +9,7 @@ maintainer="m-cz <emcze@ya.ru>"
 license="GPL-2.0-only, LGPL-2.1-only, CC-BY-4.0, MPL-1.1, Apache-2.0"
 homepage="https://sjp.pl/slownik/ort/"
 distfiles="https://sjp.pl/slownik/ort/sjp-myspell-pl-${version}.zip"
-checksum=40dda0324406ba053e7fcb9ef96fd6658bb48de048d03fef96fb17103a585f44
+checksum=254c9c4a32cc991d58d1667b6d5e504d44be50a546fe2d04251a674ed12a1a64
 
 post_extract() {
 	unzip pl_PL.zip

From 7ba91bc26988339c5b7cdaec324164090c803292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:27 +0100
Subject: [PATCH 0041/1427] postgis: ignore beta and rc

---
 srcpkgs/postgis/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgis/update b/srcpkgs/postgis/update
index 70f8b7290d7b..94cbff9125ac 100644
--- a/srcpkgs/postgis/update
+++ b/srcpkgs/postgis/update
@@ -1 +1 @@
-ignore="*alpha*"
+ignore="*alpha* *beta* *rc*"

From 2dbb714df2af841417a39f0d014c3a77c19ec57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:28 +0100
Subject: [PATCH 0042/1427] postgis-postgresql13: ignore beta and rc

---
 srcpkgs/postgis-postgresql13/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgis-postgresql13/update b/srcpkgs/postgis-postgresql13/update
index dc7538d851a9..e5577e6b068a 100644
--- a/srcpkgs/postgis-postgresql13/update
+++ b/srcpkgs/postgis-postgresql13/update
@@ -1,2 +1,2 @@
 pkgname=postgis
-ignore="*alpha*"
+ignore="*alpha* *beta* *rc*"

From a2ccefe80909ce1cb241e784adf824ea1630c5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:29 +0100
Subject: [PATCH 0043/1427] postgis-postgresql14: ignore beta and rc

---
 srcpkgs/postgis-postgresql14/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgis-postgresql14/update b/srcpkgs/postgis-postgresql14/update
index dc7538d851a9..e5577e6b068a 100644
--- a/srcpkgs/postgis-postgresql14/update
+++ b/srcpkgs/postgis-postgresql14/update
@@ -1,2 +1,2 @@
 pkgname=postgis
-ignore="*alpha*"
+ignore="*alpha* *beta* *rc*"

From e3538c05877b0af8596d61313a775088f1ef71ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:52 +0100
Subject: [PATCH 0044/1427] python3-filelock: update to 3.4.2.

---
 srcpkgs/python3-filelock/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template
index b181a295807a..ad0ae71b0ea4 100644
--- a/srcpkgs/python3-filelock/template
+++ b/srcpkgs/python3-filelock/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-filelock'
 pkgname=python3-filelock
-version=3.0.12
-revision=5
+version=3.4.2
+revision=1
 wrksrc="filelock-${version}"
 build_style=python3-module
-pycompile_module="filelock.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Platform independent file lock"
@@ -12,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="Unlicense"
 homepage="https://filelock.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/f/filelock/filelock-${version}.tar.gz"
-checksum=18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59
+checksum=38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80

From b3ebeaa73686ac9699f42d9553901b4ac4c7fad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:53 +0100
Subject: [PATCH 0045/1427] python3-virtualenv: update to 20.13.0.

---
 srcpkgs/python3-virtualenv/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 1126ed72bf02..3f2d7cd84be7 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.11.2
+version=20.13.0
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,13 +13,13 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=7f9e9c2e878d92a434e760058780b8d67a7c5ec016a66784fe4b0d5e50a4eb5c
+checksum=d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {
-	# test_periodic_update* depends on pytest-freezegun, not packaged in Void
+	# excluded tests depend on pytest-freezegun, not packaged in Void
 	vsed -e '/addopts/d' -i setup.cfg
-	PYTHONPATH=src python3 -m pytest -k 'not test_periodic_update'
+	PYTHONPATH=src python3 -m pytest -k 'not (test_periodic_update or test_get_wheel_download_cached)'
 }
 
 post_install() {

From 8508de4a81da1d3b874a13f4537dfd82edc6db6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:54 +0100
Subject: [PATCH 0046/1427] tox: update to 3.24.5.

---
 srcpkgs/tox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template
index d2ebc2621bd9..21e40e52d16a 100644
--- a/srcpkgs/tox/template
+++ b/srcpkgs/tox/template
@@ -1,6 +1,6 @@
 # Template file for 'tox'
 pkgname=tox
-version=3.24.4
+version=3.24.5
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://tox.readthedocs.io/en/latest/"
 changelog="https://tox.readthedocs.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/t/tox/tox-${version}.tar.gz"
-checksum=c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca
+checksum=67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993
 
 do_check() {
 	# Skipped tests fail to find module or rely on missing entrypoint script

From cba6a0e3027287bf847d85e2e80ca39ba16f6509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 Jan 2022 23:56:55 +0100
Subject: [PATCH 0047/1427] glmark2: update to 2021.12, add build options

---
 .../glmark2/patches/model-loading-be.patch    | 122 ------------------
 srcpkgs/glmark2/template                      |  21 +--
 2 files changed, 13 insertions(+), 130 deletions(-)
 delete mode 100644 srcpkgs/glmark2/patches/model-loading-be.patch

diff --git a/srcpkgs/glmark2/patches/model-loading-be.patch b/srcpkgs/glmark2/patches/model-loading-be.patch
deleted file mode 100644
index f9b70162191d..000000000000
--- a/srcpkgs/glmark2/patches/model-loading-be.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 2ddc86ff65aa93abc321f98996c2657e9fd2d712 Mon Sep 17 00:00:00 2001
-From: Hill Ma <maahiuzeon@gmail.com>
-Date: Sun, 11 Apr 2021 08:57:15 -0700
-Subject: [PATCH] Fix model loading on big endian.
-
----
- src/model.cpp | 42 +++++++++++++++++++++++++++++-------------
- 1 file changed, 29 insertions(+), 13 deletions(-)
-
-diff --git a/src/model.cpp b/src/model.cpp
-index 944ee2a..eb0e428 100644
---- a/src/model.cpp
-+++ b/src/model.cpp
-@@ -29,6 +29,7 @@
- #include "util.h"
- #include "float.h"
- #include "math.h"
-+#include <algorithm>
- #include <fstream>
- #include <sstream>
- #include <memory>
-@@ -39,12 +40,27 @@ using LibMatrix::vec2;
- using LibMatrix::vec3;
- using LibMatrix::uvec3;
- 
--#define read_or_fail(file, dst, size) do { \
--    file.read(reinterpret_cast<char *>((dst)), (size)); \
--    if (file.gcount() < (std::streamsize)(size)) { \
-+static inline void read_from_file(std::istream& file, void *dst, size_t nmemb, size_t size) {
-+    file.read(reinterpret_cast<char *>(dst), nmemb * size);
-+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-+    char *p = reinterpret_cast<char *>(dst);
-+    for (size_t i = 0; i < nmemb; ++i) {
-+        if (size == 2) {
-+            std::swap(p[size*i], p[size*i+1]);
-+        } else if (size == 4) {
-+            std::swap(p[size*i], p[size*i+3]);
-+            std::swap(p[size*i+1], p[size*i+2]);
-+        }
-+    }
-+#endif
-+}
-+
-+#define read_or_fail(file, dst, nmemb, size) do { \
-+    read_from_file((file), (dst), (nmemb), (size)); \
-+    if (file.gcount() < (std::streamsize)((nmemb)*(size))) { \
-         Log::error("%s: %d: Failed to read %zd bytes from 3ds file (read %zd)\n", \
-                    __FUNCTION__, __LINE__, \
--                   (size_t)(size), file.gcount()); \
-+                   (size_t)((nmemb)*(size)), file.gcount()); \
-         return false; \
-     } \
- } while(0);
-@@ -375,7 +391,7 @@ Model::load_3ds(const std::string &filename)
-         uint32_t chunk_length;
- 
-         // Read the chunk header
--        input_file.read(reinterpret_cast<char *>(&chunk_id), 2);
-+        read_from_file(input_file, &chunk_id, 1, 2);
-         if (input_file.gcount() == 0) {
-             continue;
-         }
-@@ -386,7 +402,7 @@ Model::load_3ds(const std::string &filename)
-         }
- 
-         //Read the length of the chunk
--        read_or_fail(input_file, &chunk_length, 4);
-+        read_or_fail(input_file, &chunk_length, 1, 4);
- 
-         switch (chunk_id)
-         {
-@@ -417,7 +433,7 @@ Model::load_3ds(const std::string &filename)
-                 unsigned char c = 1;
- 
-                 for (int i = 0; i < 20 && c != '\0'; i++) {
--                    read_or_fail(input_file, &c, 1);
-+                    read_or_fail(input_file, &c, 1, 1);
-                     ss << c;
-                 }
- 
-@@ -444,12 +460,12 @@ Model::load_3ds(const std::string &filename)
-             case 0x4110:
-                 {
-                 uint16_t qty;
--                read_or_fail(input_file, &qty, sizeof(uint16_t));
-+                read_or_fail(input_file, &qty, 1, sizeof(uint16_t));
-                 object->vertices.resize(qty);
- 
-                 for (uint16_t i = 0; i < qty; i++) {
-                     float f[3];
--                    read_or_fail(input_file, f, sizeof(float) * 3);
-+                    read_or_fail(input_file, f, 3, sizeof(float));
-                     vec3& vertex = object->vertices[i].v;
-                     vertex.x(f[0]);
-                     vertex.y(f[1]);
-@@ -468,11 +484,11 @@ Model::load_3ds(const std::string &filename)
-             case 0x4120:
-                 {
-                 uint16_t qty;
--                read_or_fail(input_file, &qty, sizeof(uint16_t));
-+                read_or_fail(input_file, &qty, 1, sizeof(uint16_t));
-                 object->faces.resize(qty);
-                 for (uint16_t i = 0; i < qty; i++) {
-                     uint16_t f[4];
--                    read_or_fail(input_file, f, sizeof(uint16_t) * 4);
-+                    read_or_fail(input_file, f, 4, sizeof(uint16_t));
-                     uvec3& face = object->faces[i].v;
-                     face.x(f[0]);
-                     face.y(f[1]);
-@@ -491,10 +507,10 @@ Model::load_3ds(const std::string &filename)
-             case 0x4140:
-                 {
-                 uint16_t qty;
--                read_or_fail(input_file, &qty, sizeof(uint16_t));
-+                read_or_fail(input_file, &qty, 1, sizeof(uint16_t));
-                 for (uint16_t i = 0; i < qty; i++) {
-                     float f[2];
--                    read_or_fail(input_file, f, sizeof(float) * 2);
-+                    read_or_fail(input_file, f, 2, sizeof(float));
-                     vec2& texcoord = object->vertices[i].t;
-                     texcoord.x(f[0]);
-                     texcoord.y(f[1]);
diff --git a/srcpkgs/glmark2/template b/srcpkgs/glmark2/template
index ea3bc94ba745..91f4ed55a00c 100644
--- a/srcpkgs/glmark2/template
+++ b/srcpkgs/glmark2/template
@@ -1,21 +1,26 @@
 # Template file for 'glmark2'
 pkgname=glmark2
-version=2021.02
-revision=2
+version=2021.12
+revision=1
 build_style=meson
-configure_args="-Dflavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2"
-hostmakedepends="pkg-config wayland-devel"
-makedepends="libjpeg-turbo-devel libpng-devel libX11-devel MesaLib-devel wayland-devel
- wayland-protocols"
+configure_args="-Dflavors=$(vopt_if wayland 'wayland-gl,wayland-glesv2,')$(vopt_if x11 'x11-gl,x11-glesv2,')drm-gl,drm-glesv2"
+hostmakedepends="pkg-config $(vopt_if wayland wayland-devel)"
+makedepends="libjpeg-turbo-devel libpng-devel MesaLib-devel
+ $(vopt_if wayland 'wayland-devel wayland-protocols') $(vopt_if x11 libX11-devel)"
 short_desc="OpenGL 2.0 and ES 2.0 benchmark"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/glmark2/glmark2"
 changelog="https://raw.githubusercontent.com/glmark2/glmark2/master/NEWS"
 distfiles="https://github.com/glmark2/glmark2/archive/${version}.tar.gz"
-checksum=bebadb78c13aea5e88ed892e5563101ccb745b75f1dc86a8fc7229f00d78cbf1
+checksum=9f111284b2ef1d3fce91928e249e6ca00796a036831b063a549a0f3b03557a95
+
+build_options="wayland x11"
+build_options_default="wayland x11"
 
 pre_build() {
 	# this file is racey, so pre-generate it ahead of time
-	ninja -C build src/xdg-shell-client-protocol.h
+	if [ "$build_option_wayland" ]; then
+		ninja -C build src/xdg-shell-client-protocol.h
+	fi
 }

From 4414fbd985f6a910d7c622ac0083984c18110378 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 7 Jan 2022 17:08:51 +0100
Subject: [PATCH 0048/1427] ugrep: update to 3.5.0.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index d7d2d2959613..f51a42348c98 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.4.0
+version=3.5.0
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=b6404b0bc83e6e852892e705deeafbe1593faf5435baa6fb58991da6242c45e4
+checksum=9f8469e111ee665f6f03e3a8c0e4b06e632ce3fcb90e955b8979696973cfa0db
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From b68b5d69c2b602e3047f2a6ca58a2ae88bdeff01 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 8 Jan 2022 00:40:52 +0100
Subject: [PATCH 0049/1427] gnuplot: update to 5.4.3.

---
 srcpkgs/gnuplot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index cd255d7ed6a0..925f4a92d144 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,6 +1,6 @@
 # Template file for 'gnuplot'
 pkgname=gnuplot
-version=5.4.2
+version=5.4.3
 revision=1
 configure_args="--with-readline=builtin"
 hostmakedepends="pkg-config lua52"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="http://www.gnuplot.info/"
 license="gnuplot"
 distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
-checksum=e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba
+checksum=51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84
 
 subpackages="gnuplot-common"
 if [ -z "$CROSS_BUILD" ]; then

From c6e37f23a9c63ef0012d78bfac186fe69c0a791d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 8 Jan 2022 00:50:47 +0100
Subject: [PATCH 0050/1427] python3-pipx: update to 1.0.0.

---
 srcpkgs/python3-pipx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index 36cbd6787421..b20d67772463 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.17.0
+version=1.0.0
 revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pypa.github.io/pipx/"
 changelog="https://pypa.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=3cb13a918491181b317606cd883bcf573435d535d786aa69bc15a76c7f494de2
+checksum=91e2bca934a5e82785d7b4ae44b95553611311691bd87da31915d08a0ad2df1c
 
 post_install() {
 	vlicense LICENSE

From d98be4cadfadafe58848a5d00ed0837dbe13bd86 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 8 Jan 2022 00:47:12 +0100
Subject: [PATCH 0051/1427] python3-argcomplete: update to 2.0.0.

---
 srcpkgs/python3-argcomplete/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index cd30bdfce4ae..449800ff8652 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
-version=1.12.3
-revision=3
+version=2.0.0
+revision=1
 wrksrc="argcomplete-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/argcomplete"
 distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz"
-checksum=2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445
+checksum=6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20

From 8a6abd94b5089e6dc05159cd415c8a163afc5d4a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 8 Jan 2022 00:50:50 +0100
Subject: [PATCH 0052/1427] stress-ng: update to 0.13.10.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 89018f7f966a..022a9bc2d6ef 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.13.09
+version=0.13.10
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=1b57f2864f562358cb75807c2dca7c13ddee3c94803282b22f75009311967c6c
+checksum=972b429f9eb0afbceabf7f3babab8599d8224b5d146e244c2cfe65129befb973

From 48b266110d29276a5f603079233dc6ae669e15ec Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Fri, 7 Jan 2022 19:00:04 -0600
Subject: [PATCH 0053/1427] nomad: update _git_commit for 1.2.3

---
 srcpkgs/nomad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 6cc47babf0a2..0e6f169d0118 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.2.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=bee0c3e04eb4ce34b8ac22ff27fcb421a9dccec5
+_git_commit=55e5c49b99a6fd2bf925e7fd98d95829776c331f
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"

From 891c812a0b50555dae359f4233a11cfffd5a7621 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 5 Jan 2022 13:23:56 +0100
Subject: [PATCH 0054/1427] chromium: update to 97.0.4692.71.

ppc64le fixes by q66.
---
 .../files/musl-patches/resolver.patch         | 25 +++++----
 .../musl-patches/xxx-ppc64le-support.patch    | 12 ----
 .../patches/chromium-94-ffmpeg-roll.patch     | 49 ----------------
 .../chromium-94-ffmpeg-roll.patch.args        |  1 -
 .../chromium-96-CommandLine-include.patch     | 24 --------
 .../chromium-96-CouponDB-include.patch        | 25 ---------
 ...m-96-DrmRenderNodePathFinder-include.patch | 24 --------
 ...ium-96-RestrictedCookieManager-tuple.patch | 31 ----------
 ...undle-ffmpeg-av_stream_get_first_dts.patch | 12 ++++
 ...-visibility-of-build-config-freetype.patch | 31 ----------
 .../patches/xxx-ppc64le-4k-pages.patch        | 56 +++++++++++++++++++
 .../patches/xxx-ppc64le-support.patch         | 38 -------------
 srcpkgs/chromium/template                     | 14 ++---
 13 files changed, 88 insertions(+), 254 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
 delete mode 100644 srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
 create mode 100644 srcpkgs/chromium/patches/unbundle-ffmpeg-av_stream_get_first_dts.patch
 delete mode 100644 srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch
 create mode 100644 srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch

diff --git a/srcpkgs/chromium/files/musl-patches/resolver.patch b/srcpkgs/chromium/files/musl-patches/resolver.patch
index 091d3f3e88ef..3c2563b7824f 100644
--- a/srcpkgs/chromium/files/musl-patches/resolver.patch
+++ b/srcpkgs/chromium/files/musl-patches/resolver.patch
@@ -38,19 +38,20 @@
    base::Optional<AddressInfo> ai;
 --- net/dns/dns_config_service_linux.cc.orig
 +++ net/dns/dns_config_service_linux.cc
-@@ -432,12 +432,6 @@
-     base::ScopedBlockingCall scoped_blocking_call(
-         FROM_HERE, base::BlockingType::MAY_BLOCK);
+@@ -443,11 +443,13 @@
+       base::ScopedBlockingCall scoped_blocking_call(
+           FROM_HERE, base::BlockingType::MAY_BLOCK);
  
--    std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
--    if (res) {
--      dns_config_ = ConvertResStateToDnsConfig(*res.get());
--      resolv_reader_->CloseResState(res.get());
--    }
--
-     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
-                           dns_config_.has_value());
-     if (!dns_config_.has_value())
++#if defined(__GLIBC__)
+       std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+       if (res) {
+         dns_config_ = ConvertResStateToDnsConfig(*res.get());
+         resolv_reader_->CloseResState(res.get());
+       }
++#endif
+ 
+       UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                             dns_config_.has_value());
 --- net/dns/public/resolv_reader.cc.orig
 +++ net/dns/public/resolv_reader.cc
 @@ -20,19 +20,10 @@
diff --git a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
index a0f8d285fe81..fd5ec6e48bbc 100644
--- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
@@ -1,15 +1,3 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig
-+++ base/allocator/partition_allocator/partition_alloc_config.h
-@@ -114,7 +114,8 @@
- // platforms complicates things. Note that Chromium is not officially supported
- // on any big endian architecture as well.
- #if !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
--    defined(ARCH_CPU_LITTLE_ENDIAN)
-+    defined(ARCH_CPU_LITTLE_ENDIAN) && \
-+    !defined(__powerpc64__)
- #define PA_HAS_FREELIST_HARDENING
- #endif
-
 diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
 index a6aec544e..2a4a7f1bc 100644
 --- sandbox/linux/bpf_dsl/seccomp_macros.h
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
deleted file mode 100644
index 68f26364eda7..000000000000
--- a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
-From: "liberato@chromium.org" <liberato@chromium.org>
-Date: Fri, 6 Aug 2021 04:25:31 +0000
-Subject: [PATCH] FFmpeg M94 roll.
-
-Contains DEPS update + chromium-side fixes.
-
-Bug: 1227259
-Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
-Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
-Commit-Queue: Frank Liberato <liberato@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#909174}
----
- media/ffmpeg/ffmpeg_common.h    | 1 +
- media/filters/ffmpeg_demuxer.cc | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index cede8ac5a7..97d6307e28 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -29,6 +29,7 @@ extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #include <libavutil/mastering_display_metadata.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b072..605001d935 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
- 
-   // Next try to use the first DTS value, for codecs where we know PTS == DTS
-   // (excludes all H26x codecs). The start time must be returned in PTS.
--  if (stream->first_dts != kNoFFmpegTimestamp &&
-+  if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
-       stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
-       stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
-       stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
-     const base::TimeDelta first_pts =
--        ConvertFromTimeBase(stream->time_base, stream->first_dts);
-+        ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
-     if (first_pts < start_time)
-       start_time = first_pts;
-   }
diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch b/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
deleted file mode 100644
index 2d7b7e902376..000000000000
--- a/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 9 Oct 2021 08:27:04 +0000
-Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
-
----
- base/command_line.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/base/command_line.h b/base/command_line.h
-index 706726a..ad02812 100644
---- a/base/command_line.h
-+++ b/base/command_line.h
-@@ -19,6 +19,7 @@
- #include <stddef.h>
- #include <functional>
- #include <map>
-+#include <memory>
- #include <string>
- #include <vector>
- 
--- 
-2.32.0
-
diff --git a/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch b/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
deleted file mode 100644
index 41acfb31b96e..000000000000
--- a/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 6 Oct 2021 15:36:47 +0000
-Subject: [PATCH] IWYU: add vector for std::vector in CouponDB
-
----
- chrome/browser/commerce/coupons/coupon_db.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h
-index f0758f4..93e2dd3 100644
---- a/chrome/browser/commerce/coupons/coupon_db.h
-+++ b/chrome/browser/commerce/coupons/coupon_db.h
-@@ -5,6 +5,8 @@
- #ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
- #define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
- 
-+#include <vector>
-+
- #include "base/callback_helpers.h"
- #include "base/memory/weak_ptr.h"
- #include "url/gurl.h"
--- 
-2.32.0
-
diff --git a/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch b/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
deleted file mode 100644
index fd44eb2c91a0..000000000000
--- a/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 9 Oct 2021 16:17:34 +0000
-Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder
-
----
- ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
-index 06776a7..d5b7b71 100644
---- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
-+++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
-@@ -5,6 +5,7 @@
- #include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h"
- 
- #include <fcntl.h>
-+#include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
--- 
-2.32.0
-
diff --git a/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch b/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
deleted file mode 100644
index cbdca44b738d..000000000000
--- a/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Fri, 08 Oct 2021 06:32:55 +0000
-Subject: [PATCH] libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager.
-
-Fix compilation error:
-    ../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’)
-
-There is no conversion from tuple to pair.
-
-Bug: 957519
-Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752
-Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#929597}
----
-
-diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
-index 425426f..c8c10c6 100644
---- a/services/network/restricted_cookie_manager.cc
-+++ b/services/network/restricted_cookie_manager.cc
-@@ -161,7 +161,7 @@
-     const GURL& url,
-     const net::SiteForCookies& site_for_cookies) {
-   std::unique_ptr<CookieAccesses>& entry =
--      recent_cookie_accesses_[std::tie(url, site_for_cookies)];
-+      recent_cookie_accesses_[std::make_pair(url, site_for_cookies)];
-   if (!entry) {
-     entry = std::make_unique<CookieAccesses>();
-   }
diff --git a/srcpkgs/chromium/patches/unbundle-ffmpeg-av_stream_get_first_dts.patch b/srcpkgs/chromium/patches/unbundle-ffmpeg-av_stream_get_first_dts.patch
new file mode 100644
index 000000000000..dae1adde0bc6
--- /dev/null
+++ b/srcpkgs/chromium/patches/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/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch b/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch
deleted file mode 100644
index d10023bc0267..000000000000
--- a/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 271e45339b7b969e98ccef7837cb1b15480b07fc Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 4 Nov 2021 18:58:34 +0000
-Subject: [PATCH] unbundle: fix visibility of //build/config/freetype
-
-For system freetype //build/linux:freetype_from_pkgconfig is restricted
-to //third_party:freetype_harfbuzz and //third_party/harfbuzz-ng:harfbuzz_source.
-However //build/config/freetype:freetype is accessing it too.
-
-Bug: None
-Change-Id: Ic4a37b01e4ae221372a9220cbad04c598b844c21
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259304
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#938388}
----
- build/linux/BUILD.gn | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn
-index 54314c7687..cd49e3d524 100644
---- a/build/linux/BUILD.gn
-+++ b/build/linux/BUILD.gn
-@@ -23,6 +23,7 @@ if (use_system_freetype) {
-   # the system, use with caution,for details see build/config/freetype/BUILD.gn.
-   pkg_config("freetype_from_pkgconfig") {
-     visibility = [
-+      "//build/config/freetype:freetype",
-       "//third_party:freetype_harfbuzz",
-       "//third_party/harfbuzz-ng:harfbuzz_source",
-     ]
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch b/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch
new file mode 100644
index 000000000000..3ec4f0225a82
--- /dev/null
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch
@@ -0,0 +1,56 @@
+commit 45809f85bc3524f867e6e954f444fddd2333245a
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Jan 7 18:18:52 2022 +0100
+
+    switch ppc64 to 4k pages
+    
+    since the partition allocator appears to hate larger constants
+    and at this point errors at compile time and i am not willing
+    to wade through this pile of curse and we use 4k kernels anyway,
+    assume 4K pages for ppc64
+
+diff --git a/base/allocator/partition_allocator/page_allocator_constants.h b/base/allocator/partition_allocator/page_allocator_constants.h
+index bfd5753..045082b 100644
+--- a/base/allocator/partition_allocator/page_allocator_constants.h
++++ b/base/allocator/partition_allocator/page_allocator_constants.h
+@@ -40,7 +40,7 @@ namespace base {
+ 
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
+ PageAllocationGranularityShift() {
+-#if defined(OS_WIN) || defined(ARCH_CPU_PPC64)
++#if defined(OS_WIN)
+   // Modern ppc64 systems support 4kB (shift = 12) and 64kB (shift = 16) page
+   // sizes.  Since 64kB is the de facto standard on the platform and binaries
+   // compiled for 64kB are likely to work on 4kB systems, 64kB is a good choice
+diff --git a/base/allocator/partition_allocator/partition_alloc_constants.h b/base/allocator/partition_allocator/partition_alloc_constants.h
+index 0b9260d..3e054ec 100644
+--- a/base/allocator/partition_allocator/partition_alloc_constants.h
++++ b/base/allocator/partition_allocator/partition_alloc_constants.h
+@@ -54,11 +54,6 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
+ PartitionPageShift() {
+   return 16;  // 64 KiB
+ }
+-#elif defined(ARCH_CPU_PPC64)
+-PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
+-PartitionPageShift() {
+-  return 18;  // 256 KiB
+-}
+ #elif defined(OS_APPLE) && defined(ARCH_CPU_64_BITS)
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
+ PartitionPageShift() {
+diff --git a/base/allocator/partition_allocator/partition_alloc_forward.h b/base/allocator/partition_allocator/partition_alloc_forward.h
+index 938ea38..9414b41 100644
+--- a/base/allocator/partition_allocator/partition_alloc_forward.h
++++ b/base/allocator/partition_allocator/partition_alloc_forward.h
+@@ -26,7 +26,10 @@ namespace base {
+ //
+ // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
+ // platforms, as Chrome's requirement is C++14 as of 2020.
+-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
++#if defined(__powerpc64__)
++/* we want this to be 16 here always */
++constexpr size_t kAlignment = 16;
++#elif defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
+ constexpr size_t kAlignment =
+     std::max(alignof(max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
+ #else
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 06109237b794..2f66a144e269 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3242,44 +3242,6 @@ index 30a2ab21d..60509f21d 100644
  #endif
  }
  
-diff --git a/third_party/crashpad/crashpad/util/posix/signals_test.cc b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-index 54cc2f19f..298b5c993 100644
---- a/third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
-   return sig == SIGABRT ||
-          sig == SIGALRM ||
-          sig == SIGBUS ||
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-          sig == SIGFPE ||
--#endif  // !defined(ARCH_CPU_ARM64)
-+#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-          sig == SIGILL ||
- #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
-       break;
-     }
- 
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-     // ARM64 has hardware integer division instructions that don’t generate a
-     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
-+    //
-+    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
-     case SIGFPE: {
-       // Optimization makes this tricky, so get zero from a system call likely
-       // to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
-       fstat(quotient, &stat_buf);
-       break;
-     }
--#endif  // ARCH_CPU_ARM64
-+#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- 
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-     case SIGILL: {
 diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
 index 6b4566fc3..c07f732ad 100644
 --- a/third_party/dav1d/BUILD.gn
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index a139b05641c4..576947ba44fd 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=96.0.4664.110
+version=97.0.4692.71
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8
+checksum=8ae189d44b782fe4d4942962260dbf5f753abf141148727d9fe82852778dfd7c
 
 lib32disabled=yes
 
@@ -28,7 +28,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-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
+ libjpeg-turbo-devel libevent-devel json-c-devel
  minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
  re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
  ffmpeg-devel libva-devel python-setuptools xcb-proto libcurl-devel
@@ -42,7 +42,7 @@ esac
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libX11-devel libxcb-devel pciutils-devel libXext-devel libglvnd-devel
-	 libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel harfbuzz-devel
+	 libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
 	 libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
 	 $(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
 	 libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
@@ -166,12 +166,12 @@ do_configure() {
 	# use_system_v8=1
 	# use_system_zlib=1
 	# bzip2 jsoncpp minizip xdg_utils speex
+	# XXX: harfbuzz-ng use builtin one until system-wide is updated >=3.0.0
 	system="
 		ffmpeg
 		flac
 		fontconfig
 		freetype
-		harfbuzz-ng
 		libdrm
 		libevent
 		libjpeg
@@ -234,7 +234,7 @@ do_configure() {
 		'enable_widevine=true'
 		'enable_hangout_services_extension=true'
 
-		'use_system_harfbuzz=true'
+		'use_system_harfbuzz=false'
 		'use_system_wayland_scanner=true'
 
 		'use_cups=true'
@@ -320,7 +320,7 @@ do_configure() {
 
 do_build() {
 	_setup_toolchain
-	ninja -C out/Release ${makejobs} chrome chromedriver chrome_crashpad_handler
+	CCACHE_SLOPPINESS=include_file_mtime ninja -C out/Release ${makejobs} chrome chromedriver chrome_crashpad_handler
 }
 
 do_install() {

From d574f424198cdc13fdfb7ecc10934fe9a4fccdcc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 8 Jan 2022 05:41:40 +0100
Subject: [PATCH 0055/1427] hotspot: broken on big endian

---
 srcpkgs/hotspot/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/hotspot/template b/srcpkgs/hotspot/template
index 63135c632647..cec377394d91 100644
--- a/srcpkgs/hotspot/template
+++ b/srcpkgs/hotspot/template
@@ -20,3 +20,7 @@ nocross="perf is nocross"
 
 # https://github.com/KDAB/hotspot/issues/141#issuecomment-668542022
 make_check=no
+
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="fails to link because of something with qt endian stuff"
+fi

From 6e498d5f14e946486aefab72bcba175187429c87 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 Jan 2022 10:12:48 +0100
Subject: [PATCH 0056/1427] lxqt-globalkeys: update to 1.0.1.

---
 srcpkgs/lxqt-globalkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template
index b2e58f2695f5..97537e06f8ae 100644
--- a/srcpkgs/lxqt-globalkeys/template
+++ b/srcpkgs/lxqt-globalkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-globalkeys'
 pkgname=lxqt-globalkeys
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-globalkeys/releases/download/${version}/lxqt-globalkeys-${version}.tar.xz"
-checksum=a90923328a660a5d49f6e51df983213b8c152a8148a49f2eaa2965d3bed92594
+checksum=b81944cc8d8f20f1eeedb3cd54d4e6ad86a1697d71b4212cf60110af43559a45
 replaces="lxqt-common>=0"
 
 lxqt-globalkeys-devel_package() {

From e9dfda619b078620c4c102f4f15572eb02e99c8c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 8 Jan 2022 11:42:46 +0100
Subject: [PATCH 0057/1427] wine: update to 7.0rc5.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index dd5c4f883f00..cf1940a06a6f 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.0-rc4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.0-rc4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.0-rc5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.0-rc5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 60ec98c4a1d9..c8b077457d5f 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.0-rc4/configure
-+++ b/wine-7.0-rc4/configure
+--- a/wine-7.0-rc5/configure
++++ b/wine-7.0-rc5/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.0-rc4/configure.ac
-+++ b/wine-7.0-rc4/configure.ac
+--- a/wine-7.0-rc5/configure.ac
++++ b/wine-7.0-rc5/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 26446ebe34a4..4a5d74855dee 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.0-rc4/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-7.0-rc4/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-7.0-rc5/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-7.0-rc5/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index d03f83390e52..88f0b7f8cbe3 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.0rc4
+version=7.0rc5
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="1b027324850e932e8f5b0a317c475be6cc1467d27961b0722c9bc463530b1dbb
- 394632cbfb8ae7162654cf04743d4aa0704aaa060f5e38056a5b4c0e242d6e1b"
+checksum="8d08c79de6006771f6e845e37bd732a1db9737b4da9222e4b037733688b77758
+ df00729d057da201ab4cd0cc348d3ce13b8c790aac1d1093796ca0f90f8e8727"
 
 build_options="mingw staging"
 build_options_default="mingw"

From e12741a53d4935523d6516ec553cbca35722f52d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 8 Jan 2022 17:18:48 +0100
Subject: [PATCH 0058/1427] perl-IO-Socket-SSL: update to 2.074.

---
 srcpkgs/perl-IO-Socket-SSL/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-IO-Socket-SSL/template b/srcpkgs/perl-IO-Socket-SSL/template
index e725375e8a30..a4f21362b9ab 100644
--- a/srcpkgs/perl-IO-Socket-SSL/template
+++ b/srcpkgs/perl-IO-Socket-SSL/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-IO-Socket-SSL'
 pkgname=perl-IO-Socket-SSL
-version=2.073
+version=2.074
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/IO-Socket-SSL"
 distfiles="${CPAN_SITE}/IO/${pkgname/perl-/}-${version}.tar.gz"
-checksum=b2c0b34df97cb1aa816221cee2454a1efd89b86ccbda810389a30e0d08cf57c8
+checksum=36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832

From 189ce1ff06ba82aa5dbd3d91419a01403e31222c Mon Sep 17 00:00:00 2001
From: Kamil Smardzewski <roderyk197@gmail.com>
Date: Sat, 8 Jan 2022 13:16:04 +0100
Subject: [PATCH 0059/1427] bash: update to 5.1.016.

---
 srcpkgs/bash/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index c13fef6e2bd2..9751a08f34ee 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,6 +1,6 @@
 # Template file for 'bash'
 pkgname=bash
-version=5.1.008
+version=5.1.016
 revision=1
 _bash_distver=${version%.*}
 _bash_patchlevel=${version##*.}
@@ -34,7 +34,15 @@ checksum="cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
  cccbb5e9e6763915d232d29c713007a62b06e65126e3dd2d1128a0dc5ef46da5
  75e17d937de862615c6375def40a7574462210dce88cf741f660e2cc29473d14
  acfcb8c7e9f73457c0fb12324afb613785e0c9cef3315c9bbab4be702f40393a
- f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1"
+ f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1
+ e45cda953ab4b4b4bde6dc34d0d8ca40d1cc502046eb28070c9ebcd47e33c3ee
+ a2c8d7b2704eeceff7b1503b7ad9500ea1cb6e9393faebdb3acd2afdd7aeae2a
+ 58191f164934200746f48459a05bca34d1aec1180b08ca2deeee3bb29622027b
+ 10f189c8367c4a15c7392e7bf70d0ff6953f78c9b312ed7622303a779273ab98
+ c7acb66df435d284304c16ca83a5265f9edd9368612095b01a733d45c77ed5ad
+ 6a4ee0c81b437b96279a792c1efcec4ba56f009195a318083db6b53b096f83d0
+ 1b37692ef1f6cc3dcec246773443276066e6b1379868f8c14e01f4dfd4df80f0
+ 8899144f76a5db1fb41a89ed881c9f19add95728dd71db324f772ef225c5384f"
 
 make_dirs="/etc/bash/bashrc.d 755 root root"
 conflicts="chroot-bash>=0"

From dcfc9eef5402a0e94c2ecc511a3a6eb7afc200e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH 0060/1427] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..6c554e96974e 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,21 +1,29 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
-	vmkdir usr/share/sbt
+	vmkdir usr/lib/sbt
 	vmkdir usr/bin
-	vcopy "*" usr/share/sbt
-	ln -rs ${DESTDIR}/usr/share/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
+	vcopy "*" usr/lib/sbt
+	ln -rs ${DESTDIR}/usr/lib/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
 
-	rm ${DESTDIR}/usr/share/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.exe
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*apple-darwin
+
+	# Remove x86_64 binaries when it doesn't match the machine.
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64) ;;
+		*) rm ${DESTDIR}/usr/lib/${pkgname}/bin/*x86_64* ;;
+	esac
 }

From b16adf3a424c43822e3d6dabdcbe0dfd41912a46 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Thu, 6 Jan 2022 18:27:55 +0100
Subject: [PATCH 0061/1427] iso-codes: update to 4.9.0.

---
 srcpkgs/iso-codes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index 1003ef170f5e..99c99a986108 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -1,6 +1,6 @@
 # Template file for 'iso-codes'
 pkgname=iso-codes
-version=4.8.0
+version=4.9.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext python3"
@@ -10,4 +10,4 @@ license="LGPL-2.1-or-later"
 homepage="https://salsa.debian.org/iso-codes-team/iso-codes"
 changelog="https://salsa.debian.org/iso-codes-team/iso-codes/-/raw/main/CHANGELOG.md"
 distfiles="${DEBIAN_SITE}/main/i/iso-codes/${pkgname}_${version}.orig.tar.xz"
-checksum=b02b9c8bb81dcfa03e4baa25b266df47710832cbf550081cf43f72dcedfc8768
+checksum=d090112a529dbe37a0a1b46b8246cc1cfca92e0281ba27239426a2b693e28967

From 69660a7a151dcbebd936bf112f230687a41b0e32 Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Wed, 5 Jan 2022 21:17:30 +0000
Subject: [PATCH 0062/1427] stern: update to 1.21.0.

---
 srcpkgs/stern/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 6665b697ee89..1efac280670f 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,6 +1,6 @@
 # Template file for 'stern'
 pkgname=stern
-version=1.20.1
+version=1.21.0
 revision=1
 build_style=go
 go_import_path="github.com/stern/stern"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://github.com/stern/stern"
 distfiles="https://github.com/stern/stern/archive/v${version}.tar.gz"
-checksum=941bd4754b0efa9d0692edcae2eb97362f6caa5ccc5aba1be6b4aab0c579bf47
+checksum=0ccf1375ee3c20508c37de288a46faa6b0e4dffb3a3749f4b699a30f95e861be
 
 # fix: collect2: fatal error: cannot find 'ld'
 LDFLAGS="-fuse-ld=bfd"

From b749ac64198be5096f9d31c04f05aa8d5ef51134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 5 Jan 2022 20:59:20 -0300
Subject: [PATCH 0063/1427] nostrip_files: allow full path

The option `nostrip_files` takes a filename without path, in contrast to
option `nopie_files` which takes only full path.

This commit makes it so that `nostrip_files` can take either the
filename or the full path.
---
 Manual.md                                            | 4 ++--
 common/hooks/post-install/06-strip-and-debug-pkgs.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Manual.md b/Manual.md
index 2a7a990d37a1..3e641633ba6a 100644
--- a/Manual.md
+++ b/Manual.md
@@ -644,7 +644,7 @@ Example: `conf_files="/etc/foo.conf /etc/foo2.conf /etc/foo/*.conf"`.
 default all binaries are stripped.
 
 - `nostrip_files` White-space separated list of ELF binaries that won't be stripped of
-debugging symbols.
+debugging symbols. Files can be given by full path or by filename.
 
 - `noshlibprovides` If set, the ELF binaries won't be inspected to collect the provided
 sonames in shared libraries.
@@ -690,7 +690,7 @@ This appends to the generated file rather than replacing it.
   features (PIE, relro, etc). Not necessary for most packages.
 
 - `nopie_files` White-space seperated list of ELF binaries that won't be checked
-for PIE.
+for PIE. Files must be given by full path.
 
 - `reverts` xbps supports a unique feature which allows to downgrade from broken
 packages automatically. In the `reverts` field one can define a list of broken
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index 2cec68412c50..191c025e552c 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -72,7 +72,7 @@ hook() {
 
 		fname=${f##*/}
 		for x in ${nostrip_files}; do
-			if [ "$x" = "$fname" ]; then
+			if [ "$x" = "$fname" -o "$x" = "${f#$PKGDESTDIR}" ]; then
 				found=1
 				break
 			fi

From 59acb08bedc7a4e3b07a3a64e867a703f3a5baea Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sat, 8 Jan 2022 22:26:11 +0700
Subject: [PATCH 0064/1427] vivaldi: update to 5.0.2497.35

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 2bdd3e8b7e7a..5b19e70c2c95 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.0.2497.32
+version=5.0.2497.35
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=fffa0a0f1402920239f694098fa8ae501b21139220836b11c8397d01001e63d0
+checksum=5c1e7d89d008b6ed6ae6b9ef911676c08d14312e31cc103e7db72f0005e06cbc
 repository=nonfree
 restricted=yes
 nostrip=yes

From f0f9e3e27ccdd3ec7f6e21e5a6406135fb330a03 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 8 Jan 2022 08:58:17 +0100
Subject: [PATCH 0065/1427] perl-CryptX: update to 0.076

---
 srcpkgs/perl-CryptX/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CryptX/template b/srcpkgs/perl-CryptX/template
index f43289900a41..e8df2eea5906 100644
--- a/srcpkgs/perl-CryptX/template
+++ b/srcpkgs/perl-CryptX/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-CryptX'
 pkgname=perl-CryptX
-version=0.075
+version=0.076
 revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
@@ -12,5 +12,6 @@ short_desc="Cryptographic toolkit (self-contained, no external libraries needed)
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 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=f4f742d1c165ed337abadaab3ec18d9a05c577a6d635e777b9a4b8809e2cc0f4
+checksum=bb84ac012438c7cecdb51a5a6fffb4f1fee3b0eae0022e96cebc2e167522621c

From 954d3a102ec700d9d4134c3b74f4b7be46baf7e9 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sat, 8 Jan 2022 08:41:04 -0600
Subject: [PATCH 0066/1427] gns3-server: update to 2.2.29.

---
 srcpkgs/gns3-server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index a129019d74ee..7441ffbcf050 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.28
+version=2.2.29
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=bd37601f2924fc00a9a1690478896566911e466699d68af0abadd097dd1e314b
+checksum=34237771bb743ac9142569e67284123b6090f78cfd802a729e2f11b9d5d48929
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From e08974668ca81560e187b4696786b25ac246dd05 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Sat, 8 Jan 2022 08:41:12 -0600
Subject: [PATCH 0067/1427] gns3-gui: update to 2.2.29.

---
 srcpkgs/gns3-gui/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 09e7adabbed2..64a25d1c80b6 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,10 +1,8 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.28
+version=2.2.29
 revision=1
 build_style=python3-module
-# Skip tests/test_link.py::test_create_link test that wasn't updated with the code https://github.com/GNS3/gns3-gui/commit/545a9f53
-make_check_args="-k-test_create_link"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
  python3-PyQt5-svg python3-PyQt5-websockets xterm inetutils-telnet
@@ -16,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=8b6e5df17ae472bf3525e1adbb1a0d2c6f170df270f802163c00c02d75cc4ced
+checksum=5b9b6db1917af66d0e4bf32c41ff17d6a03a487a2a870d18b04e68e7b572bf28
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From 55d464a0f990f0f2c33f4ee3d7cc7f385d3c35fd Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 7 Jan 2022 07:57:19 +0700
Subject: [PATCH 0068/1427] inkscape: add missing dependency

---
 srcpkgs/inkscape/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index e53c0b378e71..742c6f95bddb 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1.1
-revision=1
+revision=2
 wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
 build_style=cmake
 # builds executables then runs checks
@@ -13,8 +13,8 @@ makedepends="harfbuzz-devel libsoup-devel gsl-devel pango-devel libatomic_ops-de
  double-conversion-devel gc-devel libwpd-devel libcdr-devel libvisio-devel
  poppler-devel libwpd-devel potrace-devel gtkmm-devel gdl-devel gtkspell3-devel
  aspell-devel libxslt-devel libgomp-devel libwpg-devel poppler-glib-devel"
-depends="desktop-file-utils hicolor-icon-theme python3-lxml python3-numpy python3-scour
- python3-Pillow"
+depends="desktop-file-utils hicolor-icon-theme python3-appdirs python3-lxml python3-numpy
+ python3-scour python3-Pillow"
 checkdepends="$depends gtest-devel ImageMagick cantarell-fonts"
 short_desc="Vector-based drawing program"
 maintainer="Alex Lohr <alex.lohr@logmein.com>"

From 96791ed046d4da90dc529f26d5b543641f225e52 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 7 Jan 2022 22:17:44 +0100
Subject: [PATCH 0069/1427] s: update to 0.6.4.

---
 srcpkgs/s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index cb9c4fc4e4ca..76a7da458242 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
 # Template file for 's'
 pkgname=s
-version=0.6.2
+version=0.6.4
 revision=1
 build_helper=qemu
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=acc38953fcb21e1dd2cd761b9d2bf8272aa6aa30fed2adb657f2dba7e4df872f
+checksum=5829a18da40cb5a936f32240b4244d2a0543cb85dc3d5e013ae5aa08557c148f
 
 post_build() {
 	s_cli=$(find $GOPATH/bin -name s)

From 03f5d181e07947ef8805bec10603edbe7dbb7ebc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 7 Jan 2022 19:25:19 +0200
Subject: [PATCH 0070/1427] uriparser: update to 0.9.6.

---
 srcpkgs/uriparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/uriparser/template b/srcpkgs/uriparser/template
index 36389d151f84..7a8db02f46e7 100644
--- a/srcpkgs/uriparser/template
+++ b/srcpkgs/uriparser/template
@@ -1,6 +1,6 @@
 # Template file for 'uriparser'
 pkgname=uriparser
-version=0.9.5
+version=0.9.6
 revision=1
 build_style=cmake
 make_check_target=test
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="BSD-3-Clause"
 homepage="https://uriparser.github.io/"
 distfiles="https://github.com/${pkgname}/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=dd8061eba7f2e66c151722e6db0b27c972baa6215cf16f135dbe0f0a4bc6606c
+checksum=9ce4c3f151e78579f23937b44abecb428126863ad02e594e115e882353de905b
 
 post_install() {
 	vlicense COPYING

From 114d18d02710f1ee4c849bf48339680d07267d61 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 7 Jan 2022 19:52:40 +0200
Subject: [PATCH 0071/1427] nemo-python: update to 5.2.0.

---
 srcpkgs/nemo-python/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template
index e87562d1810d..94cbd08a74a1 100644
--- a/srcpkgs/nemo-python/template
+++ b/srcpkgs/nemo-python/template
@@ -1,8 +1,8 @@
 # Template file for 'nemo-python'
 pkgname=nemo-python
-version=5.0.1
+version=5.2.0
 revision=1
-wrksrc="nemo-extensions-nemo-python-${version}"
+wrksrc="nemo-extensions-${version}"
 build_wrksrc=nemo-python
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,5 +11,5 @@ short_desc="Nemo python binding"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
-distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-python-${version}.tar.gz"
-checksum=b0900d80a082ef4f5aa1ca7c322fca3e33e7a6dfcc4be4c19cca6ae7d8111dbe
+distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/${version}.tar.gz"
+checksum=92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5

From cd5b6c94cb01acef06c4567a682a75abba6e3b9c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 7 Jan 2022 19:52:49 +0200
Subject: [PATCH 0072/1427] nemo-preview: update to 5.2.1.

---
 srcpkgs/nemo-preview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo-preview/template b/srcpkgs/nemo-preview/template
index 22767ba17c81..4faaeb2a783b 100644
--- a/srcpkgs/nemo-preview/template
+++ b/srcpkgs/nemo-preview/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-preview'
 pkgname=nemo-preview
-version=5.0.1
+version=5.2.1
 revision=1
 wrksrc="nemo-extensions-${pkgname}-${version}"
 build_wrksrc=nemo-preview
@@ -14,4 +14,4 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-preview-${version}.tar.gz"
-checksum=042719518af70c21879df5f5e314aec03da727fc3c118c509ef9aba59744a6cd
+checksum=eacef0d86bd75b575676386fccd11084697d64e5c9ef405db8653e95fb0e1ec4

From a359528c59363fe1aff4a34a9f70d49f3dd74190 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 7 Jan 2022 19:52:55 +0200
Subject: [PATCH 0073/1427] nemo-compare: update to 5.2.1.

---
 srcpkgs/nemo-compare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template
index e53193719dc3..762326163660 100644
--- a/srcpkgs/nemo-compare/template
+++ b/srcpkgs/nemo-compare/template
@@ -1,6 +1,6 @@
 # Template file for 'nemo-compare'
 pkgname=nemo-compare
-version=5.0.1
+version=5.2.1
 revision=1
 wrksrc="nemo-extensions-${pkgname}-${version}"
 build_wrksrc=nemo-compare
@@ -13,4 +13,4 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/linuxmint/nemo-extensions"
 distfiles="https://github.com/linuxmint/nemo-extensions/archive/refs/tags/nemo-compare-${version}.tar.gz"
-checksum=7eef629856f64b7483d372259994b878398e98903d83319e1072d754a034289e
+checksum=cd81bd4c4dc8c53c65fb9ebc4f94f8fe83c6731f570ec333390134dab202b089

From c3fdb7667a942c5244926cc11ae2ca3bd74c223b Mon Sep 17 00:00:00 2001
From: Antonio Gurgel <antonio@goorzhel.com>
Date: Fri, 7 Jan 2022 22:34:03 -0800
Subject: [PATCH 0074/1427] logrotate: update to 3.19.0.

---
 srcpkgs/logrotate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index 011beae16a99..b967dd87a21d 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -1,6 +1,6 @@
 # Template file for 'logrotate'
 pkgname=logrotate
-version=3.18.1
+version=3.19.0
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel popt-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/logrotate/logrotate"
 distfiles="${homepage}/releases/download/${version}/logrotate-${version}.tar.xz"
-checksum=14a924e4804b3974e85019a9f9352c2a69726702e6656155c48bcdeace68a5dc
+checksum=ddd5274d684c5c99ca724e8069329f343ebe376e07493d537d9effdc501214ba
 make_dirs="/etc/logrotate.d 0755 root root"
 
 post_install() {

From 7415b10956c28dc0f59e3c42558512a413c84356 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Jan 2022 22:51:15 +0100
Subject: [PATCH 0075/1427] knot-resolver: update to 5.4.4.

---
 srcpkgs/knot-resolver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index 56fd104bc0f0..2f03d4420f03 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.4.3
+version=5.4.4
 revision=1
 build_style=meson
 configure_args="
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506
+checksum=588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 67bdc8cb746efbb7716d9109000547b58144a7d1 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 8 Jan 2022 08:59:16 +0100
Subject: [PATCH 0076/1427] perl-MRO-Compat: update to 0.15

---
 srcpkgs/perl-MRO-Compat/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/perl-MRO-Compat/template b/srcpkgs/perl-MRO-Compat/template
index bc6ad62d81f2..00dd1c0fbdc8 100644
--- a/srcpkgs/perl-MRO-Compat/template
+++ b/srcpkgs/perl-MRO-Compat/template
@@ -1,15 +1,16 @@
 # Template file for 'perl-MRO-Compat'
 pkgname=perl-MRO-Compat
-version=0.13
-revision=3
+version=0.15
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
-makedepends="${hostmakedepends}"
-depends="${hostmakedepends}"
+makedepends="perl"
+depends="perl"
 short_desc="MRO::Compat - mro::* interface compatibility for Perls < 5.9.5"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/MRO-Compat"
+changelog="https://raw.githubusercontent.com/moose/MRO-Compat/master/Changes"
 distfiles="${CPAN_SITE}/App/HAARG/MRO-Compat-${version}.tar.gz"
-checksum=8a2c3b6ccc19328d5579d02a7d91285e2afd85d801f49d423a8eb16f323da4f8
+checksum=0d4535f88e43babd84ab604866215fc4d04398bd4db7b21852d4a31b1c15ef61

From 57079f38b0400a9959ef03f2a9307c916a3adee1 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 8 Jan 2022 09:34:18 +0100
Subject: [PATCH 0077/1427] drone-cli: update to 1.5.0.

---
 srcpkgs/drone-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 44885976b677..8c9d2d0ed5db 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=go
 go_import_path=github.com/drone/drone-cli
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/drone/drone-cli"
 changelog="https://raw.githubusercontent.com/drone/drone-cli/master/CHANGELOG.md"
 distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=6b19378c923f71303dc753f2d39e7126285c23a504d20e3ce35fa8ee5605db03
+checksum=fe7ffd0a886841ed279251a9af96e04e34447833a0a51551fffe496d08b472f6

From 0717419f58bbb25ef42131d0e7cc864620cc1f4d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 8 Jan 2022 09:42:34 +0100
Subject: [PATCH 0078/1427] radicale: update to 3.1.0.

---
 srcpkgs/radicale/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 3c8356a5fcb6..bc4fb07f17bd 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.0.6
-revision=3
+version=3.1.0
+revision=1
 wrksrc="Radicale-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,9 +12,9 @@ short_desc="Complete calendar and contact storing and manipulating solution"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://radicale.org"
-changelog="https://github.com/Kozea/Radicale/blob/${version}/NEWS.md"
-distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
-checksum=69cfbcc66f8dc13fb82c82ed9561a9aad30462a6bb09b45a64ad39401bf61b98
+changelog="https://github.com/Kozea/Radicale/blob/master/NEWS.md"
+distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
+checksum=96ea98ea5a888069fbda1efe4fa68fa4b2966283cf0285bc5911b027d0a921ee
 conf_files="
  /etc/radicale/config
  /etc/radicale/rights

From 167fa9dc4575f89d35b59eee8cd85ba370588785 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 8 Jan 2022 17:48:44 -0300
Subject: [PATCH 0079/1427] icewm: update to 2.9.4.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 6b1efbef2219..68c9ff36f589 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.9.3
+version=2.9.4
 revision=1
 build_style=cmake
 make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=0aeebdd403a3307a2ea83809055dabaab893193470dec930b25a5072f0c2d4d6
+checksum=5a41b4745e23c9d5bb14fb6be1348730b4c74d64689e1c63d4b412c6a581683e
 # broken tests
 make_check=no
 

From cc01657189ba23b532fcd330f6a215c44439c3ad Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 8 Jan 2022 21:54:26 +0100
Subject: [PATCH 0080/1427] cozy: update to 1.2.0.

---
 srcpkgs/cozy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template
index 8f78e4acd01a..1189a59c88db 100644
--- a/srcpkgs/cozy/template
+++ b/srcpkgs/cozy/template
@@ -1,6 +1,6 @@
 # Template file for 'cozy'
 pkgname=cozy
-version=1.1.3
+version=1.2.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee
@@ -15,4 +15,4 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-only, LGPL-3.0-only, Apache-2.0"
 homepage="https://github.com/geigi/cozy"
 distfiles="https://github.com/geigi/cozy/archive/${version}.tar.gz"
-checksum=21d49b660c970de513994f40dfd3a0dfc65834319ef1813bbc62a004ec17cfdf
+checksum=5dbe1fb010bcc8b7a5b925aa2653808fdb14b58f87aad0cac8b0964d91eefc21

From c3d6ec8cd18cdf7d5f449f0fedfab848286c9bdf Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 8 Jan 2022 07:54:12 +0100
Subject: [PATCH 0081/1427] zita-alsa-pcmi: update to 0.4.0

---
 srcpkgs/zita-alsa-pcmi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zita-alsa-pcmi/template b/srcpkgs/zita-alsa-pcmi/template
index 908642f6e3fc..ab83dfb41a9d 100644
--- a/srcpkgs/zita-alsa-pcmi/template
+++ b/srcpkgs/zita-alsa-pcmi/template
@@ -1,6 +1,6 @@
 # Template file for 'zita-alsa-pcmi'
 pkgname=zita-alsa-pcmi
-version=0.3.2
+version=0.4.0
 revision=1
 build_wrksrc="source"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=1a1d9f7e373032bd5702382e4c923407911f4f791c449c0c0f027a725edba789
+checksum=bd8c9f360dfb541fb60e48a713baf1e22d41b2c74c19a0fe9f2d34e72f50f1c5
 
 CXXFLAGS="-fPIC"
 

From be77f3a5c8aed179dd2f13b15387182dc87dfddc Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 7 Jan 2022 07:26:16 +0100
Subject: [PATCH 0082/1427] python3-pikepdf: update to 4.3.1.

---
 srcpkgs/python3-pikepdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 7ab9e42a9b72..5818ac130bdd 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.2.0
+version=4.3.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
 hostmakedepends="python3-pybind11 python3-setuptools_scm python3-wheel"
 makedepends="libqpdf-devel python3-pybind11"
-depends="python3-lxml python3-Pillow python3-setuptools"
+depends="python3-lxml python3-packaging python3-Pillow python3-setuptools"
 checkdepends="python3-dateutil python3-hypothesis python3-psutil python3-pytest
  $depends"
 short_desc="Python library for reading and writing PDF files"
@@ -14,7 +14,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="MPL-2.0"
 homepage="https://github.com/pikepdf/pikepdf"
 distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
-checksum=9a91564193f2c01a55aef4c3b97764b2cb59443034b62a95620b12eb265c647e
+checksum=8836e6060534c7245c8d736e93600667b928c767a012a73bb567f56bbe3d985c
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 3f0aac814472dbef80003a9739296ce93523927d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 8 Jan 2022 22:33:53 +0100
Subject: [PATCH 0083/1427] chatty: update to 0.16.

---
 srcpkgs/chatty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 877edb69f4a6..723aad3088a6 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,6 +1,6 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.15
+version=0.16
 revision=1
 hostmakedepends="gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum=da1ea6b530a7b6548382550a0b4789ea4207f213c46d5e516e7574b47a2f1de1
+checksum=18d5b096caae03f7d5d6a0afc68063f43ac6cfcfa982ca574872fb948f2c6b2d
 
 do_build() {
 	gradle shadowJar

From 7bbe0c84f014cf3c9652415911918e0e180657db Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 8 Jan 2022 03:41:57 +1100
Subject: [PATCH 0084/1427] hidapi: update to 0.11.2.

---
 srcpkgs/hidapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hidapi/template b/srcpkgs/hidapi/template
index 76599089b8d1..996f99cb9f9e 100644
--- a/srcpkgs/hidapi/template
+++ b/srcpkgs/hidapi/template
@@ -1,6 +1,6 @@
 # Template file for 'hidapi'
 pkgname=hidapi
-version=0.11.0
+version=0.11.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/libusb/hidapi"
 distfiles="https://github.com/libusb/hidapi/archive/hidapi-${version}.tar.gz"
-checksum=391d8e52f2d6a5cf76e2b0c079cfefe25497ba1d4659131297081fc0cd744632
+checksum=bc4ac0f32a6b21ef96258a7554c116152e2272dacdec1e4620fc44abeea50c27
 
 pre_configure() {
 	./bootstrap

From 97d4ba39ea796cbd1eca586c38db21a528c2784c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 6 Jan 2022 00:43:22 -0500
Subject: [PATCH 0085/1427] nushell: update to 0.42.0

---
 .../nushell/patches/system-libraries.patch    | 36 ++++++++++---------
 srcpkgs/nushell/template                      |  9 ++---
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/nushell/patches/system-libraries.patch b/srcpkgs/nushell/patches/system-libraries.patch
index 1b154a11dd41..6cf71782e4ca 100644
--- a/srcpkgs/nushell/patches/system-libraries.patch
+++ b/srcpkgs/nushell/patches/system-libraries.patch
@@ -1,8 +1,8 @@
-Index: nushell-0.34.0/Cargo.toml
-===================================================================
---- nushell-0.34.0.orig/Cargo.toml
-+++ nushell-0.34.0/Cargo.toml
-@@ -259,3 +259,7 @@ required-features = ["sqlite"]
+diff --git a/Cargo.toml.orig b/Cargo.toml
+index 7c53d6d1ed..510ef7698b 100644
+--- a/Cargo.toml.orig
++++ b/Cargo.toml
+@@ -227,3 +227,7 @@ required-features = ["sqlite"]
  [[bin]]
  name = "nu"
  path = "src/main.rs"
@@ -10,29 +10,31 @@ Index: nushell-0.34.0/Cargo.toml
 +[dependencies.zstd]
 +features = ["pkg-config"]
 +version = ">=0.0.0"
-Index: nushell-0.34.0/crates/nu_plugin_from_sqlite/Cargo.toml
-===================================================================
---- nushell-0.34.0.orig/crates/nu_plugin_from_sqlite/Cargo.toml
-+++ nushell-0.34.0/crates/nu_plugin_from_sqlite/Cargo.toml
-@@ -20,7 +20,7 @@ num-traits = "0.2.14"
+====
+diff --git a/crates/nu_plugin_from_sqlite/Cargo.toml.orig b/crates/nu_plugin_from_sqlite/Cargo.toml
+index ef28788f42..ad439b5fd3 100644
+--- a/crates/nu_plugin_from_sqlite/Cargo.toml.orig
++++ b/crates/nu_plugin_from_sqlite/Cargo.toml
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.42.0" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
 -features = ["bundled", "blob"]
 +features = ["blob"]
- version = "0.25.3"
+ version = "0.26.1"
  
  [build-dependencies]
-Index: nushell-0.34.0/crates/nu_plugin_to_sqlite/Cargo.toml
-===================================================================
---- nushell-0.34.0.orig/crates/nu_plugin_to_sqlite/Cargo.toml
-+++ nushell-0.34.0/crates/nu_plugin_to_sqlite/Cargo.toml
-@@ -20,7 +20,7 @@ num-traits = "0.2.14"
+====
+diff --git a/crates/nu_plugin_to_sqlite/Cargo.toml.orig b/crates/nu_plugin_to_sqlite/Cargo.toml
+index 6e26ec5fda..a551200402 100644
+--- a/crates/nu_plugin_to_sqlite/Cargo.toml.orig
++++ b/crates/nu_plugin_to_sqlite/Cargo.toml
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.42.0" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
 -features = ["bundled", "blob"]
 +features = ["blob"]
- version = "0.25.3"
+ version = "0.26.1"
  
  [build-dependencies]
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 2992ab13997f..444d11e67e75 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.34.0
-revision=2
+version=0.42.0
+revision=1
 build_style=cargo
 configure_args="--features=extra"
 hostmakedepends="pkg-config python3 libgit2-devel"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://github.com/nushell/nushell/archive/refs/tags/${version}.tar.gz"
-checksum=9571c7fbf0f0fdabb055727b63b6a5c3561f04357336289106591fc6afcff7a3
+checksum=68efbc58b1f7b4936a2f84903e093d66b172fb3d62f246966b8c5a8f8345eaae
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no
@@ -23,9 +23,6 @@ case "$XBPS_TARGET_MACHINE" in
 	i686*)
 		broken='https://build.voidlinux.org/builders/i686_builder/builds/33520/steps/shell_3/logs/stdio'
 		;;
-esac
-
-case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="arrow-rs parquet is busted garbage";;
 esac
 

From f1c9382b632ed09d3e9d479bdc989670975985e6 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 8 Jan 2022 22:33:10 +0100
Subject: [PATCH 0086/1427] hugin: update to 2021.0.0.

---
 .../patches/0001-disable-vigra-links-exr-check.patch | 12 ++++++------
 srcpkgs/hugin/template                               |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/hugin/patches/0001-disable-vigra-links-exr-check.patch b/srcpkgs/hugin/patches/0001-disable-vigra-links-exr-check.patch
index 814252350b34..8403d7b1c4cf 100644
--- a/srcpkgs/hugin/patches/0001-disable-vigra-links-exr-check.patch
+++ b/srcpkgs/hugin/patches/0001-disable-vigra-links-exr-check.patch
@@ -1,14 +1,14 @@
-From c4ef0397cf4a85109a83b0a76553629d6d8fd87f Mon Sep 17 00:00:00 2001
+From 82af9705aacf1bcae713715eeda25f114800ed1d Mon Sep 17 00:00:00 2001
 From: lemmi <lemmi@nerd2nerd.org>
-Date: Tue, 15 Dec 2020 14:54:48 +0100
+Date: Sat, 8 Jan 2022 23:02:31 +0100
 Subject: [PATCH] disable vigra-links-exr check
 
 ---
  CMakeModules/FindVIGRA.cmake | 18 ------------------
  1 file changed, 18 deletions(-)
 
-diff --git CMakeModules/FindVIGRA.cmake CMakeModules/FindVIGRA.cmake
-index 2349916..f867b55 100755
+diff --git a/CMakeModules/FindVIGRA.cmake b/CMakeModules/FindVIGRA.cmake
+index 320cf3d..f867b55 100755
 --- a/CMakeModules/FindVIGRA.cmake
 +++ b/CMakeModules/FindVIGRA.cmake
 @@ -63,24 +63,6 @@ IF (VIGRA_FOUND)
@@ -26,7 +26,7 @@ index 2349916..f867b55 100755
 -        OUTPUT_STRIP_TRAILING_WHITESPACE
 -      )
 -      STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
--      IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
+-      IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf|libopenexr")
 -        MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
 -      ENDIF()
 -    ELSE()
@@ -37,5 +37,5 @@ index 2349916..f867b55 100755
  	MESSAGE(FATAL_ERROR "Could not find VIGRA")
  ENDIF (VIGRA_FOUND)
 -- 
-2.29.2
+2.34.1
 
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index b8af1fcbd260..7961c74632a1 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2020.0.0
-revision=3
+version=2021.0.0
+revision=1
 wrksrc="${pkgname}-${version}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
@@ -17,7 +17,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://hugin.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
+checksum=047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From a2c843580432881310a213cf6227d7f0c1613a04 Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Wed, 5 Jan 2022 21:21:20 +0000
Subject: [PATCH 0087/1427] xwmfs: update to 0.90.

---
 srcpkgs/xwmfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xwmfs/template b/srcpkgs/xwmfs/template
index 7b1da9a26ed8..b5bc75668862 100644
--- a/srcpkgs/xwmfs/template
+++ b/srcpkgs/xwmfs/template
@@ -1,6 +1,6 @@
 # Template file for 'xwmfs'
 pkgname=xwmfs
-version=0.85
+version=0.90
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config which"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/gerstner-hub/xwmfs"
 changelog="https://raw.githubusercontent.com/gerstner-hub/xwmfs/master/ChangeLog"
 distfiles="https://github.com/gerstner-hub/xwmfs/archive/v${version}.tar.gz"
-checksum=9d786514397f34ff35eaf460c8c07ccc64d01227311ab19e4a7aab9fd0007831
+checksum=36e86ded944d154021eadfbb58f3531c4d879dfa57edd8db472c3f2b0e369e3d
 
 pre_configure() {
 	./bootstrap

From b40d05e1cf782feb05cd4f9173a35cf351c1094e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 13:47:48 +0100
Subject: [PATCH 0088/1427] qomui: remove python2 dependency

---
 srcpkgs/qomui/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template
index 9965eb13c193..bff7375165a1 100644
--- a/srcpkgs/qomui/template
+++ b/srcpkgs/qomui/template
@@ -1,11 +1,10 @@
 # Template file for 'qomui'
 pkgname=qomui
 version=0.8.2
-revision=5
+revision=6
 build_style=python3-module
-pycompile_module="qomui"
-hostmakedepends="python3 python3-setuptools"
-depends="python python3 python3-PyQt5 python3-dbus python3-psutil
+hostmakedepends="python3-setuptools"
+depends="python3-PyQt5 python3-dbus python3-psutil
  python3-requests python3-BeautifulSoup4 python3-lxml python3-pexpect openvpn
  python3-PyQt5-dbus stunnel dnsmasq libcgroup libcgroup-utils
  iptables wireguard wireguard-tools openresolv"

From a4a268d1b7ef113c2750134eaf462bddc2566de8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 6 Jan 2022 00:16:19 +0100
Subject: [PATCH 0089/1427] heaptrack: update to 1.3.0.

---
 srcpkgs/heaptrack/patches/musl-fixes.patch | 87 +++++++++-------------
 srcpkgs/heaptrack/template                 |  7 +-
 2 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/srcpkgs/heaptrack/patches/musl-fixes.patch b/srcpkgs/heaptrack/patches/musl-fixes.patch
index 61e0d787c8f3..2cfb9a13db02 100644
--- a/srcpkgs/heaptrack/patches/musl-fixes.patch
+++ b/srcpkgs/heaptrack/patches/musl-fixes.patch
@@ -1,68 +1,51 @@
-# reason: fix sources to work correctly with musl
-
 --- a/src/track/heaptrack_inject.cpp
 +++ b/src/track/heaptrack_inject.cpp
-@@ -27,6 +27,7 @@
- #include <link.h>
- #include <malloc.h>
- #include <unistd.h>
-+#include <dlfcn.h>
- 
- #include <sys/mman.h>
+@@ -26,6 +26,15 @@
+  * @brief Experimental support for symbol overloading after runtime injection.
+  */
  
++#ifndef __WORDSIZE
++#include <limits.h>
++#if ULONG_MAX == 0xffffffffffffffff
++#define __WORDSIZE 64
++#elif ULONG_MAX == 0xffffffff
++#define __WORDSIZE 32
++#endif
++#endif
++
+ #ifndef ELF_R_SYM
+ #if __WORDSIZE == 64
+ #define ELF_R_SYM(i) ELF64_R_SYM(i)
+
 --- a/src/track/libheaptrack.cpp
 +++ b/src/track/libheaptrack.cpp
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@ chrono::milliseconds elapsedTime()
      return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
  }
  
 -__pid_t gettid()
 +pid_t gettid()
  {
+ #ifdef __linux__
      return syscall(SYS_gettid);
- }
 
---- a/src/track/heaptrack_inject.cpp
-+++ b/src/track/heaptrack_inject.cpp
-@@ -38,9 +38,10 @@
-  * @brief Experimental support for symbol overloading after runtime injection.
-  */
+--- a/tests/manual/dlopen.cpp
++++ b/tests/manual/dlopen.cpp
+@@ -9,6 +9,9 @@ __attribute__((weak)) extern void allocFromLib(bool leak);
  
--#if __WORDSIZE == 64
-+#include <limits.h>
-+#if ULONG_MAX == 0xffffffffffffffff
- #define ELF_R_SYM(i) ELF64_R_SYM(i)
--#elif __WORDSIZE == 32
-+#elif ULONG_MAX == 0xffffffff
- #define ELF_R_SYM(i) ELF32_R_SYM(i)
- #else
- #error unsupported word size
-
-# simplify stdint.h include which failed on musl due to obscure assumptions
---- a/3rdparty/libbacktrace/backtrace.h
-+++ b/3rdparty/libbacktrace/backtrace.h
-@@ -36,24 +36,8 @@
- #include <stddef.h>
- #include <stdio.h>
+ int main()
+ {
++#ifndef RTLD_DEEPBIND
++    printf("SKIP (RTLD_DEEPBIND undefined)\n");
++#else
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--/* We want to get a definition for uintptr_t, but we still care about
--   systems that don't have <stdint.h>.  */
--#if defined(__GLIBC__) && __GLIBC__ >= 2
--
--#include <stdint.h>
--
--#elif defined(HAVE_STDINT_H)
--
- #include <stdint.h>
+@@ -27,6 +30,7 @@ int main()
  
--#else
--
--/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
--   from GCC_HEADER_STDINT in configure.ac.  */
--#include "gstdint.h"
--
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
++#endif
+ 
+     return 0;
+ }
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index f4f4c35044f7..8d8859611b4c 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,6 +1,6 @@
 # Template file for 'heaptrack'
 pkgname=heaptrack
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DHEAPTRACK_BUILD_GUI=ON"
@@ -15,7 +15,10 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/KDE/heaptrack"
 distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
-checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
+checksum=794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956
+
+#../tests/auto/tst_inject.cpp:78: SIGSEGV
+make_check=no
 
 heaptrack-gui_package() {
 	short_desc+=" - GUI"

From 174ad8ccd331531e3306d95226badd7c7a2b5f25 Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Wed, 5 Jan 2022 23:39:24 +0000
Subject: [PATCH 0090/1427] apache-kafka: update to 3.0.0

---
 srcpkgs/apache-kafka/template | 8 ++++----
 srcpkgs/apache-kafka/update   | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/apache-kafka/update

diff --git a/srcpkgs/apache-kafka/template b/srcpkgs/apache-kafka/template
index 29282a10d3d4..0e75af73152e 100644
--- a/srcpkgs/apache-kafka/template
+++ b/srcpkgs/apache-kafka/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-kafka'
 pkgname=apache-kafka
-version=2.4.0
+version=3.0.0
 revision=1
 wrksrc="kafka-${version}-src"
 hostmakedepends="curl which tar openjdk8"
@@ -9,8 +9,8 @@ short_desc="Distributed Streaming Platform"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://kafka.apache.org"
-distfiles="http://apache.mirrors.ionfish.org/kafka/${version}/kafka-${version}-src.tgz"
-checksum=d09efde300c1027e0289de1a1d2da093ecce6b182250e03f05215fb044f24f8b
+distfiles="https://dlcdn.apache.org/kafka/${version}/kafka-${version}-src.tgz"
+checksum=66a9efddcc2ce88984941020db012178efd51eb47c359c7fd1bab791416e39cd
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
@@ -27,7 +27,7 @@ do_build() {
 
 do_install() {
 	vmkdir usr/lib/kafka
-	tar -xf core/build/distributions/kafka_2.12-${version}.tgz -C ${DESTDIR}/usr/lib/kafka --strip 1
+	tar -xf core/build/distributions/kafka_2.13-${version}.tgz -C ${DESTDIR}/usr/lib/kafka --strip 1
 	rm -Rf ${DESTDIR}/usr/lib/kafka/bin/windows
 
 	mkdir -p ${DESTDIR}/etc/profile.d
diff --git a/srcpkgs/apache-kafka/update b/srcpkgs/apache-kafka/update
new file mode 100644
index 000000000000..035a2251a711
--- /dev/null
+++ b/srcpkgs/apache-kafka/update
@@ -0,0 +1,2 @@
+site=https://kafka.apache.org/downloads.html
+pkgname=""

From 3bcd00feec6f48036faf567294f3f1079a9fc70c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:51:06 +0100
Subject: [PATCH 0091/1427] lua53: fix update-check

---
 srcpkgs/lua53/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/lua53/update

diff --git a/srcpkgs/lua53/update b/srcpkgs/lua53/update
new file mode 100644
index 000000000000..7968116c4d5c
--- /dev/null
+++ b/srcpkgs/lua53/update
@@ -0,0 +1 @@
+pattern="lua-\K5.3[\d.]+(?=\.tar)"

From 48f665edfb13894d95e1c038fa70ed11188f3097 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:51:17 +0100
Subject: [PATCH 0092/1427] lua54: fix update-check

---
 srcpkgs/lua54/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/lua54/update

diff --git a/srcpkgs/lua54/update b/srcpkgs/lua54/update
new file mode 100644
index 000000000000..989263618b13
--- /dev/null
+++ b/srcpkgs/lua54/update
@@ -0,0 +1 @@
+pattern="lua-\K5.4[\d.]+(?=\.tar)"

From 48939d7cd2f051108e2d84a442b00025c4ef52f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:52:28 +0100
Subject: [PATCH 0093/1427] python3-urwid: add missing python3 dependency

---
 srcpkgs/python-urwid/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
index c575560cec8b..98066b21d3d1 100644
--- a/srcpkgs/python-urwid/template
+++ b/srcpkgs/python-urwid/template
@@ -1,9 +1,9 @@
 # Template file for 'python-urwid'
 pkgname=python-urwid
 version=2.1.2
-revision=2
+revision=3
 wrksrc="urwid-${version}"
-build_style="python-module"
+build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 makedepends="python-devel python3-devel"
 short_desc="Console user interface library for Python2"
@@ -16,6 +16,7 @@ checksum=588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae
 
 python3-urwid_package() {
 	short_desc="${short_desc/Python2/Python3}"
+	depends="python3"
 	pkg_install() {
 		vmove usr/lib/python3*
 	}

From 0ddb1314852c0705d3d7374ee5695d4f4170cba9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:52:28 +0100
Subject: [PATCH 0094/1427] python3-pycryptodome: add missing python3
 dependency

---
 srcpkgs/python3-pycryptodome/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-pycryptodome/template b/srcpkgs/python3-pycryptodome/template
index 8e94b15f44bc..26c377cd52d1 100644
--- a/srcpkgs/python3-pycryptodome/template
+++ b/srcpkgs/python3-pycryptodome/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-pycryptodome'
 pkgname=python3-pycryptodome
 version=3.9.7
-revision=3
+revision=4
 wrksrc="pycryptodome-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
 short_desc="Python3 package of low-level cryptographic primitives"
 maintainer="Wietse Kuipers <wietse@kuiprs.nl>"
 license="Public Domain, BSD-2-Clause"

From 7b846964b5c88918489cb3598d11fc2dff85fa6a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:52:28 +0100
Subject: [PATCH 0095/1427] python3-rtree: add missing python3 dependency

---
 srcpkgs/python3-rtree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template
index 34bf662591b7..8fce4b16e21e 100644
--- a/srcpkgs/python3-rtree/template
+++ b/srcpkgs/python3-rtree/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-rtree'
 pkgname=python3-rtree
 version=0.9.5
-revision=3
+revision=4
 wrksrc="rtree-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel"
 makedepends="python3-devel libspatialindex-devel"
-depends="libspatialindex"
+depends="python3 libspatialindex"
 checkdepends="python3-pytest python3-numpy"
 short_desc="Python3 bindings for libspatialindex"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"

From 41fea3d9aac4e77fc17562cdd57d3c634846a901 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:52:28 +0100
Subject: [PATCH 0096/1427] python3-tornado: add missing python3 dependency

---
 srcpkgs/python3-tornado/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index dadfa37ddb02..c53513c6b6ac 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-tornado'
 pkgname=python3-tornado
 version=6.1
-revision=2
+revision=3
 wrksrc="tornado-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
-depends="ca-certificates"
+depends="python3 ca-certificates"
 short_desc="Python3 web framework and asynchronous networking library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From 90af371bf215487fec91eca901fc896e6daacd17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:52:28 +0100
Subject: [PATCH 0097/1427] python3-watchman: add missing python3 dependency

---
 srcpkgs/python3-watchman/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
index e525ebef073a..57aadac9ca02 100644
--- a/srcpkgs/python3-watchman/template
+++ b/srcpkgs/python3-watchman/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-watchman'
 pkgname=python3-watchman
 version=1.4.1
-revision=7
+revision=8
 create_wrksrc=yes
 build_wrksrc="pywatchman-${version}"
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 makedepends="python3-devel"
-depends="watchman"
+depends="python3 watchman"
 short_desc="Connect and query Watchman to discover file changes (Python3)"
 maintainer="Hoang Nguyen <hoang@wetrust.io>"
 license="BSD-3-Clause"
@@ -17,10 +17,8 @@ distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
 checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
  d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
 conflicts="python-watchman>=0"
+make_check=no
 
-do_check() {
-	:
-}
 post_install() {
 	vlicense ../LICENSE.txt
 }

From 780600ba65ca21fea4b02b6012bdf5de0478dc64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:52:29 +0100
Subject: [PATCH 0098/1427] python3-shiboken2: add missing python3 dependency

---
 srcpkgs/shiboken2/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index cbddf90093a0..b56613229c13 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
 version=5.15.2
-revision=3
+revision=4
 _pkgname="pyside-setup-opensource-src-${version}"
 wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
 build_wrksrc="sources/shiboken2"
@@ -45,6 +45,7 @@ libshiboken2_package() {
 
 python3-shiboken2_package() {
 	short_desc="Python3 shiboken2 bindings"
+	depends="python3"
 	pkg_install() {
 		vmove ${py3_sitelib}
 	}

From 2921c0db8f452374f480e0bacddb3597acb2eba2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 15:53:12 +0100
Subject: [PATCH 0099/1427] python3-websocket-client: add missing python3
 dependency

---
 srcpkgs/python3-websocket-client/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-websocket-client/template b/srcpkgs/python3-websocket-client/template
index d17a8ceea810..d2ff94f31be7 100644
--- a/srcpkgs/python3-websocket-client/template
+++ b/srcpkgs/python3-websocket-client/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-websocket-client'
 pkgname=python3-websocket-client
 version=1.2.1
-revision=2
+revision=3
 wrksrc="websocket-client-${version}"
 build_style=python3-module
 make_check_target="websocket/tests"
 hostmakedepends="python3-setuptools"
-depends="ca-certificates"
+depends="python3 ca-certificates"
 checkdepends="python3-pytest"
 short_desc="WebSocket client for Python3"
 maintainer="Sergi Alvarez <pancake@nopcode.org>"

From 931cf4e189542be63d3d30ac8385793c01eb6e88 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 Jan 2022 16:27:01 +0100
Subject: [PATCH 0100/1427] sbcl: set version.lisp-expr to identify Void Linux.

---
 srcpkgs/sbcl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 62c3790ba4cc..bdaeb6f3c44d 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -43,6 +43,7 @@ ppc*|*-musl)
 esac
 
 do_build() {
+	printf '"%s.void.%s"\n' "$version" "$revision" >version.lisp-expr
 	export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl"
 	export LINKFLAGS="$LDFLAGS"
 	bash make.sh \

From c9717eae3ffaeb43be0a4bca6e6ce469e09433d0 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH 0101/1427] sbcl: Add the GNU Info manual to the base package

---
 srcpkgs/sbcl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index bdaeb6f3c44d..8f11dd27a792 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,9 +1,9 @@
 # Template file for 'sbcl'
 pkgname=sbcl
 version=2.2.0
-revision=1
+revision=2
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -49,6 +49,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	make -C ./doc/manual info
 }
 
 do_install() {

From a2a3288f988bfce1b0ba0d03c3c50a925d288656 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 Jan 2022 16:28:22 +0100
Subject: [PATCH 0102/1427] xshow: ignore prereleases.

---
 srcpkgs/xsnow/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/xsnow/update

diff --git a/srcpkgs/xsnow/update b/srcpkgs/xsnow/update
new file mode 100644
index 000000000000..8758aff9cbe3
--- /dev/null
+++ b/srcpkgs/xsnow/update
@@ -0,0 +1 @@
+ignore="*pre*"

From 1c8f06c46c7e604bf856d783ce7fc95b8316f9fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 Jan 2022 16:30:34 +0100
Subject: [PATCH 0103/1427] minify: update to 2.9.27.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 2c8eff3997c7..b2b9fb421f49 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.22
+version=2.9.27
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=e6006867b03a28cbd4f49830c4f51989fba2a48e8ca967596f23c524f35d6fb4
+checksum=0c78b527a7c604e74d999ee26847485487063b3e2df077a2f70652c71d06edc0
 
 post_install() {
 	vlicense LICENSE

From 9463c1a801e00a127f9060072951789db66f4590 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 9 Jan 2022 16:31:27 +0100
Subject: [PATCH 0104/1427] python3-pipenv: update to 2022.1.8.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 1a8b586387f8..cae723465c04 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2021.11.23
+version=2022.1.8
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3
+checksum=f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 903e72aa91680e0a48704ef7dc57c935086f4833 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 Jan 2022 18:50:47 +0100
Subject: [PATCH 0105/1427] powertop: update to 2.14.

---
 srcpkgs/powertop/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index d0841935e7f4..d2425fa48050 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,13 +1,19 @@
 # Template file for 'powertop'
 pkgname=powertop
-version=2.13
+version=2.14
 revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+hostmakedepends="automake gettext-devel libtool pkg-config"
 makedepends="ncurses-devel pciutils-devel libnl3-devel"
 short_desc="Tool to diagnose issues with power consumption and power management"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-only"
-homepage="https://01.org/powertop/"
-distfiles="https://01.org/sites/default/files/downloads/powertop-${version}.tar.gz"
-checksum=a65f992ca4a419bc73b623651060eb9fc00c5a86fa03556358cd9db011ef3178
+homepage="https://github.com/fenrus75/powertop"
+distfiles="https://github.com/fenrus75/powertop/archive/refs/tags/v${version}.tar.gz"
+checksum=0e4cd0933a4f1fe04bfbf9d56efaabc841d9b04d391426f1a3469d6635a25f37
+
+LDFLAGS="-lpthread"
+
+pre_configure() {
+	./autogen.sh
+}

From 6e4d1d594df513c87c4005a1f19ab5e5e0349450 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Sat, 8 Jan 2022 18:39:39 -0600
Subject: [PATCH 0106/1427] st: update to 0.8.5

---
 srcpkgs/st/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index fe9945094ec7..9376a0c0c983 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -1,7 +1,7 @@
 # Template file for 'st'
 pkgname=st
-version=0.8.4
-revision=3
+version=0.8.5
+revision=1
 build_style=gnu-makefile
 make_use_env=compliant
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://st.suckless.org"
 distfiles="https://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6
+checksum=ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37
 
 pre_build() {
 	sed -i 's|Liberation Mono|Monospace|g' config.def.h

From b66c3f29d88200d7227bf9a36fae67d18e9efe63 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 9 Jan 2022 10:36:47 +0200
Subject: [PATCH 0107/1427] rssguard: update to 4.1.1.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 77cc91684c71..47ad2edaeff7 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.0.4
+version=4.1.1
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=9154a9c674b35f68486ca7e024265e044b7c7971485bafbe9b6ebbdf27463489
+checksum=2f9a846f12a1c70ec2d8d474daff4e7caeb14ade332b75f40a9900aa7fbc4994
 
 post_install() {
 	# Install rssguard icon manually

From 0d1cbff98ad54b004a1da2906e4dece2436d215c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 19:57:21 +0200
Subject: [PATCH 0108/1427] liteide: update to 37.4.

Closes: #30410 [via git-merge-pr]
---
 srcpkgs/liteide/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/liteide/template b/srcpkgs/liteide/template
index a3bae429b886..d392b7a463b9 100644
--- a/srcpkgs/liteide/template
+++ b/srcpkgs/liteide/template
@@ -1,6 +1,6 @@
 # Template file for 'liteide'
 pkgname=liteide
-version=37.3
+version=37.4
 revision=1
 wrksrc="liteide-x${version}"
 build_wrksrc=liteidex
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://liteide.org/"
 distfiles="https://github.com/visualfc/liteide/archive/x${version}.tar.gz"
-checksum=e91e52ae7f9fdb8c904ef0f11f462b48eff6550b97c58928e848b5fe1f0bc198
+checksum=8b6842ead4915aaf4ee691962259ae290a37c00e3669c50b61e4386bf133e5ce
 
 pre_configure() {
 	# Use system libvterm instead of the one shipped
@@ -29,10 +29,6 @@ post_install() {
 	vmkdir usr/share/liteide
 	cp -ar deploy/* os_deploy/* ${DESTDIR}/usr/share/liteide
 
-	# Package license files
-	vlicense LICENSE.LGPL LICENSE
-	vlicense LGPL_EXCEPTION.TXT LGPL_EXCEPTION
-
 	# Package desktop shortcut
 	vinstall liteide.desktop 644 usr/share/applications
 	vmkdir usr/share/pixmaps

From d1a27f57c3b98995290d0182a1dc99d496c6371e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 9 Jan 2022 19:28:41 +0100
Subject: [PATCH 0109/1427] tor: update to 0.4.6.9.

---
 srcpkgs/tor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index d6e94e369de1..a6d973c82e7b 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,6 +1,6 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.6.8
+version=0.4.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zstd"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
 changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a
+checksum=c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"

From 557b55e64892be5892aa3121dc96625be7b57208 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, 10 Jan 2022 18:16:00 +0700
Subject: [PATCH 0110/1427] arcan: fix build

---
 srcpkgs/arcan/patches/show-message.patch | 22 ++++++++++++++++++++++
 srcpkgs/arcan/template                   |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/arcan/patches/show-message.patch

diff --git a/srcpkgs/arcan/patches/show-message.patch b/srcpkgs/arcan/patches/show-message.patch
new file mode 100644
index 000000000000..34cbf3af88d0
--- /dev/null
+++ b/srcpkgs/arcan/patches/show-message.patch
@@ -0,0 +1,22 @@
+Index: a/src/CMakeLists.txt
+===================================================================
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,16 +1,8 @@
+ # tried playing nice by using REQUIRE_QUIET but some built-in modules
+ # (CheckLibraryExists, ...) wouldn't listen so how about a nice cup
+ # of shut up.
+-function(message)
+-	list(GET ARGV 0 TYPE)
+-	if (TYPE STREQUAL "FATAL_ERROR")
+-		list(REMOVE_AT ARGV 0)
+-		_message(${TYPE} ${CL_RED} "${ARGV}" ${CL_RST})
+-	endif()
+-endfunction()
+-
+ function(amsg msg)
+-	_message("" ${msg})
++	message("" ${msg})
+ endfunction()
+ 
+ if (CLIENT_LIBRARY_BUILD OR BUILD_PRESET STREQUAL "client")
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 2fcf11346b94..f33db1fadeb8 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -12,7 +12,7 @@ hostmakedepends="pkg-config
  $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
  libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
- vlc-devel SDL2-devel
+ vlc-devel SDL2-devel xcb-util-devel xcb-util-wm-devel
  $(vopt_if tts 'libespeak-ng-devel')
  $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
  $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
@@ -48,7 +48,8 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	CFLAGS="-latomic"
 fi
 
-pre_configure() {
+post_patch() {
+	rm -f platform/cmake/modules/FindPkgConfig.cmake
 	# provide patched openAL. the _lwa part of the build relies on a patched
 	# openAL implementation that is statically linked
 	ln -s ${XBPS_BUILDDIR}/openal-${_versionOpenal} ${XBPS_BUILDDIR}/arcan-${version}/external/git/openal

From c4efa97663a1af174fdd968cc82665c67c78bce0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 10 Jan 2022 14:16:43 +0100
Subject: [PATCH 0111/1427] python3-pyinfra: update to 1.6.1.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 519e53441897..510a315d97bd 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.5
+version=1.6.1
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=3918fbe08ff29cb7f540bf024aea2f74612a5859405816c1809f6d9916dfbd96
+checksum=b77c428a5777ef420b2374461c702a3f2f096edec9132dccca4b9a3dddf2e9b3
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 39247ae03b7abed33314d79e34d5f4e6e7651caf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 10 Jan 2022 14:17:16 +0100
Subject: [PATCH 0112/1427] byacc: update to 20220109.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 2c8f4b299621..4a26370a6274 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20220101
+version=20220109
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=a796ce90e960bf18d256eba534b9bd1e394d394a141ee63f530cab1074615b67
+checksum=98966bc5e6558f5ee50c7b33ee3e0a75efc15dd99cc96739d1ac1af9c1a43535
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 07865f7596b00e7e13ea669379ba5229f3830ac6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 6 Jan 2022 23:13:13 +0100
Subject: [PATCH 0113/1427] bamf: update to 0.5.5.

---
 srcpkgs/bamf/template | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/bamf/template b/srcpkgs/bamf/template
index e71e50d826f2..b0f8a2aa5e92 100644
--- a/srcpkgs/bamf/template
+++ b/srcpkgs/bamf/template
@@ -1,27 +1,31 @@
 # Template file for 'bamf'
 pkgname=bamf
-version=0.5.4
-revision=4
+version=0.5.5
+revision=1
 build_style=gnu-configure
 build_helper="gir"
-hostmakedepends="glib-devel gtk-doc pkg-config python-lxml libxslt-python libxml2-python
- $(vopt_if vala vala)"
-makedepends="libglib-devel libgtop-devel libwnck-devel"
+configure_args="$(vopt_with gtk_doc gtk-doc)"
+hostmakedepends="glib-devel gtk-doc pkg-config automake libtool
+ $(vopt_if vala vala) gnome-common which"
+makedepends="libglib-devel libgtop-devel libwnck-devel gtk+3-devel"
 short_desc="Application matching framework"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-3.0-only, LGPL-2.1-only, GPL-3.0-or-later"
 homepage="https://launchpad.net/bamf"
-distfiles="https://launchpad.net/bamf/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
-checksum=5bb87a5bf46ab1fc9a229a851c0ee4f610d943716a7c83d318f6a8f50d76beb3
+distfiles="https://launchpad.net/bamf/${version%.*}/${version}/+download/bamf-${version}.tar.xz"
+checksum=10e642adf5169d46e32b113346bebdad437cddd1ddbd45d16c640cf60cabf5da
 
 CFLAGS="-Wno-cpp -Wno-deprecated-declarations"
 
 build_options="gir vala"
 build_options_default="gir vala"
 
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 pre_configure() {
-	sed -i configure -e 's;if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null);if false;'
-	sed -i configure -e '/CFLAGS=/s/ \-Werror / /'
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 bamf-devel_package() {
@@ -31,7 +35,9 @@ bamf-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/*.so
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi

From 26bdbacacfbe8652dae69ebf622a2c3f9b8f9584 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:01:54 +0100
Subject: [PATCH 0114/1427] libxslt-python: remove package

---
 srcpkgs/libxslt-python   |  1 -
 srcpkgs/libxslt/template | 21 +++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/libxslt-python

diff --git a/srcpkgs/libxslt-python b/srcpkgs/libxslt-python
deleted file mode 120000
index fbcaa3cb7ad9..000000000000
--- a/srcpkgs/libxslt-python
+++ /dev/null
@@ -1 +0,0 @@
-libxslt
\ No newline at end of file
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index fd7fba7ba740..0a18a2e3fc61 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -4,15 +4,14 @@ version=1.1.34
 revision=5
 build_style=gnu-configure
 configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="docbook-xml docbook-xsl libtool python-devel
- libxml2-python pkg-config"
-makedepends="python-devel libxml2-devel libxml2-python libgcrypt-devel"
+hostmakedepends="docbook-xml docbook-xsl libtool pkg-config"
+makedepends="libxml2-devel libgcrypt-devel"
 short_desc="XSLT parser library from the GNOME project"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xmlsoft.org/XSLT/"
 distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz
-	ftp://xmlsoft.org/${pkgname}/${pkgname}-${version}.tar.gz"
+ ftp://xmlsoft.org/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
  98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
 
@@ -26,11 +25,6 @@ post_configure() {
 	# by Usage:
 	# Makefile is created after configure so fix here
 	find ${wrksrc} -type f -name Makefile | xargs sed -i '/Usage/,/--version/d'
-	if [ "$CROSS_BUILD" ]; then
-		sed -e "s|/usr/include/python2.7|$XBPS_CROSS_BASE/&|g" \
-			-e "s|/usr/lib/python2.7/site-packages|$XBPS_CROSS_BASE/&|g" \
-			-i python/Makefile
-	fi
 }
 
 post_build() {
@@ -67,12 +61,3 @@ libxslt-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-
-libxslt-python_package() {
-	lib32disabled=yes
-	short_desc+=" - python extension"
-	pkg_install() {
-		vmove "usr/lib/python*"
-		vmove usr/share/doc/${sourcepkg}-python-${version}
-	}
-}

From 612ba53d828b100929d10693def6632be8dc8046 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:13:10 +0100
Subject: [PATCH 0115/1427] libxml2-python: remove package

* add python3 to dependencies of libxml2-python3
---
 srcpkgs/libxml2-python/template               | 34 -------------------
 srcpkgs/libxml2-python3                       |  1 -
 .../patches/py39compat.patch                  |  0
 .../patches/python3-utf8.patch                |  0
 srcpkgs/libxml2-python3/template              | 26 ++++++++++++++
 srcpkgs/libxml2/template                      |  2 +-
 6 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/libxml2-python/template
 delete mode 120000 srcpkgs/libxml2-python3
 rename srcpkgs/{libxml2-python => libxml2-python3}/patches/py39compat.patch (100%)
 rename srcpkgs/{libxml2-python => libxml2-python3}/patches/python3-utf8.patch (100%)
 create mode 100644 srcpkgs/libxml2-python3/template

diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template
deleted file mode 100644
index 1d75b7ac56b3..000000000000
--- a/srcpkgs/libxml2-python/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'libxml2-python'
-pkgname=libxml2-python
-version=2.9.10
-revision=4
-wrksrc="${pkgname%-python}-${version}"
-build_wrksrc=python
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="libxml2-devel python-devel python3-devel"
-depends="python python3"
-short_desc="Library providing XML and HTML support - Python2 bindings"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz"
-checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
-
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
-	fi
-}
-
-post_install() {
-	vlicense ../COPYING
-}
-
-libxml2-python3_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove "usr/lib/python3*"
-		vlicense ../COPYING
-	}
-}
diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3
deleted file mode 120000
index 7ba590df8660..000000000000
--- a/srcpkgs/libxml2-python3
+++ /dev/null
@@ -1 +0,0 @@
-libxml2-python
\ No newline at end of file
diff --git a/srcpkgs/libxml2-python/patches/py39compat.patch b/srcpkgs/libxml2-python3/patches/py39compat.patch
similarity index 100%
rename from srcpkgs/libxml2-python/patches/py39compat.patch
rename to srcpkgs/libxml2-python3/patches/py39compat.patch
diff --git a/srcpkgs/libxml2-python/patches/python3-utf8.patch b/srcpkgs/libxml2-python3/patches/python3-utf8.patch
similarity index 100%
rename from srcpkgs/libxml2-python/patches/python3-utf8.patch
rename to srcpkgs/libxml2-python3/patches/python3-utf8.patch
diff --git a/srcpkgs/libxml2-python3/template b/srcpkgs/libxml2-python3/template
new file mode 100644
index 000000000000..46dfd05a0bcf
--- /dev/null
+++ b/srcpkgs/libxml2-python3/template
@@ -0,0 +1,26 @@
+# Template file for 'libxml2-python3'
+pkgname=libxml2-python3
+version=2.9.10
+revision=5
+wrksrc="libxml2-${version}"
+build_wrksrc=python
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="libxml2-devel python3-devel"
+depends="python3"
+short_desc="Library providing XML and HTML support - Python3 bindings"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="MIT"
+homepage="http://www.xmlsoft.org/"
+distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz"
+checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+
+post_patch() {
+	if [ "${CROSS_BUILD}" ]; then
+		vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
+	fi
+}
+
+post_install() {
+	vlicense ../COPYING
+}
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..22d533816ab0 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,6 +1,6 @@
 # Template file for 'libxml2'
 #
-# Please keep this in sync with "srcpkgs/libxml2-python"
+# Please keep this in sync with "srcpkgs/libxml2-python3"
 #
 pkgname=libxml2
 version=2.9.10

From 4d20bd4979e57104647f47dceaf83ff109f8e2be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:26:07 +0100
Subject: [PATCH 0116/1427] removed-packages: remove unused dependencies

* libxslt-python
* libxml2-python
---
 srcpkgs/removed-packages/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0b057f0241bd..c14aeb0167f7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
 version=0.1
-revision=57
+revision=58
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -213,7 +213,9 @@ replaces="
  librpcsecgss<=0.19_6
  libshiboken-python3<=5.15.0_3
  libspa-ffmpeg<=0.3.32_1
+ libxml2-python<=2.9.10_4
  libxnoise<=0.2.21_4
+ libxslt-python<=1.1.34_5
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1

From 090d94e7e0fc30c66512cd5e03ea1e50b2dd77b5 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, 11 Jan 2022 18:37:57 +0700
Subject: [PATCH 0117/1427] OpenSubdiv: add missing makedepends

---
 srcpkgs/OpenSubdiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index b7a5e16efbcf..fd32e6bd6949 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
 # TODO: CUDA/OpenCL support
 makedepends="libXrandr-devel libXinerama-devel libXcursor-devel zlib-devel
- libgomp-devel glfw-devel glew-devel tbb-devel"
+ libgomp-devel glfw-devel glew-devel tbb-devel libXxf86vm-devel"
 short_desc="Open-Source subdivision surface library"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"

From 2ce0eaacbebe35de21f9d961068cc78a1877f697 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, 11 Jan 2022 18:38:44 +0700
Subject: [PATCH 0118/1427] Cataclysm-DDA: fix patches' whitespace

---
 srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch b/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch
index 34e9ed51e28f..ec8b570dc958 100644
--- a/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch
+++ b/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch
@@ -1,10 +1,10 @@
 --- a/data/CMakeLists.txt	2019-03-08 04:34:43.000000000 +0100
 +++ b/data/CMakeLists.txt	2019-03-08 04:34:43.000000000 +0100
 @@ -10,6 +10,7 @@
- 	${CMAKE_SOURCE_DIR}/data/motd
- 	${CMAKE_SOURCE_DIR}/data/credits
- 	${CMAKE_SOURCE_DIR}/data/title
-+	${CMAKE_SOURCE_DIR}/data/core
+     ${CMAKE_SOURCE_DIR}/data/motd
+     ${CMAKE_SOURCE_DIR}/data/credits
+     ${CMAKE_SOURCE_DIR}/data/title
++    ${CMAKE_SOURCE_DIR}/data/core
  )
  
  IF(SOUND)

From 35c95e8901f05c9ad1c28533ac7a52c663b42172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 12:39:21 -0300
Subject: [PATCH 0119/1427] Fix CI since github no longer accepts git://
 protocol

As of today, everything fails on CI with:

```
Run common/travis/fetch_upstream.sh
Fetching upstream...
fatal: remote error:
  The unauthenticated git protocol on port 9418 is no longer supported.
Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information.
Error: Process completed with exit code 128.
```

Switching `git://` to `https://` should fix this.
---
 common/travis/fetch_upstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index b1b06d9d54f9..45315563e0b1 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -9,4 +9,4 @@ elif command -v git >/dev/null 2>&1; then
 fi
 
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
-$GIT_CMD fetch --depth 200 git://github.com/void-linux/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 3e4565810703fc48fe9be6668619b33cc21206c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 5 Jan 2022 16:51:00 -0300
Subject: [PATCH 0120/1427] maxima: fix #34849 and #34861

 - patch maxima-sbcl so it uses gmp for arithmetic (closes #34849)
   also add libgmp to shlib_requires since it won't be detected
 - remove `nopie=yes` to fix #34861, replace by `nopie_files`
 - remove `nostrip=yes`, replace by `nostrip_files`
 - add checks for #34849 and #34861
 - run testsuite only for full check (not in CI)
 - some html and info files are shipped with source: do not rebuild
---
 .../maxima/patches/maxima-sbcl-with-gmp.patch | 19 +++++++
 srcpkgs/maxima/template                       | 52 ++++++++++++++++---
 2 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/maxima/patches/maxima-sbcl-with-gmp.patch

diff --git a/srcpkgs/maxima/patches/maxima-sbcl-with-gmp.patch b/srcpkgs/maxima/patches/maxima-sbcl-with-gmp.patch
new file mode 100644
index 000000000000..074631ea2ba0
--- /dev/null
+++ b/srcpkgs/maxima/patches/maxima-sbcl-with-gmp.patch
@@ -0,0 +1,19 @@
+Patch maxima initialization for sbcl so it uses gmp for arithmetic
+
+
+--- a/src/init-cl.lisp	2021-05-15 20:20:53.000000000 -0300
++++ b/src/init-cl.lisp	2022-01-04 17:45:03.838273626 -0300
+@@ -574,8 +574,13 @@
+ 			 (delete-file file)))))
+ 	   *temp-files-list*))
+ 
++#+sbcl
++(eval-when (:compile-toplevel :load-toplevel :execute)
++  (require 'sb-gmp))
++
+ (defun cl-user::run ()
+   "Run Maxima in its own package."
++  #+sbcl (sb-gmp:install-gmp-funs)
+   (in-package :maxima)
+   (initialize-runtime-globals)
+   (let ((input-stream *standard-input*)
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index 1a4bec0dba18..69af367ca11d 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,7 +1,7 @@
 # Template file for 'maxima'
 pkgname=maxima
 version=5.45.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
 hostmakedepends="python3 perl emacs texinfo patchelf"
@@ -15,8 +15,15 @@ homepage="http://maxima.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/maxima/maxima-${version}.tar.gz"
 checksum=fe9016276970bef214a1a244348558644514d7fdfaa4fc8b9d0e87afcbb4e7dc
 
-nostrip=yes
-nopie=yes
+# maxima-sbcl is nopie and should NOT be stripped or it won't work
+nostrip_files=/usr/lib/maxima/$version/binary-sbcl/maxima
+nopie_files=/usr/lib/maxima/$version/binary-sbcl/maxima
+
+if [ "$build_option_sbcl" ]; then
+	# binary-sbcl/maxima uses libgmp but this won't show up in objdump
+	shlib_requires=libgmp.so.10
+fi
+
 build_options="clisp sbcl ecl"
 desc_option_clisp="Build with CLISP"
 desc_option_sbcl="Build with SBCL"
@@ -24,6 +31,14 @@ desc_option_ecl="Build with ECL"
 build_options_default="sbcl ecl"
 vopt_conflict clisp sbcl
 
+post_configure() {
+	# do not rebuild these files if they exist
+	touch -c doc/info/*.html
+	touch -c doc/info/maxima.info*
+	touch -c doc/info/maxima_toc.html
+	touch -c interfaces/xmaxima/doc/xmaxima.html
+}
+
 post_build() {
 	if [ "$build_option_ecl" ]; then
 		# everything will go in the same directory, use rpath=$ORIGIN
@@ -38,13 +53,34 @@ post_build() {
 
 do_check() {
 	if [ "$build_option_ecl" ]; then
-		echo "Check that maxima.fas works"
-		ecl --eval "(require 'maxima \"src/binary-ecl/maxima.fas\")" \
-			--eval "(quit)"
+		echo "maxima-ecl: check that maxima.fas works (#34273)"
+		ecl --eval '(require :maxima "src/binary-ecl/maxima.fas")' \
+		    --eval '(quit)'
+		echo PASS
+		echo "maxima-ecl: check that unlimited heap-size works (#34861)"
+		./maxima-local -q -l ecl --batch-string=":lisp \
+			(ext:set-limit 'ext:heap-size 0)
+			showtime : true $
+			a : 10^(10^5) $
+			b : a^600 $
+			c : a^600 $
+			"
+		echo PASS
+	fi
+	if [ "$build_option_sbcl" ]; then
+		echo "maxima-sbcl: check that long arithmetic is fast (#34849)"
+		timeout -v 30s ./maxima-local -q -l sbcl --batch-string="
+			showtime : true $
+			a : 10^(10^5) $
+			b : a^1000 $
+			"
+		echo PASS
 	fi
 
-	# now run the testsuite
-	make ${makejobs} check
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		# run the testsuite for all versions enabled
+		make ${makejobs} check
+	fi
 }
 
 post_install() {

From 7f4d8ccc2d73cae7ac57742ad6543d36f2333924 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, 11 Jan 2022 23:03:06 +0700
Subject: [PATCH 0121/1427] alure: fix build against cmake 3.22.1

---
 srcpkgs/alure/patches/cmake-suck.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/alure/patches/cmake-suck.patch

diff --git a/srcpkgs/alure/patches/cmake-suck.patch b/srcpkgs/alure/patches/cmake-suck.patch
new file mode 100644
index 000000000000..7dfcb292514e
--- /dev/null
+++ b/srcpkgs/alure/patches/cmake-suck.patch
@@ -0,0 +1,14 @@
+Index: alure-1.2/CMakeLists.txt
+===================================================================
+--- alure-1.2.orig/CMakeLists.txt
++++ alure-1.2/CMakeLists.txt
+@@ -375,8 +375,7 @@ IF(FLUIDSYNTH)
+     ELSE(NOT FLUIDSYNTH_FOUND)
+         SET(HAS_FLUIDSYNTH 1)
+         LINK_DIRECTORIES(${FLUIDSYNTH_LIBRARY_DIRS})
+-        SET_SOURCE_FILES_PROPERTIES(src/codec_fluidsynth.cpp PROPERTIES
+-                                    COMPILE_FLAGS "${FLUIDSYNTH_CFLAGS}")
++	add_compile_options(${FLUIDSYNTH_CFLAGS})
+     ENDIF(NOT FLUIDSYNTH_FOUND)
+     IF(HAS_FLUIDSYNTH)
+         SET(ALURE_OBJS ${ALURE_OBJS} src/codec_fluidsynth.cpp)

From 7a8d4b18e7165bc81f4aeb31d696d3c19a6e3694 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, 11 Jan 2022 23:04:59 +0700
Subject: [PATCH 0122/1427] compton-conf: hostmakedepends+=perl

---
 srcpkgs/compton-conf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/compton-conf/template b/srcpkgs/compton-conf/template
index 0405611d7643..2f431053686b 100644
--- a/srcpkgs/compton-conf/template
+++ b/srcpkgs/compton-conf/template
@@ -3,7 +3,7 @@ pkgname=compton-conf
 version=0.15.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-tools-devel libconfig-devel"
 depends="compton desktop-file-utils"
 short_desc="LXQt GUI configuration tool for compton"

From 133df6bbf8066572447341ed438f77baa1b296b2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 Jan 2022 17:03:10 +0100
Subject: [PATCH 0123/1427] jpm: update to 0.0.2.

---
 srcpkgs/jpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jpm/template b/srcpkgs/jpm/template
index aba50b22510a..3f85d0bee1e1 100644
--- a/srcpkgs/jpm/template
+++ b/srcpkgs/jpm/template
@@ -1,6 +1,6 @@
 # Template file for 'jpm'
 pkgname=jpm
-version=0.0.1
+version=0.0.2
 revision=1
 hostmakedepends="janet"
 depends="janet janet-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/janet-lang/jpm"
 distfiles="https://github.com/janet-lang/jpm/archive/refs/tags/${version}.tar.gz"
-checksum=1241e8ba046926cbc1b9e9b0ff6a50af68eb7075956097b10d22ca4beb1d54ee
+checksum=d3396c40677615abd02c9de3ea94d7db214d9e5978bc83cbdba861e53c344d9e
 
 do_install() {
 	PREFIX=/usr DESTDIR=$DESTDIR janet bootstrap.janet

From c5873a18369f3b85191c1ee3c22e1bb265ef8de4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 Jan 2022 17:04:01 +0100
Subject: [PATCH 0124/1427] git-revise: update to 0.7.0.

---
 srcpkgs/git-revise/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template
index 2b49ac622aa6..e2da512ace66 100644
--- a/srcpkgs/git-revise/template
+++ b/srcpkgs/git-revise/template
@@ -1,7 +1,7 @@
 # Template file for 'git-revise'
 pkgname=git-revise
-version=0.6.0
-revision=3
+version=0.7.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="git python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/mystor/git-revise"
 distfiles="https://github.com/mystor/git-revise/archive/v${version}.tar.gz"
-checksum=99c3804ddb73f1115bd6be05d10e640a7066e4019c6c223433e55136e66fa4c8
+checksum=47dbed47738dfd6f7f33339a6503c886ce95d36f4690ed20077250e2538443aa
 
 post_install() {
 	vlicense LICENSE

From 39ec5b157f17cb1b56a8b042d4adaa7e28d5265b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 Jan 2022 17:05:12 +0100
Subject: [PATCH 0125/1427] b3sum: update to 1.3.0.

---
 srcpkgs/b3sum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/b3sum/template b/srcpkgs/b3sum/template
index 4f9b1698bb0b..91efc46adbc1 100644
--- a/srcpkgs/b3sum/template
+++ b/srcpkgs/b3sum/template
@@ -1,6 +1,6 @@
 # Template file for 'b3sum'
 pkgname=b3sum
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="BLAKE3-${version}"
 build_wrksrc="b3sum"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CC0-1.0"
 homepage="https://github.com/BLAKE3-team/BLAKE3/"
 distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
-checksum=2873f42f89c0553b7105bda4b3edb93584ba3a163b31bbfae6b6e1bc203ca8c3
+checksum=a559309c2dad8cc8314ea779664ec5093c79de2e9be14edbf76ae2ce380222c0

From 1acb701fb20548b71833c7474a94fae85fdd53fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 11 Jan 2022 17:07:39 +0100
Subject: [PATCH 0126/1427] bpftrace: update to 0.14.1.

---
 srcpkgs/bpftrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 7e9f9598d7c0..28ab3c626399 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.14.0
+version=0.14.1
 revision=1
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/iovisor/bpftrace/"
 distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=6a37f29c3ad3d6302218d2c010333222fa489068998da51c80aae6dc40cb5bc1
+checksum=8deef8517c977f945b83494aad1383c2ef3da07a42d5cae39d0a2988b8b33e97
 nostrip=yes  # needs to read own symbol table
 
 post_install() {

From 78623260ca656c7fabcbbfb12351048bf123de60 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, 11 Jan 2022 23:41:04 +0700
Subject: [PATCH 0127/1427] milkytracker: fix build

--with-<something> is autotools flags, which is not understood by cmake.

Those features are enabled automatically if detected anyway.
---
 srcpkgs/milkytracker/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/milkytracker/template b/srcpkgs/milkytracker/template
index 9f5cffd61301..7c81a0645a73 100644
--- a/srcpkgs/milkytracker/template
+++ b/srcpkgs/milkytracker/template
@@ -4,7 +4,6 @@ version=1.02.00
 revision=2
 wrksrc=MilkyTracker-${version}
 build_style=cmake
-configure_args="--with-alsa --with-jack"
 makedepends="SDL2-devel zlib-devel jack-devel alsa-lib-devel rtmidi-devel"
 depends="libjack rtmidi"
 short_desc="Fast Tracker II inspired music tracker"

From f59dd59c2136cb9a5533418fa4a44c7af4c3c4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 12:51:45 -0300
Subject: [PATCH 0128/1427] srcpkgs/: Switch templates from git:// to https://

As of today github no longer accepts `git://` so we switch templates
that use git clone from `git://github.com/` to `https://github.com`.
---
 srcpkgs/ardour/template     | 2 +-
 srcpkgs/ci20-uboot/template | 2 +-
 srcpkgs/darch/template      | 2 +-
 srcpkgs/rdis-git/template   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index b9f15ae83c27..c2f1c13649f5 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -34,7 +34,7 @@ esac
 # Upstream deletes older release tarballs from their site and
 # GitHub tarballs are empty: https://tracker.ardour.org/view.php?id=7328
 do_fetch() {
-	git clone git://github.com/Ardour/ardour ${wrksrc}
+	git clone https://github.com/Ardour/ardour ${wrksrc}
 	cd ${wrksrc}
 	git checkout ${_commit}
 }
diff --git a/srcpkgs/ci20-uboot/template b/srcpkgs/ci20-uboot/template
index 5f0eaa41cc6f..ba243ca32c42 100644
--- a/srcpkgs/ci20-uboot/template
+++ b/srcpkgs/ci20-uboot/template
@@ -11,7 +11,7 @@ homepage="http://www.denx.de/wiki/U-Boot/WebHome"
 archs="mispel*"
 
 do_fetch() {
-	git clone -b ci20-${version} git://github.com/MIPS/CI20_u-boot ${wrksrc}
+	git clone -b ci20-${version} https://github.com/MIPS/CI20_u-boot ${wrksrc}
 	cd $wrksrc
 	git reset --hard 25f5638f961c6bfcc64a1e02f742e60aa13fc1c6
 
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 161af0a666b1..7ba537336a38 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -17,7 +17,7 @@ homepage="https://godarch.com/"
 do_fetch() {
 	mkdir -p "$(dirname ${GOSRCPATH})"
 	git clone --branch "v${version}" \
-		git://github.com/godarch/darch \
+		https://github.com/godarch/darch \
 		${GOSRCPATH}
 }
 
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index ff8c03081de7..0486edd1b1a0 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/endeav0r/rdis"
 
 do_fetch() {
-	git clone git://github.com/endeav0r/rdis.git $wrksrc
+	git clone https://github.com/endeav0r/rdis.git $wrksrc
 	cd $wrksrc
 	git reset --hard 1370ca0f737a790e3ca7d7d9513543d7ea52c3a4
 }

From 00240e82e2fa149a94ac7d39e6260b1a6d5b92f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 10 Jan 2022 17:25:08 +0100
Subject: [PATCH 0129/1427] homebank: update to 5.5.4.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 9c60fdf0de5b..57eca4181c43 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.3
+version=5.5.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=073607918a9610087791f36f59e70d1261fee8e4e1146a5cfd5871a1d2d91093
+checksum=0d0669bca099340ae5c213ea13cb2b93283bfc8a0e4cf7a5902c1829366e5765
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From e70927c80f7f965981c43717d8715d9e9522688c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 11 Jan 2022 22:47:30 +1100
Subject: [PATCH 0130/1427] atop: update to 2.7.1.

---
 srcpkgs/atop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 29ff1d6523b1..376f8369d511 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -1,6 +1,6 @@
 # Template file for 'atop'
 pkgname=atop
-version=2.7.0
+version=2.7.1
 revision=1
 build_style=gnu-makefile
 make_install_target="sysvinstall"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.atoptool.nl/"
 distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
-checksum=a606705aaca940a6d44d67c886529a75db98fd88140f743eb0aaebb184c38af7
+checksum=ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e
 
 make_dirs="/var/log/atop 755 root root"
 

From 7e36ea0b51c777f07145c7a8f3a0521914bb5217 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 10 Jan 2022 22:20:43 +0200
Subject: [PATCH 0131/1427] rssguard: update to 4.1.2.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 47ad2edaeff7..f34e58087176 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=2f9a846f12a1c70ec2d8d474daff4e7caeb14ade332b75f40a9900aa7fbc4994
+checksum=3e9c6b25cad846aa2047f737d961fe007c88873d9e9772ec8e238908c6f8df95
 
 post_install() {
 	# Install rssguard icon manually

From d6fb3532577cf1d197a794365930a59ed9504018 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Tue, 11 Jan 2022 14:31:55 +0100
Subject: [PATCH 0132/1427] rocksndiamonds: update to 4.3.0.3

---
 srcpkgs/rocksndiamonds/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index b3248695b700..fbd35f3c6b36 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -1,6 +1,6 @@
 # Template file for 'rocksndiamonds'
 pkgname=rocksndiamonds
-version=4.3.0.2
+version=4.3.0.3
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e4540f9b92b4e31e0a75bf1bf7f12fd0b9ec3c9cea69616a33a0cb88db8da1bf
+checksum=efb3d10a7034f97f075ccda8da94ae4c6b37b291a484245e46d521c028329fa9
 replaces="rocksndiamonds-data>=0"
 
 do_build() {

From 4a984b42ddfd70fb02d1ff2333ff72adb92ab36f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 9 Jan 2022 01:41:16 -0500
Subject: [PATCH 0133/1427] dua-cli: update to 2.16.0

---
 srcpkgs/dua-cli/patches/atomicu64.patch | 34 -------------------------
 srcpkgs/dua-cli/template                |  5 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/dua-cli/patches/atomicu64.patch

diff --git a/srcpkgs/dua-cli/patches/atomicu64.patch b/srcpkgs/dua-cli/patches/atomicu64.patch
deleted file mode 100644
index 801601a2fceb..000000000000
--- a/srcpkgs/dua-cli/patches/atomicu64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5857da8941bdfde02d10c9380086525f2199bbcb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Jun 2021 02:28:55 +0200
-Subject: [PATCH] fix on platforms without 64-bit atomics
-
----
- src/aggregate.rs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/aggregate.rs src/aggregate.rs
-index dacaaa7..6fc474d 100644
---- a/src/aggregate.rs
-+++ b/src/aggregate.rs
-@@ -8,7 +8,7 @@ use std::{
-     io,
-     path::Path,
-     sync::{
--        atomic::{AtomicU64, Ordering},
-+        atomic::{AtomicUsize, Ordering},
-         Arc,
-     },
-     thread,
-@@ -35,7 +35,7 @@ pub fn aggregate(
-     let mut aggregates = Vec::new();
-     let mut inodes = InodeFilter::default();
-     let paths: Vec<_> = paths.into_iter().collect();
--    let shared_count = Arc::new(AtomicU64::new(0));
-+    let shared_count = Arc::new(AtomicUsize::new(0));
- 
-     if let Some(mut err) = err {
-         thread::spawn({
--- 
-2.31.1
-
diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 2f763846b3ec..21ed84885706 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,14 +1,15 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.14.2
+version=2.16.0
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/Byron/dua-cli"
+changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=05e7c67d986369a8fc53237522c6f696357fb9f0fe5c823da601653fb5c5a1fa
+checksum=02de8d80347405a876867901bd16539b7d7ceac3095cabcbf9abae3d7da1f357
 
 post_install() {
 	vlicense LICENSE

From 3d9bf22e3da7d02334b3baf6a02d0426742d9101 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 20:14:39 +0100
Subject: [PATCH 0134/1427] syncthing: update to 1.18.6.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9a456e04bbc2..79dd413241e6 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.18.5
+version=1.18.6
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="http://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=2abef26c60f012b7dd53553ffe61ee94cc2d0dfe495e615d9520cbce39bcd312
+checksum=b27911d4c804063b13e9474848953c2c6709218603739b5f09a7f88a69eca88f
 
 pre_build() {
 	GOARCH= go generate \

From 5f53d22acddbcf72e5fc1c9a3df6fe4a23eda4c6 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 10 Jan 2022 15:43:23 -0300
Subject: [PATCH 0135/1427] imlib2: update to 1.7.5.

imlib2-config no longer exists, upstream now uses pkg-config
exclusively.

Closes: #34984 [via git-merge-pr]
---
 srcpkgs/imlib2/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index 5ff691292d96..e01f17311589 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.4
+version=1.7.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=f51a85634aa7ec53e36320f8a6b2e2b96cb7a2e1f92a5538e4b2f390c22c9951
+checksum=73337bc38de13e04832f645367baf932b39d8b558d4ed9bc1f13405b92090b96
 
 post_install() {
 	vlicense COPYING
@@ -29,7 +29,6 @@ imlib2-devel_package() {
 	depends="${sourcepkg}-${version}_${revision} libX11-devel"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove usr/bin/imlib2-config
 		vmove usr/include
 		vmove usr/share
 		vmove usr/lib/pkgconfig

From d0935dc4f1226a606e7633a8213bbfa2bdaca027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 10 Jan 2022 17:50:12 +0100
Subject: [PATCH 0136/1427] you-get: update to 0.4.1555.

---
 srcpkgs/you-get/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template
index dd9c03f3f77d..c376e137b6cd 100644
--- a/srcpkgs/you-get/template
+++ b/srcpkgs/you-get/template
@@ -1,7 +1,7 @@
 # Template file for 'you-get'
 pkgname=you-get
-version=0.4.1536
-revision=2
+version=0.4.1555
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pysocks python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://you-get.org/"
 distfiles="${PYPI_SITE}/y/you-get/you-get-${version}.tar.gz"
-checksum=78c9a113950344e06d18940bd11fe9a2f78b9d0bc8963cde300017ac1ffcef09
+checksum=99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f
 
 post_install() {
 	vlicense LICENSE.txt

From a6a32eddc196ac2313c55b33fd2444bcb3cb7934 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 3 Jan 2022 04:17:26 +1100
Subject: [PATCH 0137/1427] iputils: update to 20211215.

---
 srcpkgs/iputils/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 22bece934cd5..9d514743f1f1 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -1,10 +1,9 @@
 # Template file for 'iputils'
 pkgname=iputils
-version=20210722
+version=20211215
 revision=1
 build_style=meson
-configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
- -DBUILD_TFTPD=false -DBUILD_NINFOD=false"
+configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false -DBUILD_NINFOD=false"
 hostmakedepends="pkg-config docbook2x docbook-xsl-ns libcap-progs iproute2"
 makedepends="libcap-devel"
 depends="libcap-progs"
@@ -13,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause, GPL-2.0-or-later"
 homepage="https://github.com/iputils/iputils"
 distfiles="https://github.com/iputils/iputils/archive/${version}.tar.gz"
-checksum=6d1a44b0682d3d4b64586dbaebe61dd61ae16d6e2f4dc0c43336d0e47a9db323
+checksum=b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf
 
 alternatives="
  ping:ping:/usr/bin/${pkgname}-ping

From c69507db7eba2e7496d43f8ab302e0f30ec522fa Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 14 Aug 2021 20:37:59 +0200
Subject: [PATCH 0138/1427] nootka: update to 2.0.2

---
 srcpkgs/nootka/patches/signed-char.patch | 62 +++++++++++++-----------
 srcpkgs/nootka/template                  | 16 ++++--
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/srcpkgs/nootka/patches/signed-char.patch b/srcpkgs/nootka/patches/signed-char.patch
index 28a266749cb1..73056d81fe71 100644
--- a/srcpkgs/nootka/patches/signed-char.patch
+++ b/srcpkgs/nootka/patches/signed-char.patch
@@ -1,13 +1,8 @@
-commit 17a9c38e654aa0b77c5387991cea1cd6d04c2517
-Author: q66 <daniel@octaforge.org>
-Date:   Thu Jan 2 00:36:14 2020 +0100
+Original patch by q66, adjusted for version 2.0.0.
+Fix build on systems with unsigned chars by default.
 
-    fix build on systems with unsigned chars by default
-
-diff --git src/libs/core/music/tkeysignature.cpp src/libs/core/music/tkeysignature.cpp
-index 51ccf34..0024770 100644
---- a/src/libs/core/music/tkeysignature.cpp
-+++ b/src/libs/core/music/tkeysignature.cpp
+--- a/src/libs/core/music/tkeysignature.cpp	2021-06-05 13:17:35.000000000 +0200
++++ b/src/libs/core/music/tkeysignature.cpp	2021-08-14 18:58:03.380770429 +0200
 @@ -25,7 +25,7 @@
  
  
@@ -17,7 +12,7 @@ index 51ccf34..0024770 100644
      {-1,-1,-1,-1,-1,-1,-1},       // Cb/ab
      {-1,-1,-1, 0,-1,-1,-1},       // Gb/eb
      { 0,-1,-1, 0,-1,-1,-1},       // Db/bb
-@@ -43,8 +43,8 @@ const char TkeySignature::scalesDefArr[15][7] = {
+@@ -43,8 +43,8 @@
      { 1, 1, 1, 1, 1, 1, 1},       // C#/a#
  };
  
@@ -28,23 +23,34 @@ index 51ccf34..0024770 100644
  
  QString TkeySignature::majorNames[15] = { QString(), QString(), QString(), QString(), QString(),
                                            QString(), QString(), QString(), QString(), QString(),
-diff --git src/libs/core/music/tkeysignature.h src/libs/core/music/tkeysignature.h
-index 6c98d66..676d3b9 100644
---- a/src/libs/core/music/tkeysignature.h
-+++ b/src/libs/core/music/tkeysignature.h
-@@ -43,13 +43,13 @@ public:
-         /** Array with definitions of each scale.
-         * @p scalesDefArr[7] is C-major/a-minor and has 7 times 0 (no accids).
-         * The order os from 7b [0] to 7# [15]*/
--    static const char scalesDefArr[15][7];
-+    static const signed char scalesDefArr[15][7];
+--- a/src/libs/core/music/tkeysignature.h	2021-06-05 13:17:35.000000000 +0200
++++ b/src/libs/core/music/tkeysignature.h	2021-08-14 19:01:28.596571380 +0200
+@@ -49,7 +49,7 @@
+        * @p scalesDefArr[7] is C-major/a-minor and has 7 times 0 (no accids).
+        * The order os from 7b [0] to 7# [15]
+        */
+-  static const char scalesDefArr[15][7];
++  static const signed char scalesDefArr[15][7];
+ 
+       /**
+        * Those smart arrays keep which note in @p scalesDefArr is 1-st in key scale.
+@@ -57,7 +57,7 @@
+        * like @p scalesDefArr[8][4] point on accid of a G note.
+        * This is faster way then calculate it and takes less memory.
+        */
+-  static const char majorKeys[15], minorKeys[15];
++  static const signed char majorKeys[15], minorKeys[15];
  
-         /** Those smart arrays keep which note in @p scalesDefArr is 1-st in key scale.
-         * F.e. For G-major is @p majorKeys[8] = 4,
-         * like @p scalesDefArr[8][4] point on accid of a G note.
-         * This is faster way then calculate it and takes less memory.*/
--    static const char majorKeys[15], minorKeys[15];
-+    static const signed char majorKeys[15], minorKeys[15];
+       /**
+        * This method fulfills majorNames and minorNames arrays
+--- a/src/libs/core/music/tnote.h	2021-06-05 13:17:35.000000000 +0200
++++ b/src/libs/core/music/tnote.h	2021-08-14 18:55:34.210784018 +0200
+@@ -68,7 +68,7 @@
+          * It can be: @li e_None = 3 @li e_Sharp = 1 @li e_DoubleSharp=2
+          * @li e_Flat= -1 @li e_DoubleFlat= -2 @li e_Natural=0
+          */
+-  enum Ealter : char {
++  enum Ealter : signed char {
+     e_Natural = 0, e_Sharp = 1, e_DoubleSharp = 2, e_Flat = -1, e_DoubleFlat = -2, e_None = 3
+   };
  
-         /** This method fulfills majorNames and minorNames arrays
-         * appropriate keys names depends on naming style
diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template
index 8726ab984e8c..39cdd47b4f15 100644
--- a/srcpkgs/nootka/template
+++ b/srcpkgs/nootka/template
@@ -1,14 +1,20 @@
 # Template file for 'nootka'
 pkgname=nootka
-version=1.4.7
-revision=2
+version=2.0.2
+revision=1
 wrksrc="nootka-${version}-source"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="alsa-lib-devel fftw-devel libvorbis-devel qt5-devel soundtouch-devel"
+makedepends="alsa-lib-devel fftw-devel jack-devel libvorbis-devel qt5-devel
+ qt5-declarative-devel qt5-quickcontrols2-devel qt5-tools-devel soundtouch-devel
+ $(vopt_if pulseaudio pulseaudio-devel)"
 short_desc="Application to learn classical score notation"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only"
+license="GPL-3.0-or-later"
 homepage="https://nootka.sourceforge.io"
+changelog="https://www.opencode.net/seelook/nootka/-/blob/master/changes"
 distfiles="${SOURCEFORGE_SITE}/nootka/Nootka-${version}/nootka-${version}-source.tar.bz2"
-checksum=1d85a2970ddb51117b0a98df4d84ca9e9498fbd1d2b1c55bfa62931333a73cf9
+checksum=6477722d9dfe4c2a50efbb5c36e0e5376d76e2a2c366ef43747e71ed12351c8b
+
+build_options="pulseaudio"
+build_options_default="pulseaudio"

From c52fa26f999eaf6004cae4e68ab40f71af94b270 Mon Sep 17 00:00:00 2001
From: Andrei <queyenth@gmail.com>
Date: Mon, 10 Jan 2022 13:31:13 +0600
Subject: [PATCH 0139/1427] upwork: update to 5.6.10.0

---
 srcpkgs/upwork/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/upwork/template b/srcpkgs/upwork/template
index 2fcf68f8acd4..ef8a196d7dfd 100644
--- a/srcpkgs/upwork/template
+++ b/srcpkgs/upwork/template
@@ -1,9 +1,9 @@
 # Template file for 'upwork'
 pkgname=upwork
-version=5.6.8.0
+version=5.6.10.0
 revision=1
 _rawver=${version//./_}
-_hashver="836f43f6f6be4149"
+_hashver="b124e6f3a4944b32"
 archs="x86_64"
 depends="alsa-lib gtk+ GConf gdk-pixbuf nss libXtst libXScrnSaver"
 short_desc="Desktop Upwork app"
@@ -12,7 +12,7 @@ license="custom:Upwork"
 homepage="https://upwork.com/"
 distfiles="https://upwork-usw2-desktopapp.upwork.com/binaries/v${_rawver}_${_hashver}/${pkgname}_${version}_amd64.deb
  https://upwork.pactsafe.io/versions/5ab3efef63d65b6a18aab106.pdf>LICENSE.pdf"
-checksum="b3a52f773d633837882dc107b206006325722ca5d5d5a1e8bdf5453f872e1b6f
+checksum="fd201ce817abe32e1b582bb4b55fef85ac8132806f5ddf0548fd25bbfd48833c
  0949da5999c3b948bcc4165e6c55522915d9bab1790d27120eda0915aae143bb"
 repository="nonfree"
 restricted=yes

From e70af05b0046213ecfcc8f665ac5ca74c9a7502f Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 10 Jan 2022 17:10:29 +1100
Subject: [PATCH 0140/1427] libtd: update to 1.8.0.

---
 common/shlibs          | 2 +-
 srcpkgs/libtd/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 999d3ad714b8..f5e92014becc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3940,7 +3940,7 @@ libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
 libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_2
+libtdjson.so.1.8.0 libtd-1.8.0_1
 libJudy.so.1 judy-1.0.5_1
 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
 libKSeExprUI.so.4 seexpr-krita-4.0.4.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index f719ab4d3f1e..fe42d43f904a 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,7 +1,7 @@
 # Template file for 'libtd'
 pkgname=libtd
-version=1.7.0
-revision=2
+version=1.8.0
+revision=1
 wrksrc="td-${version}"
 build_style=cmake
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="BSL-1.0"
 homepage="https://core.telegram.org/tdlib"
 distfiles="https://github.com/tdlib/td/archive/v${version}.tar.gz"
-checksum=3daaf419f1738b7e0ac0e8a08f07e01a1faaf51175a59c0b113c15e30c69e173
+checksum=30d560205fe82fb811cd57a8fcbc7ac853a5b6195e9cb9e6ff142f5e2d8be217
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="Unsupported tl-schema version -1"

From 13aeec3ce23025c650c754175f67ae2ba71ed358 Mon Sep 17 00:00:00 2001
From: Nathaniel Barragan <nathanielbarragan@protonmail.com>
Date: Mon, 10 Jan 2022 10:53:42 -0800
Subject: [PATCH 0141/1427] hydroxide: update to 0.2.21.

---
 srcpkgs/hydroxide/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5d2eee5705ec..5f63ded6f759 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,6 +1,6 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
-version=0.2.20
+version=0.2.21
 revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
@@ -11,7 +11,7 @@ maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"
 homepage="https://github.com/emersion/hydroxide"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b454b1d46f90221d12d64b0785307fe1ac14dcaa8e3da299aa787bb008330275
+checksum=efbb1fc0461b3fcca9a9e42b31c7298ef0023e458c171be0b00886f9692648c4
 
 post_install() {
 	vlicense LICENSE

From 1370018f7999d478979e142dc81b6d95a32258a0 Mon Sep 17 00:00:00 2001
From: flupe <lucas@sbi.re>
Date: Tue, 11 Jan 2022 02:11:01 +0100
Subject: [PATCH 0142/1427] Waybar: update to 0.9.9.

---
 srcpkgs/Waybar/patches/river-tags.patch | 164 ------------------------
 srcpkgs/Waybar/template                 |   6 +-
 2 files changed, 3 insertions(+), 167 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/river-tags.patch

diff --git a/srcpkgs/Waybar/patches/river-tags.patch b/srcpkgs/Waybar/patches/river-tags.patch
deleted file mode 100644
index 63491535e0f0..000000000000
--- a/srcpkgs/Waybar/patches/river-tags.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 024fd42e272f79cb08e594eb3af86c93b1446c91 Mon Sep 17 00:00:00 2001
-From: Isaac Freund <ifreund@ifreund.xyz>
-Date: Thu, 19 Aug 2021 14:59:25 +0200
-Subject: [PATCH] river/tags: support urgent tags
-
-Upstream river has a concept of urgent views/tags as of commit e59c2a73.
-Introduce a new urgent style to expose this in the waybar module.
----
- include/modules/river/tags.hpp        |  1 +
- man/waybar-river-tags.5.scd           |  6 ++++--
- protocol/river-status-unstable-v1.xml | 17 +++++++++++++----
- src/modules/river/tags.cpp            | 27 +++++++++++++++++++++++++--
- 4 files changed, 43 insertions(+), 8 deletions(-)
-
-diff --git a/include/modules/river/tags.hpp b/include/modules/river/tags.hpp
-index f80b3c591..9b75fbd3b 100644
---- a/include/modules/river/tags.hpp
-+++ b/include/modules/river/tags.hpp
-@@ -18,6 +18,7 @@ class Tags : public waybar::AModule {
-   // Handlers for wayland events
-   void handle_focused_tags(uint32_t tags);
-   void handle_view_tags(struct wl_array *tags);
-+  void handle_urgent_tags(uint32_t tags);
- 
-   struct zriver_status_manager_v1 *status_manager_;
- 
-diff --git a/man/waybar-river-tags.5.scd b/man/waybar-river-tags.5.scd
-index 0f0272491..65b90332a 100644
---- a/man/waybar-river-tags.5.scd
-+++ b/man/waybar-river-tags.5.scd
-@@ -15,7 +15,7 @@ Addressed by *river/tags*
- *num-tags*: ++
-     typeof: uint ++
-     default: 9 ++
--    The number of tags that should be displayed.
-+    The number of tags that should be displayed. Max 32.
- 
- *tag-labels*: ++
-     typeof: array ++
-@@ -34,8 +34,10 @@ Addressed by *river/tags*
- - *#tags button*
- - *#tags button.occupied*
- - *#tags button.focused*
-+- *#tags button.urgent*
- 
--Note that a tag can be both occupied and focused at the same time.
-+Note that occupied/focused/urgent status may overlap. That is, a tag may be
-+both occupied and focused at the same time.
- 
- # SEE ALSO
- 
-diff --git a/protocol/river-status-unstable-v1.xml b/protocol/river-status-unstable-v1.xml
-index a4d6f4e57..13affaa77 100644
---- a/protocol/river-status-unstable-v1.xml
-+++ b/protocol/river-status-unstable-v1.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <protocol name="river_status_unstable_v1">
-   <copyright>
--    Copyright 2020 Isaac Freund
-+    Copyright 2020 The River Developers
- 
-     Permission to use, copy, modify, and/or distribute this software for any
-     purpose with or without fee is hereby granted, provided that the above
-@@ -16,7 +16,7 @@
-     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-   </copyright>
- 
--  <interface name="zriver_status_manager_v1" version="1">
-+  <interface name="zriver_status_manager_v1" version="2">
-     <description summary="manage river status objects">
-       A global factory for objects that receive status information specific
-       to river. It could be used to implement, for example, a status bar.
-@@ -47,7 +47,7 @@
-     </request>
-   </interface>
- 
--  <interface name="zriver_output_status_v1" version="1">
-+  <interface name="zriver_output_status_v1" version="2">
-     <description summary="track output tags and focus">
-       This interface allows clients to receive information about the current
-       windowing state of an output.
-@@ -75,12 +75,21 @@
-       </description>
-       <arg name="tags" type="array" summary="array of 32-bit bitfields"/>
-     </event>
-+
-+    <event name="urgent_tags" since="2">
-+      <description summary="tags of the output with an urgent view">
-+        Sent once on binding the interface and again whenever the set of
-+        tags with at least one urgent view changes.
-+      </description>
-+      <arg name="tags" type="uint" summary="32-bit bitfield"/>
-+    </event>
-   </interface>
- 
-   <interface name="zriver_seat_status_v1" version="1">
-     <description summary="track seat focus">
-       This interface allows clients to receive information about the current
--      focus of a seat.
-+      focus of a seat. Note that (un)focused_output events will only be sent
-+      if the client has bound the relevant wl_output globals.
-     </description>
- 
-     <request name="destroy" type="destrucor">
-diff --git a/src/modules/river/tags.cpp b/src/modules/river/tags.cpp
-index e96b20169..2628af2db 100644
---- a/src/modules/river/tags.cpp
-+++ b/src/modules/river/tags.cpp
-@@ -22,14 +22,24 @@ static void listen_view_tags(void *data, struct zriver_output_status_v1 *zriver_
-   static_cast<Tags *>(data)->handle_view_tags(tags);
- }
- 
-+static void listen_urgent_tags(void *data, struct zriver_output_status_v1 *zriver_output_status_v1,
-+                               uint32_t tags) {
-+  static_cast<Tags *>(data)->handle_urgent_tags(tags);
-+}
-+
- static const zriver_output_status_v1_listener output_status_listener_impl{
-     .focused_tags = listen_focused_tags,
-     .view_tags = listen_view_tags,
-+    .urgent_tags = listen_urgent_tags,
- };
- 
- static void handle_global(void *data, struct wl_registry *registry, uint32_t name,
-                           const char *interface, uint32_t version) {
-   if (std::strcmp(interface, zriver_status_manager_v1_interface.name) == 0) {
-+    version = std::min<uint32_t>(version, 2);
-+    if (version < ZRIVER_OUTPUT_STATUS_V1_URGENT_TAGS_SINCE_VERSION) {
-+      spdlog::warn("river server does not support urgent tags");
-+    }
-     static_cast<Tags *>(data)->status_manager_ = static_cast<struct zriver_status_manager_v1 *>(
-         wl_registry_bind(registry, name, &zriver_status_manager_v1_interface, version));
-   }
-@@ -64,8 +74,9 @@ Tags::Tags(const std::string &id, const waybar::Bar &bar, const Json::Value &con
-   }
-   event_box_.add(box_);
- 
--  // Default to 9 tags
--  const uint32_t num_tags = config["num-tags"].isUInt() ? config_["num-tags"].asUInt() : 9;
-+  // Default to 9 tags, cap at 32
-+  const uint32_t num_tags =
-+      config["num-tags"].isUInt() ? std::min<uint32_t>(32, config_["num-tags"].asUInt()) : 9;
- 
-   std::vector<std::string> tag_labels(num_tags);
-   for (uint32_t tag = 0; tag < num_tags; ++tag) {
-@@ -129,4 +140,16 @@ void Tags::handle_view_tags(struct wl_array *view_tags) {
-   }
- }
- 
-+void Tags::handle_urgent_tags(uint32_t tags) {
-+  uint32_t i = 0;
-+  for (auto &button : buttons_) {
-+    if ((1 << i) & tags) {
-+      button.get_style_context()->add_class("urgent");
-+    } else {
-+      button.get_style_context()->remove_class("urgent");
-+    }
-+    ++i;
-+  }
-+}
-+
- } /* namespace waybar::modules::river */
-
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 23d5b8221e13..c6470c6d330d 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.8
-revision=2
+version=0.9.9
+revision=1
 _date_version=3.0.0
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
@@ -29,7 +29,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
  https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
  https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405
+checksum="23a94538538f43a6db4c1c5f7e09e75ab743ded1ccfc737e1f3e0971fe4cdd87
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

From f7d8914f49a9e7aa9b49606ccd5dfdfbcfe1c727 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 11 Jan 2022 22:59:26 +1100
Subject: [PATCH 0143/1427] fasm: update to 1.73.29.

---
 srcpkgs/fasm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fasm/template b/srcpkgs/fasm/template
index 9137a57e86e0..00a6b954c30b 100644
--- a/srcpkgs/fasm/template
+++ b/srcpkgs/fasm/template
@@ -1,6 +1,6 @@
 # Template file for 'fasm'
 pkgname=fasm
-version=1.73.28
+version=1.73.29
 revision=1
 archs="i686* x86_64*"
 wrksrc=fasm
@@ -9,7 +9,7 @@ maintainer="Dmitry Bogatov <KAction@disroot.org>"
 license="BSD-2-Clause"
 homepage="https://flatassembler.net"
 distfiles="https://flatassembler.net/fasm-${version}.tgz"
-checksum=9ed1ebb485fd1174111a94eb773105a234911398e05090f5e714abf62c809292
+checksum=6328f4d83468f704e4274d6e90ec04947af56726453ce31389bc32024a98212b
 nostrip=yes
 
 case ${XBPS_TARGET_MACHINE} in

From dca53f6ef71554876ab20c6c25e55bbd24c28525 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 9 Jan 2022 12:29:56 +0200
Subject: [PATCH 0144/1427] cinnamon: update to 5.2.7.

---
 srcpkgs/cinnamon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index ee6c4c0f7827..941a394a53b9 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,7 +1,7 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=5.2.4
-revision=2
+version=5.2.7
+revision=1
 build_helper=gir
 build_style=meson
 hostmakedepends="libtool pkg-config gobject-introspection gettext
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon"
 changelog="https://raw.githubusercontent.com/linuxmint/cinnamon/${version}/debian/changelog"
 distfiles="https://github.com/linuxmint/cinnamon/archive/${version}.tar.gz"
-checksum=2f7c3c36de73ab86b8775b64225ff2cd6d6f8cd41d759978bea5b4b53199676f
+checksum=735c895a4096c2f9e8f4fd206b1646741a875904b5756ba4e9e7d4a0c3d628cf
 
 python_version=3
 pycompile_dirs="

From 1320512ca97e70e0c702011a268c8b1a4ed0ce65 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 9 Jan 2022 12:30:01 +0200
Subject: [PATCH 0145/1427] cinnamon-control-center: update to 5.2.1.

---
 srcpkgs/cinnamon-control-center/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 365c11f9fa54..692e838d5061 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-control-center'
 pkgname=cinnamon-control-center
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-control-center"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=4a400801d2a53c0f0ab600682645376ea4afac3d6b1bbad3fbf580bf35651825
+checksum=977ac52cf8bcdea99c03c6455f29276a57a605839cf16d190db2088df243366d
 make_check=no
 
 libcinnamon-control-center_package() {

From 3dc254c36b710f9022d799891d23c273d93bc91d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 9 Jan 2022 12:30:10 +0200
Subject: [PATCH 0146/1427] cinnamon-translations: update to 5.2.2.

---
 srcpkgs/cinnamon-translations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 2a9404cd42c7..d5d86b50b9fb 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-translations'
 pkgname=cinnamon-translations
-version=5.2.1
+version=5.2.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="gettext"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-translations/"
 distfiles="https://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"
-checksum=d66b6998903511d2fa762ed3bce81b50b62213c2cf9db322afb981f9d3a4ae9e
+checksum=3ee2e0e7266ff95b064a9122de823d2c427a82bcfe2fb8619c45bca0549db4c0
 
 do_install() {
 	vmkdir usr

From 68697ecdb8b8471da8899af618c57d9a8c0b726d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 Jan 2022 19:42:07 +0100
Subject: [PATCH 0147/1427] ckb-next: get rid of pulseaudio dependency.

As pipewire gets more common, it makes no sense to hard-depend on
pulseaudio anymore and it was a bad idea anyway.
---
 srcpkgs/ckb-next/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ckb-next/template b/srcpkgs/ckb-next/template
index ad5ff48f8f4a..6a88fa0324e3 100644
--- a/srcpkgs/ckb-next/template
+++ b/srcpkgs/ckb-next/template
@@ -1,23 +1,19 @@
 # Template file for 'ckb-next'
 pkgname=ckb-next
 version=0.4.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DDISABLE_UPDATER=1 -DUDEV_RULE_DIRECTORY=/usr/lib/udev/rules.d"
 hostmakedepends="qt5-devel pkg-config"
 makedepends="eudev-libudev-devel libdbusmenu-qt5-devel qt5-devel
  qt5-tools-devel qt5-x11extras-devel quazip-qt5-devel xcb-util-wm-devel
- $(vopt_if pulseaudio pulseaudio-devel)"
-depends="$(vopt_if pulseaudio pulseaudio)"
+ pulseaudio-devel"
 short_desc="Corsair RGB Driver for Linux"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ckb-next/ckb-next"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=6946bd035cdbbbd2f139e543d2ca84ba422176c62c3a3665b544118dc6d618d0
-build_options="pulseaudio"
-build_options_default="pulseaudio"
-desc_option_pulseaudio="Enable support for music visualizer animation"
 
 CFLAGS="-fcommon"
 

From b9098aa3858de184855685b3a4cd2dde66a89087 Mon Sep 17 00:00:00 2001
From: J Farkas <chexum+git@gmail.com>
Date: Sun, 9 Jan 2022 14:44:16 +0000
Subject: [PATCH 0148/1427] wxWidgets: fix whitespace in patches.

Tweak the wxWidgets patches so that they apply cleanly to Makefile.in

Closes: #34963 [via git-merge-pr]
---
 .../wxWidgets/patches/wxGTK-collision.patch   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
index 46d4085d37f2..5ec31ebaceb1 100644
--- a/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
+++ b/srcpkgs/wxWidgets/patches/wxGTK-collision.patch
@@ -1,9 +1,9 @@
 diff -Naur Makefile.in Makefile.in
 --- a/Makefile.in	2014-10-06 23:33:44.000000000 +0200
 +++ b/Makefile.in	2014-11-19 10:48:18.752319058 +0100
-@@ -15258,9 +15258,11 @@
+@@ -15279,9 +15279,11 @@
  
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
 -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
 +	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4)
@@ -15,18 +15,16 @@ diff -Naur Makefile.in Makefile.in
  	$(DYLIB_RPATH_INSTALL)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
  	for f in setup.h $(RCDEFS_H); do \
---- a/Makefile.in.orig    2020-04-30 21:43:35.176560163 +0200
-+++ b/Makefile.in 2020-04-30 21:45:48.927132300 +0200
-@@ -16177,7 +16177,7 @@
-        $(INSTALL_DIR) $(DESTDIR)$(bindir)
-        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-        $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+@@ -16177,7 +16179,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
 -	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
 +	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
-
- locale_install:
-        $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16153,7 +16155,7 @@
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -16185,7 +16187,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -35,7 +33,7 @@ diff -Naur Makefile.in Makefile.in
  	fi ; \
  	done
  
-@@ -16170,7 +16172,7 @@
+@@ -16202,7 +16204,7 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
  	if test -f $(srcdir)/locale/msw/$$l.mo ; then \

From 99eec5d735aaeeabed04256c1970f133ac66f4f0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 11 Jan 2022 03:50:02 +1100
Subject: [PATCH 0149/1427] socat: update to 1.7.4.3.

See the following upstream commits:
  - https://repo.or.cz/socat.git/commit/ffa09eac003f00767147db5ae69134966fa0ded8
  - https://repo.or.cz/socat.git/commit/967e2b24b5318f26aedc4cafce6e0ef11c187bb1
---
 srcpkgs/socat/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 92ccc52bc08f..44fe3e4ce6d6 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,6 +1,6 @@
 # Template file for 'socat'
 pkgname=socat
-version=1.7.4.2
+version=1.7.4.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
@@ -11,10 +11,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
-checksum=6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763
+checksum=d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;
+	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H"
+		configure_args+=" sc_cv_getprotobynumber_r=2"
+		;;
 esac
 
 case "$XBPS_TARGET_MACHINE" in

From af8424b699846a83a0cfe380f85a4b435e34e300 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, 12 Jan 2022 15:33:15 +0700
Subject: [PATCH 0150/1427] minetest: add missing makedepends

---
 srcpkgs/minetest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template
index 197ee68e4e5b..ca4334b04286 100644
--- a/srcpkgs/minetest/template
+++ b/srcpkgs/minetest/template
@@ -7,7 +7,7 @@ configure_args="-DBUILD_SERVER=TRUE -DVERSION_EXTRA=_${revision}"
 hostmakedepends="pkg-config gettext"
 makedepends="MesaLib-devel freetype-devel gmp-devel irrlicht-devel
  libcurl-devel libjpeg-turbo-devel libopenal-devel libvorbis-devel lua52-devel
- sqlite-devel"
+ sqlite-devel libXxf86vm-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="InfiniMiner/Minecraft inspired game"
 maintainer="Nathan <ndowens@artixlinux.org>"

From 6a6a77ed3fb30919055944fb4991d90cd3622fa4 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, 12 Jan 2022 15:42:24 +0700
Subject: [PATCH 0151/1427] nm-tray: needs pkg-config

---
 srcpkgs/nm-tray/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template
index b2a3e85cf57e..bda727cc43b9 100644
--- a/srcpkgs/nm-tray/template
+++ b/srcpkgs/nm-tray/template
@@ -3,7 +3,7 @@ pkgname=nm-tray
 version=0.4.3
 revision=2
 build_style=cmake
-hostmakedepends="qt5-qmake qt5-host-tools"
+hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-tools-devel networkmanager-qt5-devel"
 depends="NetworkManager"
 short_desc="NetworkManager tray icon implemented with Qt"

From ed2b36623650584e0676e021236f04b4e1cfbdff 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, 12 Jan 2022 15:33:00 +0700
Subject: [PATCH 0152/1427] kmymoney: fix build, use ninja

---
 srcpkgs/kmymoney/patches/akonadi-include.patch | 17 +++++++++++++++++
 srcpkgs/kmymoney/template                      | 10 ++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/kmymoney/patches/akonadi-include.patch

diff --git a/srcpkgs/kmymoney/patches/akonadi-include.patch b/srcpkgs/kmymoney/patches/akonadi-include.patch
new file mode 100644
index 000000000000..d65932b98419
--- /dev/null
+++ b/srcpkgs/kmymoney/patches/akonadi-include.patch
@@ -0,0 +1,17 @@
+Index: kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp
+===================================================================
+--- kmymoney-5.1.2.orig/kmymoney/mymoney/mymoneycontact.cpp
++++ kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp
+@@ -10,9 +10,9 @@
+ #ifdef ENABLE_ADDRESSBOOK
+ #include <KIdentityManagement/IdentityManager>
+ #include <KIdentityManagement/Identity>
+-#include <AkonadiCore/RecursiveItemFetchJob>
+-#include <AkonadiCore/ItemFetchScope>
+-#include <AkonadiCore/Collection>
++#include <AkonadiCore/Akonadi/RecursiveItemFetchJob>
++#include <AkonadiCore/Akonadi/ItemFetchScope>
++#include <AkonadiCore/Akonadi/Collection>
+ #include <KContacts/Addressee>
+ #include <QRegularExpression>
+ #endif
diff --git a/srcpkgs/kmymoney/template b/srcpkgs/kmymoney/template
index 218ca869da6c..dd5372079efa 100644
--- a/srcpkgs/kmymoney/template
+++ b/srcpkgs/kmymoney/template
@@ -5,14 +5,14 @@ revision=2
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DBUILD_TESTING=OFF"
-make_cmd="make"
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools pkg-config
  python3 qt5-host-tools qt5-qmake gettext"
 makedepends="akonadi5-devel aqbanking-devel gmp-devel gmpxx-devel gpgmeqt-devel
  gwenhywfar-devel gwenhywfar-qt5 kactivities5-devel kcmutils-devel
  kcontacts-devel kdewebkit-devel kdiagram-devel kholidays-devel
  kidentitymanagement-devel kross-devel libalkimia-devel libical-devel
- libofx-devel kio-devel kbookmarks-devel kwidgetsaddons-devel"
+ libofx-devel kio-devel kbookmarks-devel kwidgetsaddons-devel
+ akonadi5-devel"
 depends="shared-mime-info"
 short_desc="Personal finance manager"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -21,12 +21,6 @@ homepage="https://kmymoney.org"
 distfiles="${KDE_SITE}/kmymoney/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=37bdc4e763a2849b9f739f73e38b389c02bde1c1b1844edcfa7e3ab1d5bf7b3b
 
-export CMAKE_GENERATOR="Unix Makefiles"
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DENABLE_LIBICAL=0"
-fi
-
 post_extract() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed /find_package\(Libical\)/d -i CMakeLists.txt

From b8aee1d44e2baf951043590468d3f11e234f27ed 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, 12 Jan 2022 16:14:18 +0700
Subject: [PATCH 0153/1427] openvdb: makeddepends+=libXxf86vm-devel

---
 srcpkgs/openvdb/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 72fde5bc6375..73ca06bfd53a 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -5,7 +5,8 @@ revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
+ libXxf86vm-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"

From 941a7e69278edd049abe92563cbb74e6e4543b82 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, 12 Jan 2022 16:25:53 +0700
Subject: [PATCH 0154/1427] pdfpc: broken as of other vala stuff

---
 srcpkgs/pdfpc/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pdfpc/template b/srcpkgs/pdfpc/template
index 0b49e9a6ac78..fb4a422351cb 100644
--- a/srcpkgs/pdfpc/template
+++ b/srcpkgs/pdfpc/template
@@ -4,7 +4,7 @@ version=4.5.0
 revision=1
 wrksrc="pdfpc-${version}"
 build_style=cmake
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala libgee08-devel"
 makedepends="gst-plugins-base1-devel gtk+3-devel libgee08-devel
  libzstd-devel poppler-glib-devel json-glib-devel vala-devel
  webkit2gtk-devel discount-devel"
@@ -15,7 +15,4 @@ homepage="https://pdfpc.github.io/"
 changelog="https://raw.githubusercontent.com/pdfpc/pdfpc/master/CHANGELOG.txt"
 distfiles="https://github.com/pdfpc/pdfpc/archive/v${version}.tar.gz"
 checksum=e53ede1576da55403bba23671df5b946c756ec83ba30fbeb0cb7302f28b54a64
-
-if [ $CROSS_BUILD ]; then
-	hostmakedepends+=" libgee08-devel"
-fi
+broken="The name 'from_caps' does not exist in the context of 'Gst.Video.Info'"

From 5975529ae3b0c524157594c86d3115a58475c0c4 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, 12 Jan 2022 16:48:43 +0700
Subject: [PATCH 0155/1427] pulseview: fix build

---
 .../patches/template-c-linkage.patch          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/pulseview/patches/template-c-linkage.patch

diff --git a/srcpkgs/pulseview/patches/template-c-linkage.patch b/srcpkgs/pulseview/patches/template-c-linkage.patch
new file mode 100644
index 000000000000..478ad59c1383
--- /dev/null
+++ b/srcpkgs/pulseview/patches/template-c-linkage.patch
@@ -0,0 +1,28 @@
+Index: pulseview-0.4.2/pv/data/decode/annotation.cpp
+===================================================================
+--- pulseview-0.4.2.orig/pv/data/decode/annotation.cpp
++++ pulseview-0.4.2/pv/data/decode/annotation.cpp
+@@ -17,9 +17,7 @@
+  * along with this program; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-extern "C" {
+ #include <libsigrokdecode/libsigrokdecode.h>
+-}
+ 
+ #include <cassert>
+ #include <vector>
+Index: pulseview-0.4.2/pv/views/trace/decodetrace.cpp
+===================================================================
+--- pulseview-0.4.2.orig/pv/views/trace/decodetrace.cpp
++++ pulseview-0.4.2/pv/views/trace/decodetrace.cpp
+@@ -17,9 +17,7 @@
+  * along with this program; if not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-extern "C" {
+ #include <libsigrokdecode/libsigrokdecode.h>
+-}
+ 
+ #include <limits>
+ #include <mutex>

From 78fc8f0bc24a69846ecf8e5b2618d927aeb5b9dd 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, 8 Jan 2022 10:58:20 +0700
Subject: [PATCH 0156/1427] cmake: update to 3.22.1.

---
 srcpkgs/cmake/patches/ar-lwyu.patch | 20 --------------------
 srcpkgs/cmake/template              |  4 ++--
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch

diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
-   this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
-                                 config);
-   if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
--    vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+    switch (targetType) {
-+      case cmStateEnums::EXECUTABLE:
-+      case cmStateEnums::SHARED_LIBRARY:
-+      case cmStateEnums::MODULE_LIBRARY:
-+        vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+        break;
-+    }
-   }
-   vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
- 
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..bbe602d66494 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake'
 pkgname=cmake
-version=3.21.1
+version=3.22.1
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause, ICU"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
 replaces="cmake-bootstrap>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 64fc0d213757836d73e38aeb3af25c2cf06f4168 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, 11 Jan 2022 18:40:14 +0700
Subject: [PATCH 0157/1427] cmake-gui: update to 3.22.1.

---
 srcpkgs/cmake-gui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..b31163b0aa46 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-version=3.21.1
+version=3.22.1
 revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
 
 do_install() {
 	# We are only interested in cmake-gui.

From 849655bbdbeaff478b0876dfc05fdb5350ae6c0d 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, 12 Jan 2022 19:21:18 +0700
Subject: [PATCH 0158/1427] renderdoc: need c++14

auto in lambda
---
 srcpkgs/renderdoc/patches/atomic.patch       |  8 +++++---
 srcpkgs/renderdoc/patches/c++14-needed.patch | 13 +++++++++++++
 srcpkgs/renderdoc/template                   |  6 +-----
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/renderdoc/patches/c++14-needed.patch

diff --git a/srcpkgs/renderdoc/patches/atomic.patch b/srcpkgs/renderdoc/patches/atomic.patch
index ce74d2a301c2..1935b1e4d77d 100644
--- a/srcpkgs/renderdoc/patches/atomic.patch
+++ b/srcpkgs/renderdoc/patches/atomic.patch
@@ -3,12 +3,14 @@ so we can use libatomic on targets without atomic8 support
 
 --- a/renderdoc/CMakeLists.txt
 +++ b/renderdoc/CMakeLists.txt
-@@ -55,6 +55,8 @@ elseif(UNIX)
+@@ -55,6 +55,10 @@ elseif(UNIX)
          PRIVATE -ldl
          PRIVATE -lrt)
  
-+#libatomic list(APPEND RDOC_LIBRARIES PRIVATE -latomic)
-+
++option(NEED_LIBATOMIC "need libatomic" OFF) 
++if (NEED_LIBATOMIC)
++list(APPEND RDOC_LIBRARIES PRIVATE -latomic)
++endif()
      if(ENABLE_XLIB)
          find_package(X11 REQUIRED)
  
diff --git a/srcpkgs/renderdoc/patches/c++14-needed.patch b/srcpkgs/renderdoc/patches/c++14-needed.patch
new file mode 100644
index 000000000000..5899f555a952
--- /dev/null
+++ b/srcpkgs/renderdoc/patches/c++14-needed.patch
@@ -0,0 +1,13 @@
+Index: renderdoc-1.12/CMakeLists.txt
+===================================================================
+--- renderdoc-1.12.orig/CMakeLists.txt
++++ renderdoc-1.12/CMakeLists.txt
+@@ -323,7 +323,7 @@ if(cmake_build_type_lower STREQUAL "rele
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-strict-aliasing")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+     if(ENABLE_GGP)
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")
diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template
index 9e66938c9bc4..59d1061c8647 100644
--- a/srcpkgs/renderdoc/template
+++ b/srcpkgs/renderdoc/template
@@ -25,15 +25,11 @@ fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DNEED_LIBATOMIC=ON"
 fi
 
 nocross="Cross-compilation can't find python3 interpreter"
 
-post_patch() {
-	[ -z "$XBPS_TARGET_NO_ATOMIC8" ] && return 0
-	vsed -i 's,#libatomic ,    ,' renderdoc/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE.md
 	vlicense docs/credits_acknowledgements.rst

From 45c6fcb2635bfee44e9e0921309fdf148f14ea63 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, 12 Jan 2022 17:06:30 +0700
Subject: [PATCH 0159/1427] kodi: patch patches context

---
 srcpkgs/kodi/patches/fortify-source-fix.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kodi/patches/fortify-source-fix.patch b/srcpkgs/kodi/patches/fortify-source-fix.patch
index 5717746e09e1..5a314718a70f 100644
--- a/srcpkgs/kodi/patches/fortify-source-fix.patch
+++ b/srcpkgs/kodi/patches/fortify-source-fix.patch
@@ -1,9 +1,11 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
+Index: xbmc-19.0-Matrix/xbmc/cores/DllLoader/exports/wrapper.c
+===================================================================
+--- xbmc-19.0-Matrix.orig/xbmc/cores/DllLoader/exports/wrapper.c
++++ xbmc-19.0-Matrix/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -449,7 +449,7 @@ struct mntent *__wrap_getmntent(FILE *fp
  // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions. 
+ // actually call __*chk (for example, __fread_chk). We need to bypass this whole
+ // thing to actually call our wrapped functions.
 -#if _FORTIFY_SOURCE > 1
 +#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
  

From 1ccce810dbfbd7bc893c900b54326247a1777f46 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 12 Jan 2022 13:27:53 +0100
Subject: [PATCH 0160/1427] gambit: update to 4.9.4.

---
 srcpkgs/gambit/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 3f7ec840d264..27fbcbf793e6 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,8 +1,10 @@
 # Template file for 'gambit'
 pkgname=gambit
-version=4.9.3
-revision=6
+version=4.9.4
+revision=1
 build_style=gnu-configure
+# We only build core, since the rest doesn't cross-compile.
+make_build_target="core"
 configure_args="
  --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
  --enable-compiler-name=gambit-gsc
@@ -12,19 +14,20 @@ makedepends="openssl-devel"
 short_desc="Complete, portable, efficient and reliable implementation of Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-only, Apache-2.0"
-# Returns a completely white page
-# homepage="http://gambitscheme.org/"
-homepage="https://github.com/gambit/gambit"
+homepage="https://gambitscheme.org/"
 distfiles="https://github.com/gambit/gambit/archive/v${version}.tar.gz"
-checksum=a5e4e5c66a99b6039fa7ee3741ac80f3f6c4cff47dc9e0ff1692ae73e13751ca
+checksum=19fb44a65b669234f6c0467cdc3dbe2e2c95a442f38e4638e7d89c90e247bd08
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-DNETDB_INTERNAL=-1 -DNETDB_SUCCESS=0";;
 esac
 
+post_patch() {
+	vsed -i 's/4\.9\.3/4.9.4/g' include/stamp-release.h
+}
+
 post_install() {
 	for f in ${DESTDIR}/usr/lib/gambit/lib*.so.*; do
 		ln -sfr $f ${DESTDIR}/usr/lib
 	done
-	sed -i -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" ${DESTDIR}/usr/bin/gambcomp-C
 }

From 40ed9263a945908cc2369dd6c2a367dc373f02f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 12 Jan 2022 13:27:56 +0100
Subject: [PATCH 0161/1427] gerbil: update to 0.17.

---
 srcpkgs/gerbil/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index 3d141bee627b..50f63094019e 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,7 +1,8 @@
 # Template file for 'gerbil'
 pkgname=gerbil
-version=0.16
-revision=3
+version=0.17
+revision=1
+build_style="gnu-configure"
 hostmakedepends="gambit rsync"
 makedepends="openssl-devel sqlite-devel zlib-devel"
 short_desc="Opinionated dialect of Scheme designed for Systems Programming"
@@ -9,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later, Apache-2.0"
 homepage="https://cons.io/"
 distfiles="https://github.com/vyzo/gerbil/archive/v${version}.tar.gz"
-checksum=1157d4ef60dab6a0f7c4986d5c938391973045093c470a03ffe02266c4d3e119
+checksum=1e81265aba7e9022432649eb26b2e5c85a2bb631a315e4fa840b14cf336b2483
 nocross="yes"
 
 do_build() {
@@ -22,5 +23,6 @@ do_install() {
 	cp -a bin ${DESTDIR}/usr
 	cp -a lib ${DESTDIR}/usr/lib/gerbil
 	vinstall ${FILESDIR}/gerbil.sh 0644 etc/profile.d
-	vinstall etc/gerbil.el 0644 usr/share/emacs/site-lisp
+	vinstall etc/gerbil-mode.el 0644 usr/share/emacs/site-lisp
+	find ${DESTDIR} -name .keep -delete
 }

From 2ab5a64327c83b5b14fc5476973970da2ebd69a2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 12 Jan 2022 13:47:08 +0100
Subject: [PATCH 0162/1427] hello: update to 2.11.

---
 srcpkgs/hello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hello/template b/srcpkgs/hello/template
index 9656bb88fadf..d3918f9e7bd4 100644
--- a/srcpkgs/hello/template
+++ b/srcpkgs/hello/template
@@ -1,6 +1,6 @@
 # Template file for 'hello'
 pkgname=hello
-version=2.10
+version=2.11
 revision=1
 build_style=gnu-configure
 short_desc="Friendly greeting program"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/hello/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=31e066137a962676e89f69d1b65382de95a7ef7d914b8cb956f41ea72e0f516b
+checksum=8c9ce0572d3c44ed0670eb1cde980584e038b6f62c25fdfde8ef128de15004bd

From 73463197e5675c1363beac72005d83a73e248c5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 12 Jan 2022 13:56:02 +0100
Subject: [PATCH 0163/1427] linux5.10: update to 5.10.91.

---
 srcpkgs/linux5.10/files/arm64-dotconfig   | 1 +
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 1 +
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 1 +
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 3 ++-
 srcpkgs/linux5.10/template                | 4 ++--
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index 6d0248dad164..cc2b4f021dbe 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -224,6 +224,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index d7aa7ea0bb73..cead9c1ca7cb 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -218,6 +218,7 @@ CONFIG_BPF_LSM=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index b530706d8f62..d4d06f632e06 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -216,6 +216,7 @@ CONFIG_BPF_LSM=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index e93531a1f00f..2bc7d0f88518 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.86 Kernel Configuration
+# Linux/x86_64 5.10.91 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -243,6 +243,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_USERMODE_DRIVER=y
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_PRELOAD_UMD=m
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a075a2451441..840008374136 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.89
+version=5.10.91
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=92218b1a4a18f1cb9ec07d2b7fce41577452aa552c54c25b6d5fe9b4b543bb30
+checksum=62cefb84c1c63a048520ff74eca4b16ce375956c351c8227bf9e4869cd8595d1
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 6644e2e3d7259f2af4a6c8de4be280afe56991ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 12 Jan 2022 14:03:54 +0100
Subject: [PATCH 0164/1427] linux5.15: update to 5.15.14.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index aa7ba2a2b387..d50c3be91046 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.12
+version=5.15.14
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 161deb7c6bd10e7c530a3ee83793e2e135f93a5afd73d8b16e251c708ade0b1b"
+ 283bf58378a8f8ff457fc1259dd2864dc4de92295482ef3ae868e13e017250ee"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 5e785fc9c2eaf3e57a48dd95f1e20a69367f3235 Mon Sep 17 00:00:00 2001
From: Siddhartha Menon <42359201+Sqvid@users.noreply.github.com>
Date: Thu, 6 Jan 2022 16:42:06 +0100
Subject: [PATCH 0165/1427] New package: btdu-0.3.0

---
 srcpkgs/btdu/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/btdu/template

diff --git a/srcpkgs/btdu/template b/srcpkgs/btdu/template
new file mode 100644
index 000000000000..8dab0a8f6158
--- /dev/null
+++ b/srcpkgs/btdu/template
@@ -0,0 +1,25 @@
+# Template file for 'btdu'
+pkgname=btdu
+version=0.3.0
+revision=1
+# druntime does not implement ioctl on musl in dmd-2.098.0
+# struct packing seems to differ on i686 archs and therefore d-btrfs fails
+archs=x86_64
+hostmakedepends="dmd 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=6019f20862ac5ed84d115ffcc5305d000714ac2324d81671a4961efc79edc9f2
+nocross="dmd compilation fails on cross"
+
+do_build() {
+	dub build -b release
+}
+
+do_install() {
+	vbin btdu
+	vman btdu.1
+}

From 540386b6b5ce259776957686b91afc7939865999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:08:55 -0300
Subject: [PATCH 0166/1427] gsl: update to 2.7.1, adopt.

---
 common/shlibs        | 2 +-
 srcpkgs/gsl/template | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f5e92014becc..ebbd48a3d84c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -830,7 +830,7 @@ libgiblib.so.1 giblib-1.2.4_1
 libgc.so.1 gc-7.6.4_1
 libcord.so.1 gc-7.4_1
 libgslcblas.so.0 gsl-1.15_1
-libgsl.so.25 gsl-2.6_1
+libgsl.so.27 gsl-2.7.1_1
 liblua5.1.so.5.1 lua51-5.1.5_1
 liblua5.2.so.5.2 lua52-5.2.4_2
 liblua5.3.so.5.3 lua53-5.3.5_4
diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template
index ef355472eff7..854dbe8d795c 100644
--- a/srcpkgs/gsl/template
+++ b/srcpkgs/gsl/template
@@ -1,14 +1,15 @@
 # Template file for 'gsl'
 pkgname=gsl
-version=2.7
+version=2.7.1
 revision=1
 build_style=gnu-configure
 short_desc="Numerical library for C and C++ programmers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/gsl/gsl.html"
+changelog="http://git.savannah.gnu.org/cgit/gsl.git/plain/NEWS"
 distfiles="${GNU_SITE}/gsl/${pkgname}-${version}.tar.gz"
-checksum=efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b
+checksum=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
 
 case $XBPS_TARGET_MACHINE in
 	# avoid numerical noise caused by extended-precision of registers

From a830874575b1fafdf6052d668d1c37f01f1c6e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:44 -0300
Subject: [PATCH 0167/1427] Clight: revbump for gsl-2.7.1

---
 srcpkgs/Clight/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index e8acf81bca2e..e70d25d173dd 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,7 +1,7 @@
 # Template file for 'Clight'
 pkgname=Clight
 version=4.7
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion

From 1fb4866c4013fd10e017b3ec0c7e93f3eb814e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:44 -0300
Subject: [PATCH 0168/1427] bogofilter: revbump for gsl-2.7.1

Note: on x86_64-musl 3 tests fail (t.dump.load, t.nonascii.replace,
t.bulkmode)
---
 srcpkgs/bogofilter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bogofilter/template b/srcpkgs/bogofilter/template
index 82e2d38c53e9..32e283f57aad 100644
--- a/srcpkgs/bogofilter/template
+++ b/srcpkgs/bogofilter/template
@@ -1,7 +1,7 @@
 # Template file for 'bogofilter'
 pkgname=bogofilter
 version=1.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite"
 hostmakedepends="perl"

From b26085a37abf6d424895dd85cc3603b3ac44e60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:44 -0300
Subject: [PATCH 0169/1427] calligra: revbump for gsl-2.7.1

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fba5f1f16ee5..89d0b1648e9e 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=5
+revision=6
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From b58278640ea79461a5702d86fcafb9ed8b75767b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:44 -0300
Subject: [PATCH 0170/1427] dieharder: revbump for gsl-2.7.1

Also fix URLs
---
 srcpkgs/dieharder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dieharder/template b/srcpkgs/dieharder/template
index eaa5ab38c16a..bff9f12db8af 100644
--- a/srcpkgs/dieharder/template
+++ b/srcpkgs/dieharder/template
@@ -1,14 +1,14 @@
 # Template file for 'dieharder'
 pkgname=dieharder
 version=3.31.1
-revision=7
+revision=8
 build_style=gnu-configure
 makedepends="gsl-devel"
 short_desc="Testing and benchmarking tool for random number generators"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://www.phy.duke.edu/~rgb/General/dieharder.php"
-distfiles="http://www.phy.duke.edu/~rgb/General/dieharder/${pkgname}-${version}.tgz"
+homepage="http://webhome.phy.duke.edu/~rgb/General/dieharder.php"
+distfiles="http://webhome.phy.duke.edu/~rgb/General/dieharder/${pkgname}-${version}.tgz"
 checksum=6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f
 disable_parallel_build=yes
 

From 79957c26a6eb1fc43c38ec82b04432dd713e2f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:44 -0300
Subject: [PATCH 0171/1427] enblend-enfuse: revbump for gsl-2.7.1

---
 srcpkgs/enblend-enfuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template
index 9401bc3544be..783bc4a693f4 100644
--- a/srcpkgs/enblend-enfuse/template
+++ b/srcpkgs/enblend-enfuse/template
@@ -1,7 +1,7 @@
 # Template file for 'enblend-enfuse'
 pkgname=enblend-enfuse
 version=4.2
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--enable-openmp --with-tcmalloc"
 hostmakedepends="pkg-config perl automake"

From 798e70f33cff519310bce1bf8c09902a1e13ab85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:45 -0300
Subject: [PATCH 0172/1427] giac: update to 1.7.0.45.

---
 srcpkgs/giac/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 4ca28fa53647..2c192c2b858f 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.39
+version=1.7.0.45
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=234645e33284969fac5901e6172756ac925a6b93362fa24e86e647a82cfcad56
+checksum=028b9e323d81a261a243c0768d5e12f3d76371eff05fd24cf2eb177b445f1da6
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From bf74c59a7e00c74a26186cfa636ef8340c60e97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:45 -0300
Subject: [PATCH 0173/1427] gnuradio: revbump for gsl-2.7.1

Also fix do_check() step:
 - add python3-scipy to checkdepends, required by some tests
 - add three patches from upstream that fix some other tests
 - add a patch to (conditionally) skip a test that hangs on 32 bit

Note: on i686 2 tests fail (qa_ctcss_squelch, qa_constellation)
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 +++++++++++++++++++
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 +++++++++++
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 +++++++++++++
 .../skip-test-that-hangs-on-32bit.patch       | 26 +++++++++++
 srcpkgs/gnuradio/template                     |  3 +-
 5 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 create mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 create mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
 create mode 100644 srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
new file mode 100644
index 000000000000..51952bd29b38
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
@@ -0,0 +1,46 @@
+From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
+Date: Mon, 13 Apr 2020 00:11:59 +0200
+Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
+ =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
+index 884bba7dd4b..44f616cdae1 100644
+--- a/gnuradio-runtime/python/pmt/qa_pmt.py
++++ b/gnuradio-runtime/python/pmt/qa_pmt.py
+@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
+     MAXINT32 = (2**31)-1
+     MININT32 = (-MAXINT32)-1
+ 
++    def setUp(self):
++        from ctypes import sizeof, c_long
++        self.sizeof_long = sizeof(c_long)
++
+     def test01(self):
+         a = pmt.intern("a")
+         b = pmt.from_double(123765)
+@@ -112,6 +116,8 @@ def test14(self):
+         self.assertEqual(const,pmt.to_long(deser))
+ 
+     def test15(self):
++        if(self.sizeof_long <= 4):
++            return
+         const = self.MAXINT32 + 1
+         x_pmt = pmt.from_long(const)
+         s = pmt.serialize_str(x_pmt)
+@@ -137,6 +143,8 @@ def test17(self):
+         self.assertEqual(const, x_long)
+ 
+     def test18(self):
++        if(self.sizeof_long <= 4):
++            return
+         const = self.MININT32 - 1
+         x_pmt = pmt.from_long(const)
+         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
new file mode 100644
index 000000000000..c49a047427e8
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
@@ -0,0 +1,28 @@
+From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
+From: John Sallay <jasallay@gmail.com>
+Date: Sat, 23 Oct 2021 08:26:42 -0400
+Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
+
+The number of input elements needs to be disivible by volk_alignment, which it wasn't
+for machines with 512-bit registers.
+
+Signed-off-by: John Sallay <jasallay@gmail.com>
+---
+ gr-analog/python/analog/qa_agc.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
+index a5a8ea47b6a..9368dd5d2a8 100644
+--- a/gr-analog/python/analog/qa_agc.py
++++ b/gr-analog/python/analog/qa_agc.py
+@@ -454,7 +454,9 @@ def test_006(self):
+         tb = self.tb
+ 
+         sampling_freq = 100
+-        N = int(5*sampling_freq)
++        # N must by a multiple of the volk_alignment of the system for this test to work.
++        # For a machine with 512-bit registers, that would be 8 complex-floats.
++        N = int(8 * sampling_freq)
+         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
+                                    sampling_freq * 0.10, 100)
+         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
new file mode 100644
index 000000000000..4faa3468140a
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
@@ -0,0 +1,31 @@
+From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
+From: alekhgupta1441 <alekhgupta1441@gmail.com>
+Date: Sun, 12 Apr 2020 03:48:14 +0530
+Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
+
+---
+ gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
+index 4503c4fea7b..84f6de66e45 100644
+--- a/gr-digital/python/digital/soft_dec_lut_gen.py
++++ b/gr-digital/python/digital/soft_dec_lut_gen.py
+@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
+ 
+     '''
+ 
+-    npts = 2.0**prec
++    npts = int(2.0**prec)
+     maxd = Es*numpy.sqrt(2.0)/2.0
+     yrng = numpy.linspace(-maxd, maxd, npts)
+     xrng = numpy.linspace(-maxd, maxd, npts)
+@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
+     re_max = max(numpy.array(constel).real)
+     im_max = max(numpy.array(constel).imag)
+ 
+-    npts = 2.0**prec
++    npts = int(2.0**prec)
+     yrng = numpy.linspace(im_min, im_max, npts)
+     xrng = numpy.linspace(re_min, re_max, npts)
+ 
diff --git a/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
new file mode 100644
index 000000000000..25a694211100
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch
@@ -0,0 +1,26 @@
+Skip one test that hangs forever on 32 bit
+
+See: https://github.com/gnuradio/gnuradio/issues/989
+
+--- a/gr-fec/python/fec/qa_fecapi_ldpc.py	2019-08-09 18:15:36.000000000 -0300
++++ b/gr-fec/python/fec/qa_fecapi_ldpc.py	2021-12-28 12:56:31.635977173 -0300
+@@ -98,6 +98,9 @@
+         self.assertEqual(data_in, data_out)
+ 
+     def test_parallelism0_03(self):
++        from ctypes import sizeof, c_long
++        if sizeof(c_long) <= 4:
++            return
+         filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
+         gap = 4
+         LDPC_matrix_object = fec.ldpc_G_matrix(filename)
+@@ -115,6 +118,9 @@
+         self.assertEqual(data_in, data_out)
+ 
+     def test_parallelism0_03(self):
++        from ctypes import sizeof, c_long
++        if sizeof(c_long) <= 4:
++            return
+         filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
+         gap = 4
+         k = 100 - 58
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index d41d253fa77b..c950b53e8bea 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
 version=3.8.0.0
-revision=8
+revision=9
 build_style=cmake
 conf_files="/etc/gnuradio/conf.d/*"
 configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
@@ -12,6 +12,7 @@ makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
  python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel"
 depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject
  python3-yaml"
+checkdepends="python3-scipy"
 short_desc="Framework for software defined radio"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"

From 6b2c5fea77902fac831151501b4f1e7068f287b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:45 -0300
Subject: [PATCH 0174/1427] guvcview: revbump for gsl-2.7.1

Also fix do_check() step
---
 srcpkgs/guvcview/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template
index 447b27aecf50..2696fc7007bc 100644
--- a/srcpkgs/guvcview/template
+++ b/srcpkgs/guvcview/template
@@ -1,7 +1,7 @@
 # Template file for 'guvcview'
 pkgname=guvcview
 version=2.0.6
-revision=2
+revision=3
 wrksrc="${pkgname}-src-${version}"
 build_style=gnu-configure
 configure_args="--disable-static --disable-debian-menu"
@@ -18,4 +18,6 @@ checksum=95381cef5ee139e15f90b79d1425cc22bbaae43f87452cdce6674636aff37e85
 
 post_extract() {
 	sed '31a#include <locale.h>' -i  guvcview/guvcview.c
+	# add missing EOL in this file to fix do_check()
+	echo >> po/POTFILES.in
 }

From 14d732ce66938f4c7a2ee95318ecb5c1d9ae0879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:45 -0300
Subject: [PATCH 0175/1427] igt-gpu-tools: revbump for gsl-2.7.1

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 3f8b4e2b6166..e5865e11a57f 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'igt-gpu-tools'
 pkgname=igt-gpu-tools
 version=1.25
-revision=4
+revision=5
 build_style=meson
 configure_args="-Db_ndebug=false -Db_lto=false"
 # b_lto=true makes the build hang at a random point

From 4877489e842ef99d851ce72d0bafa84a62e8adbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 09:37:07 -0300
Subject: [PATCH 0176/1427] inkscape: revbump for gsl-2.7.1

Note: on x86_64-musl 13 tests fail (all with SEGFAULT)
---
 srcpkgs/inkscape/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 742c6f95bddb..45f48ccda0dc 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
 # Template file for 'inkscape'
 pkgname=inkscape
 version=1.1.1
-revision=2
+revision=3
 wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
 build_style=cmake
 # builds executables then runs checks

From d126a0b6cbf064e6682368808f11069534207dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:45 -0300
Subject: [PATCH 0177/1427] ipe: revbump for gsl-2.7.1

---
 srcpkgs/ipe/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index f18ebfc42572..fbd500a3dc94 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.24
-revision=4
+revision=5
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel

From 8c9539b2a16930adf932919f9ba3d8c5db1602ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 09:36:52 -0300
Subject: [PATCH 0178/1427] krita: revbump for gsl-2.7.1

---
 srcpkgs/krita/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index d7f2d468b8a7..36668e641a56 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=5.0.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3

From d2f8916567d2b88952b0e22423e46f663e351224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 5 Dec 2021 18:34:46 -0300
Subject: [PATCH 0179/1427] siril: revbump for gsl-2.7.1

Also:
 - fix do_check() step
 - add libgomp-devel to makedepends
---
 srcpkgs/siril/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..a06f3352243d 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,12 +1,12 @@
 # Template file for 'siril'
 pkgname=siril
 version=0.9.12
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool autoconf automake gettext-devel"
 makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel
  gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel
- ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel"
+ ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel libgomp-devel"
 depends="gnuplot"
 short_desc="Free astronomical image processing software"
 maintainer="Andreas Kempe <kempe@lysator.liu.se>"
@@ -21,6 +21,11 @@ fi
 
 CFLAGS="-fcommon"
 
+post_extract() {
+	# add missing check target in this subdir to fix do_check()
+	echo 'check:' >> deps/kplot/Makefile
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 07006c9855f266f2759d945fa67d70cb6ddc47fc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 12 Jan 2022 10:35:04 -0500
Subject: [PATCH 0180/1427] cpp-utilities: update to 5.12.0.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 78c7239ac571..bcea2e9aebae 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
 # Template file for 'cpp-utilities'
 pkgname=cpp-utilities
-version=5.11.3
+version=5.12.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=50866353d43c6cc0282b13c385ecbed1ebc68767cf7d22365174a0afc9b9325c
+checksum=eb044aeb1a227f9ad2cec4a3e7c07f65f97525f2c7030587960b2cd378c073f2
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From fe71da3be1e752f57fa0dbaebf31b9398e1a6fd1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 12 Jan 2022 10:35:35 -0500
Subject: [PATCH 0181/1427] tagparser: update to 10.4.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index c3f35266314d..37791a52b9f0 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=10.3.1
+version=10.4.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=2ad0ad322acf2574743c71fa7935b961eb82ce42818e3e888800c176c77e6564
+checksum=55c8c57960dbf25ecced618d96574cc1e9d9db167a434a8551620e5e40adf3e4
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 6b3e716da9681f5be271d707ee2c3044d5e40842 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 12 Jan 2022 10:37:02 -0500
Subject: [PATCH 0182/1427] tageditor: update to 3.6.0.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index ece38f3a1ed6..44b0700ab5ec 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.5.1
+version=3.6.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=c6a787ef5b235b93f55a5f458cc1cb6376a53f60b2de1a76c70efdfa8390b928
+checksum=a01b68af858b4802e498e926e2e75efa400c1922a73d65693f0795eb79956259
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From deda35b79d2a4c21f06dde9058b634df69e4efd7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 12 Jan 2022 11:08:41 -0500
Subject: [PATCH 0183/1427] python3-Pygments: update to 2.11.2.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index af9601463919..5ac883fda323 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.11.1
+version=2.11.2
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=59b895e326f0fb0d733fd28c6839bd18ad0687ba20efc26d4277fd1d30b971f4
+checksum=4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 post_install() {

From f87a5a1697e597ce46727a60a8a9dee2577f3381 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 12 Jan 2022 11:08:58 -0500
Subject: [PATCH 0184/1427] python3-decorator: update to 5.1.1.

---
 srcpkgs/python3-decorator/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-decorator/template b/srcpkgs/python3-decorator/template
index d4a5709cffff..6e9bbecc97bd 100644
--- a/srcpkgs/python3-decorator/template
+++ b/srcpkgs/python3-decorator/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-decorator'
 pkgname=python3-decorator
-version=5.1.0
-revision=2
+version=5.1.1
+revision=1
 wrksrc="decorator-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/micheles/decorator"
 changelog="https://raw.githubusercontent.com/micheles/decorator/master/CHANGES.md"
 distfiles="${PYPI_SITE}/d/decorator/decorator-${version}.tar.gz"
-checksum=e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7
+checksum=637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330
 
 post_install() {
 	vlicense LICENSE.txt

From cabcf20219de5ee129f7ed9f87dc3523694ce27e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 12 Jan 2022 11:16:40 -0500
Subject: [PATCH 0185/1427] python3-hypothesis: update to 6.35.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 989a3f9f080c..566f7311dcbd 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.34.0
+version=6.35.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,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=62c6c8e02adfeab4950b0e5a67069fba833ec0be02dfc69517f63214eba36118
+checksum=d503e6461ca29ad72ec3a4b0d680808b5eb64f1b146e032629cb16ca877d7e06
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From c0bcd3d0e8109cb1a6ec08ef918152acf588f15e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 9 Jan 2022 20:59:59 -0500
Subject: [PATCH 0186/1427] New package: swaykbdd-1.0

---
 srcpkgs/swaykbdd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/swaykbdd/template

diff --git a/srcpkgs/swaykbdd/template b/srcpkgs/swaykbdd/template
new file mode 100644
index 000000000000..195b04475bc1
--- /dev/null
+++ b/srcpkgs/swaykbdd/template
@@ -0,0 +1,17 @@
+# Template file for 'swaykbdd'
+pkgname=swaykbdd
+version=1.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="json-c-devel"
+short_desc="Per-window keyboard layout switcher for Sway"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/artemsen/swaykbdd"
+distfiles="https://github.com/artemsen/swaykbdd/archive/v${version}.tar.gz"
+checksum=9de46256cafb2b002d4632e1a2f4ca2383e69b69de4d19d3d2d6f4825ef9fca2
+
+post_install() {
+	vlicense LICENSE
+}

From 90b66c34a324d5ae009a6ff24fc9fdba785b6fc6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 12 Aug 2021 00:25:05 +0300
Subject: [PATCH 0187/1427] monero: fix monerod service script.

Without the --non-interactive switch the daemon starts in the foreground
but crashes after a few seconds with 'EOF on stdin, exiting'.

Closes: #32460
---
 srcpkgs/monero/files/monerod/run | 2 +-
 srcpkgs/monero/template          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monero/files/monerod/run b/srcpkgs/monero/files/monerod/run
index 0d120dc8afe8..bc06010c7c2e 100644
--- a/srcpkgs/monero/files/monerod/run
+++ b/srcpkgs/monero/files/monerod/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -u monero:monero /usr/bin/monerod --config-file /etc/monerod.conf
+exec chpst -u monero:monero /usr/bin/monerod --non-interactive --config-file /etc/monerod.conf
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 0304adc8b33c..c98b955ae0cb 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
 version=0.17.2.3
-revision=1
+revision=2
 _randomx_version="1.1.9"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"

From c91558d5434441d8123a6108b97089b659a23009 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 12 Jan 2022 20:53:18 +0100
Subject: [PATCH 0188/1427] qtox: update to 1.17.4.

---
 srcpkgs/qtox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index daf583a47962..f3fa78acb915 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,6 +1,6 @@
 # Template file for 'qtox'
 pkgname=qtox
-version=1.17.3
+version=1.17.4
 revision=1
 wrksrc="qTox-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.tox.chat/clients/qtox"
 changelog="https://raw.githubusercontent.com/qTox/qTox/master/CHANGELOG.md"
 distfiles="https://github.com/qTox/qTox/archive/v${version}.tar.gz"
-checksum=2664940cedfc4d168995542f89a17d894c3d0675ac463eaf4bd4b55825d1787c
+checksum=3d2fe2a344c83c50e6603d2a4070f2cc0c6ccd13fa5e77457eff96f57ee6f8c2
 
 build_options="snorenotify"
 build_options_default="snorenotify"

From 58ec53e7b020df5d13936d6d62857de996e7752e Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 12 Jan 2022 10:44:31 +0100
Subject: [PATCH 0189/1427] vale: update to 2.13.0

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 71df69e65e57..8675c1d9b8d9 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.10.7
+version=2.13.0
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=bd045f5d35158b3cb5b2c30db712a0a2263f6bd395ff9e135876487a1d2a9362
+checksum=4e039ac35c874e62f3380a619041c721ed7eedc1fb70b52cc3f78e632f2eddc4
 
 post_install() {
 	vlicense LICENSE

From 9c7ad72c608f7335212df484b8ecf736075c3237 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Thu, 13 Jan 2022 00:07:03 +0100
Subject: [PATCH 0190/1427] kmines: update to 21.12.1.

---
 srcpkgs/kmines/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template
index be300245b1ad..a75ab8e70959 100644
--- a/srcpkgs/kmines/template
+++ b/srcpkgs/kmines/template
@@ -1,6 +1,6 @@
 # Template file for 'kmines'
 pkgname=kmines
-version=21.08.3
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kmines"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz"
-checksum=a1b3c4864cffa60977f3833ac57cb25a0396232bf207fa6f57ca54d5e58b5474
+checksum=eca3c2d163e0cb023195c5901793859166fa08bcbd2c95494e059178a4f5e1de

From b93c3ffbb71386081634b0c0771d6206b7a77761 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 17:04:13 -0500
Subject: [PATCH 0191/1427] python3-occ: patch for python 3.10

---
 srcpkgs/python3-occ/patches/python3.10.patch | 15 +++++++++++++++
 srcpkgs/python3-occ/template                 |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-occ/patches/python3.10.patch

diff --git a/srcpkgs/python3-occ/patches/python3.10.patch b/srcpkgs/python3-occ/patches/python3.10.patch
new file mode 100644
index 000000000000..e192608fd3b3
--- /dev/null
+++ b/srcpkgs/python3-occ/patches/python3.10.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Display/SimpleGui.py b/src/Display/SimpleGui.py
+index 42705a82..6a274c16 100644
+--- a/src/Display/SimpleGui.py
++++ b/src/Display/SimpleGui.py
+@@ -161,8 +161,8 @@ def init_display(backend_str: Optional[str]=None,
+             def centerOnScreen(self) -> None:
+                 '''Centers the window on the screen.'''
+                 resolution = QtWidgets.QApplication.desktop().screenGeometry()
+-                x = (resolution.width() - self.frameSize().width()) / 2
+-                y = (resolution.height() - self.frameSize().height()) / 2
++                x = (resolution.width() - self.frameSize().width()) // 2
++                y = (resolution.height() - self.frameSize().height()) // 2
+                 self.move(x, y)
+ 
+             def add_menu(self, menu_name: str) -> None:
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index ce12d2c06656..bee03373a3d1 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
 version=7.4.1
-revision=2
+revision=3
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake

From 41f99e0bb094e6c4079b079d93b704566a60d081 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 12 Jan 2022 01:09:11 +0100
Subject: [PATCH 0192/1427] qjackctl: update to 0.9.6.

---
 srcpkgs/qjackctl/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 838d908cb8d9..4e746124bdd0 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,9 +1,8 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
-version=0.9.5
+version=0.9.6
 revision=1
 build_style=cmake
-make_cmd=make
 configure_args="$(vopt_bool jack_session CONFIG_JACK_SESSION)"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
 makedepends="alsa-lib-devel qt5-devel jack-devel portaudio-devel qt5-tools-devel"
@@ -13,9 +12,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://qjackctl.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3b9b15cafc6b61540596240db216c59338e6e4a1fb9042a0a5bc59dd35efc1bc
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=39ca2b9d83acfdd16a4c9b3eccd80e1483e1f9a446626f5d00ac297e6f8a166b
 
 build_options="jack_session"
 build_options_default="jack_session"

From 03097f8d5507d7d1961c08d4b1f5a6088e7c7541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 12 Jan 2022 16:30:28 +0100
Subject: [PATCH 0193/1427] lazydocker: update to 0.13.

---
 srcpkgs/lazydocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 9b058006b876..caf9198328f6 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,6 +1,6 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
-version=0.12
+version=0.13
 revision=1
 wrksrc="lazydocker-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazydocker"
 distfiles="https://github.com/jesseduffield/lazydocker/archive/v${version}.tar.gz"
-checksum=0509fdfffe78a0155cb54f8bbec1c3f9f3791ea5cbf397fb50fa5278954b2fcb
+checksum=4328ddcb3156ff57c1e21c0d2f9d9d67d48237a386d338f1d68831b6056dfe3e
 
 post_install() {
 	vlicense LICENSE

From caeaec15188dc5f1d346e2b3e2e6b3da2548f5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 12 Jan 2022 23:42:51 -0300
Subject: [PATCH 0194/1427] linux5.10: update i386 config.

---
 srcpkgs/linux5.10/files/i386-dotconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 2ba33eadedb7..39d3c5158f5b 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -229,6 +229,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y

From 5c515b61599c59f6c99d86c0fd1c8e6ad59bfcbc Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lauri@hacktheplanet.fi>
Date: Sun, 26 Dec 2021 15:08:01 +0200
Subject: [PATCH 0195/1427] grafana: update to 8.3.3

switch to using prebuilt js files, dropping the node build requirement.
also fix the baked-in version numbers in the binaries.

Closes: #34705 [via git-merge-pr]
---
 srcpkgs/grafana/template | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index ce65acaf7850..2636bceb76a9 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,17 +1,19 @@
 # Template file for 'grafana'
 pkgname=grafana
-version=7.1.5
-revision=2
+version=8.3.3
+revision=1
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server"
-hostmakedepends="nodejs-lts tar yarn"
+hostmakedepends="tar make"
 short_desc="Open platform for beautiful analytics and monitoring"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://grafana.com"
-distfiles="https://github.com/grafana/grafana/archive/v${version}.tar.gz"
-checksum=7ae69011674a5b6a792e8ec84c93e8be9d50ad2e995cc63f3508d0b2e7acb754
+distfiles="https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz
+https://github.com/grafana/grafana/archive/v${version}.tar.gz"
+checksum="89428c520e004bcb9faf7618dd4c81ff62496064cbf2ead3e1b9dbcf476c6f18
+c79e19f056b9c2fc6d29c622edfaf8aff4985cec28ea6a9e74dce5eac077e735"
 
 system_accounts="_grafana"
 _grafana_homedir="/var/lib/grafana"
@@ -19,17 +21,25 @@ make_dirs="/var/log/grafana 0755 _grafana _grafana"
 
 conf_files="/etc/grafana/grafana.ini"
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="yarn can't be built for i686" ;;
-	ppc*) broken="fails to build v8 in a dependency" ;;
-esac
+go_ldflags="-w -X main.version=${version}"
+
+post_extract() {
+	# remove prebuilt binaries
+	rm bin/*
+}
 
 pre_build() {
-	yarn install --pure-lockfile
+	CGO_ENABLED=0 GOARCH= make gen-go
 }
 
-post_build() {
-	yarn run build
+do_install() {
+	# only install grafana binaries - GOPATH/bin contains eg. wire used at
+	# buildtime, which we don't want in the package
+	for f in ${GOPATH}/bin/grafana-* ${GOPATH}/bin/*/grafana-*; do
+		if [ -f "$f" ] && [ -x "$f" ]; then
+			vbin "$f"
+		fi
+	done
 }
 
 post_install() {

From 8b7c05cef1146a41233c20350be105a3d78caaf3 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 9 Jan 2022 11:05:49 +0100
Subject: [PATCH 0196/1427] scaleway-cli: update to 2.4.0.

---
 srcpkgs/scaleway-cli/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 73af465c6fab..89407918a7a0 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
-version=1.20
+version=2.4.0
 revision=1
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli
@@ -10,15 +10,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/scaleway/scaleway-cli"
 distfiles="https://github.com/scaleway/scaleway-cli/archive/v${version}.tar.gz"
-checksum=4c50725be7bebdab17b8ef77acd230525e773631fef4051979f8ff91c86bebf8
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc*) broken="github.com/creack/goselect/fdset.go:14:14: undefined: NFDBITS"
-esac
+checksum=7baa6d7af5602703bc9b1f54beb5a36642151cc12d6584d6ab76df8bb088365e
 
 post_install() {
-	vinstall contrib/completion/bash/scw.bash 0644 usr/share/bash-completion/completions
-	vinstall contrib/completion/zsh/_scw 0644 usr/share/zsh/site-functions
 	vdoc README.md README
-	vlicense LICENSE.md LICENSE
+	vlicense LICENSE
 }

From fc945bad2da87bbecc25f5ba383da9d1766ff59b Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Thu, 13 Jan 2022 06:16:33 +0100
Subject: [PATCH 0197/1427] vim-colorschemes: update to 20200515.

---
 srcpkgs/vim-colorschemes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vim-colorschemes/template b/srcpkgs/vim-colorschemes/template
index 0e1017f44a90..416ccd2b7c4e 100644
--- a/srcpkgs/vim-colorschemes/template
+++ b/srcpkgs/vim-colorschemes/template
@@ -1,14 +1,14 @@
 # Template file for 'vim-colorschemes'
 pkgname=vim-colorschemes
-version=20170822
-revision=2
-_commit=eab315701f4627967fd62582eefc4e37a3745786
+version=20200515
+revision=1
+_commit=fd8f122cef604330c96a6a6e434682dbdfb878c9
 short_desc="Vim colorschemes"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3"
 homepage="https://github.com/flazz/vim-colorschemes"
 distfiles="https://github.com/flazz/vim-colorschemes/archive/${_commit}.tar.gz"
-checksum=f1d8d0e0415daa180e0822275d6ef4f7f88f70597fe1baca2278a3b3f6a4e700
+checksum=4ca0d70a615cbc6cfd843243f93f2d6bd42558d979cf868ead6b23fbaf8bcdc4
 wrksrc="${pkgname}-${_commit}"
 
 do_install() {

From 409df69a8a6dfc3f8fae6ac2962826f4f6647f95 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 31 Dec 2021 20:18:34 +0100
Subject: [PATCH 0198/1427] sauerbraten: update to 2020.12.29

---
 srcpkgs/sauerbraten/patches/flags.patch | 41 ++++++++-----------------
 srcpkgs/sauerbraten/template            | 12 +++-----
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/sauerbraten/patches/flags.patch b/srcpkgs/sauerbraten/patches/flags.patch
index 6cd7c3c3ba4c..9bba072f423e 100644
--- a/srcpkgs/sauerbraten/patches/flags.patch
+++ b/srcpkgs/sauerbraten/patches/flags.patch
@@ -1,35 +1,20 @@
---- a/src/Makefile	2017-01-12 21:54:08.156276696 -0600
-+++ b/src/Makefile	2017-01-12 21:56:06.889752748 -0600
-@@ -1,4 +1,4 @@
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS= -O3 -fomit-frame-pointer $(CFLAGS)
+--- a/src/Makefile 	2021-12-31 19:09:40.620827928 +0100
++++ b/src/Makefile	2021-12-31 19:11:40.736780250 +0100
+@@ -1,2 +1,2 @@
+-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math
++CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math $(CFLAGS)
  override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
- 
- PLATFORM= $(shell uname -s)
-@@ -137,7 +137,7 @@
- 
- enet/Makefile:
- 	cd enet; ./configure --enable-shared=no --enable-static=yes
--	
-+
- libenet: enet/Makefile
- 	$(MAKE)	-C enet/ all
- 
-@@ -177,13 +177,13 @@
- install: all
- else
+@@ -203,3 +203,3 @@ else
  client:	libenet $(CLIENT_OBJS)
 -	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
- 
+ ifneq (,$(findstring DARWIN,$(PLATFORM)))
+@@ -209,6 +209,6 @@ endif
  server:	libenet $(SERVER_OBJS)
--	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
--	
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
-+
+-	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)
+ 
  master: libenet $(MASTER_OBJS)
--	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
+-	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)
  
- shared/cube2font.o: shared/cube2font.c
- 	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
diff --git a/srcpkgs/sauerbraten/template b/srcpkgs/sauerbraten/template
index 587cc3da5903..5251a99d10b2 100644
--- a/srcpkgs/sauerbraten/template
+++ b/srcpkgs/sauerbraten/template
@@ -1,20 +1,18 @@
 # Template file for 'sauerbraten'
 pkgname=sauerbraten
-version=2013.02.03
-revision=3
+version=2020.12.29
+revision=1
 wrksrc=$pkgname
 build_wrksrc=src
 build_style=gnu-makefile
-makedepends="SDL_image-devel SDL_mixer-devel zlib-devel"
+makedepends="SDL2_image-devel SDL2_mixer-devel zlib-devel"
 depends="${pkgname}-data-${version}_${revision}"
 short_desc="3D game engine (more powerful redesign of the Cube engine) and FPS game"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Zlib"
 homepage="http://sauerbraten.org"
-distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_collect_edition_linux.tar.bz2"
-checksum=45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e
-
-restricted="Very large - not worth storing on current Void infrastructure"
+distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_linux.tar.bz2"
+checksum=cdba7c4a47cefd30d0afdd6a912199a1384319cf1619923cb7189e72e468be70
 
 # Build is only supported on i686 and x86_64, and enet doesn't cross compile
 archs="i686* x86_64*"

From 7e903d800e2ef7fb070f742c0a6315ee15b1020c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 09:39:42 +1100
Subject: [PATCH 0199/1427] cJSON: update to 1.7.15.

---
 srcpkgs/cJSON/patches/fix-memory-leak.patch | 21 +++++++++++++++++++++
 srcpkgs/cJSON/template                      |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch

diff --git a/srcpkgs/cJSON/patches/fix-memory-leak.patch b/srcpkgs/cJSON/patches/fix-memory-leak.patch
new file mode 100644
index 000000000000..01556a6eb8e0
--- /dev/null
+++ b/srcpkgs/cJSON/patches/fix-memory-leak.patch
@@ -0,0 +1,21 @@
+From f50dafc7d0bfd4f45449ab5665bfea831a82f2eb Mon Sep 17 00:00:00 2001
+From: Alan Wang <948467222@qq.com>
+Date: Thu, 26 Aug 2021 14:13:42 +0800
+Subject: [PATCH] fix: potential memory leak in merge_patch() (#611)
+
+---
+ cJSON_Utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cJSON_Utils.c b/cJSON_Utils.c
+index c7c64391..63651dfb 100644
+--- a/cJSON_Utils.c
++++ b/cJSON_Utils.c
+@@ -1367,6 +1367,7 @@ static cJSON *merge_patch(cJSON *target, const cJSON * const patch, const cJSON_
+             replacement = merge_patch(replace_me, patch_child, case_sensitive);
+             if (replacement == NULL)
+             {
++                cJSON_Delete(target);
+                 return NULL;
+             }
+ 
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index e4ad38673e14..a3f6914ca7db 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,6 +1,6 @@
 # Template file for 'cJSON'
 pkgname=cJSON
-version=1.7.14
+version=1.7.15
 revision=1
 build_style=cmake
 short_desc="Ultralightweight JSON parser in ANSI C"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/DaveGamble/cJSON"
 distfiles="https://github.com/DaveGamble/cJSON/archive/v${version}.tar.gz"
-checksum=fb50a663eefdc76bafa80c82bc045af13b1363e8f45cec8b442007aef6a41343
+checksum=5308fd4bd90cef7aa060558514de6a1a4a0819974a26e6ed13973c5f624c24b2
 
 post_install() {
 	vlicense LICENSE

From be6ffde9e1e75bc61211772851fb5fdab5d8c53c Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 13 Jan 2022 18:46:13 +0100
Subject: [PATCH 0200/1427] j4-dmenu-desktop: remove dmenu dependency

Since there is more than one dmenu implementation (e.g. bemenu for
Wayland) it makes no sense to depend on dmenu here.
---
 srcpkgs/j4-dmenu-desktop/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 82e237201afc..3a68ca58f25a 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -1,14 +1,13 @@
 # Template file for 'j4-dmenu-desktop'
 pkgname=j4-dmenu-desktop
 version=2.18
-revision=2
+revision=3
 wrksrc="${pkgname}-r${version}"
 build_style=cmake
 # The current version (2.18) needs to have /usr/share/applications dir
 # for tests, xterm creates and populates it with its .desktop files,
 # which fixes tests in case the dir does not exist.
 # https://github.com/enkore/j4-dmenu-desktop/pull/123
-depends="dmenu"
 checkdepends="catch2 xterm"
 short_desc="Fast desktop menu"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From ff887e301c61b5da5b77a00afa0c0fd46e5855f2 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 12 Jan 2022 20:54:00 +0100
Subject: [PATCH 0201/1427] flatpak: update 1.12.3.

---
 srcpkgs/flatpak/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 87f767dff60f..e41207c5e914 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.12.2
+version=1.12.3
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -23,7 +23,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/master/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=df1eb464f9142c11627f99f04f6a5c02c868bbb145489b8902cb6c105e774b75
+checksum=d715f23347d7eb859301c8f0c778a899bb7c9e26dac6ae2a2a4b9fc21cf77b69
 
 build_options="gir"
 build_options_default="gir"

From ab3c05ba53543dc6ea9e03a27db852f744d7de6e Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 9 Jan 2022 21:49:34 +0100
Subject: [PATCH 0202/1427] Carla: fix plugin execution with python 3.10.

Adds a patch that fixes unexpected type errors when executing plugins.
Patch is already upstream.
---
 .../patches/unexpected_type_errors.patch      | 161 ++++++++++++++++++
 srcpkgs/Carla/template                        |   2 +-
 2 files changed, 162 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/Carla/patches/unexpected_type_errors.patch

diff --git a/srcpkgs/Carla/patches/unexpected_type_errors.patch b/srcpkgs/Carla/patches/unexpected_type_errors.patch
new file mode 100644
index 000000000000..edef00e53e53
--- /dev/null
+++ b/srcpkgs/Carla/patches/unexpected_type_errors.patch
@@ -0,0 +1,161 @@
+From 91720f6ddcfd00ebf9f0a6613099f53922426726 Mon Sep 17 00:00:00 2001
+From: Oliver Sahr <oli.sahr@gmail.com>
+Date: Tue, 14 Dec 2021 20:29:56 +0100
+Subject: [PATCH] Fixed unexpected type errors
+
+---
+ source/frontend/widgets/digitalpeakmeter.py | 46 ++++++++++-----------
+ source/frontend/widgets/scalabledial.py     |  8 ++--
+ 2 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/source/frontend/widgets/digitalpeakmeter.py b/source/frontend/widgets/digitalpeakmeter.py
+index b5e27c4f91..4343739e8f 100644
+--- a/source/frontend/widgets/digitalpeakmeter.py
++++ b/source/frontend/widgets/digitalpeakmeter.py
+@@ -21,7 +21,7 @@
+ 
+ from math import sqrt
+ 
+-from PyQt5.QtCore import qCritical, Qt, QTimer, QSize
++from PyQt5.QtCore import qCritical, Qt, QTimer, QSize, QLineF, QRectF
+ from PyQt5.QtGui import QColor, QLinearGradient, QPainter, QPen, QPixmap
+ from PyQt5.QtWidgets import QWidget
+ 
+@@ -362,9 +362,9 @@ def paintEvent(self, event):
+             if level == 0.0:
+                 pass
+             elif self.fMeterOrientation == self.HORIZONTAL:
+-                painter.drawRect(0, meterPos, int(sqrt(level) * float(width)), meterSize)
++                painter.drawRect(QRectF(0, meterPos, sqrt(level) * float(width), meterSize))
+             elif self.fMeterOrientation == self.VERTICAL:
+-                painter.drawRect(meterPos, height - int(sqrt(level) * float(height)), meterSize, height)
++                painter.drawRect(QRectF(meterPos, height - sqrt(level) * float(height), meterSize, height))
+ 
+             meterPos += meterSize+meterPad
+ 
+@@ -379,32 +379,32 @@ def paintEvent(self, event):
+ 
+             if self.fMeterStyle == self.STYLE_OPENAV:
+                 painter.setPen(QColor(37, 37, 37, 100))
+-                painter.drawLine(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0)
+-                painter.drawLine(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0)
+-                painter.drawLine(lsmall * 0.75, 2, lsmall * 0.75, lfull-2.0)
++                painter.drawLine(QLineF(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0))
++                painter.drawLine(QLineF(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0))
++                painter.drawLine(QLineF(lsmall * 0.75, 2, lsmall * 0.75, lfull-2.0))
+ 
+                 if self.fChannelCount > 1:
+-                    painter.drawLine(1, lfull/2-1, lsmall-1, lfull/2-1)
++                    painter.drawLine(QLineF(1, lfull/2-1, lsmall-1, lfull/2-1))
+ 
+             else:
+                 # Base
+                 painter.setBrush(Qt.black)
+                 painter.setPen(QPen(self.fMeterColorBaseAlt, 1))
+-                painter.drawLine(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0)
+-                painter.drawLine(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0)
++                painter.drawLine(QLineF(lsmall * 0.25, 2, lsmall * 0.25, lfull-2.0))
++                painter.drawLine(QLineF(lsmall * 0.50, 2, lsmall * 0.50, lfull-2.0))
+ 
+                 # Yellow
+                 painter.setPen(QColor(110, 110, 15, 100))
+-                painter.drawLine(lsmall * 0.70, 2, lsmall * 0.70, lfull-2.0)
+-                painter.drawLine(lsmall * 0.83, 2, lsmall * 0.83, lfull-2.0)
++                painter.drawLine(QLineF(lsmall * 0.70, 2, lsmall * 0.70, lfull-2.0))
++                painter.drawLine(QLineF(lsmall * 0.83, 2, lsmall * 0.83, lfull-2.0))
+ 
+                 # Orange
+                 painter.setPen(QColor(180, 110, 15, 100))
+-                painter.drawLine(lsmall * 0.90, 2, lsmall * 0.90, lfull-2.0)
++                painter.drawLine(QLineF(lsmall * 0.90, 2, lsmall * 0.90, lfull-2.0))
+ 
+                 # Red
+                 painter.setPen(QColor(110, 15, 15, 100))
+-                painter.drawLine(lsmall * 0.96, 2, lsmall * 0.96, lfull-2.0)
++                painter.drawLine(QLineF(lsmall * 0.96, 2, lsmall * 0.96, lfull-2.0))
+ 
+         elif self.fMeterOrientation == self.VERTICAL:
+             # Variables
+@@ -413,32 +413,32 @@ def paintEvent(self, event):
+ 
+             if self.fMeterStyle == self.STYLE_OPENAV:
+                 painter.setPen(QColor(37, 37, 37, 100))
+-                painter.drawLine(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25))
+-                painter.drawLine(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50))
+-                painter.drawLine(2, lsmall - (lsmall * 0.75), lfull-2.0, lsmall - (lsmall * 0.75))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25)))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50)))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.75), lfull-2.0, lsmall - (lsmall * 0.75)))
+ 
+                 if self.fChannelCount > 1:
+-                    painter.drawLine(lfull/2-1, 1, lfull/2-1, lsmall-1)
++                    painter.drawLine(QLineF(lfull/2-1, 1, lfull/2-1, lsmall-1))
+ 
+             else:
+                 # Base
+                 painter.setBrush(Qt.black)
+                 painter.setPen(QPen(self.fMeterColorBaseAlt, 1))
+-                painter.drawLine(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25))
+-                painter.drawLine(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.25), lfull-2.0, lsmall - (lsmall * 0.25)))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.50), lfull-2.0, lsmall - (lsmall * 0.50)))
+ 
+                 # Yellow
+                 painter.setPen(QColor(110, 110, 15, 100))
+-                painter.drawLine(2, lsmall - (lsmall * 0.70), lfull-2.0, lsmall - (lsmall * 0.70))
+-                painter.drawLine(2, lsmall - (lsmall * 0.82), lfull-2.0, lsmall - (lsmall * 0.82))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.70), lfull-2.0, lsmall - (lsmall * 0.70)))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.82), lfull-2.0, lsmall - (lsmall * 0.82)))
+ 
+                 # Orange
+                 painter.setPen(QColor(180, 110, 15, 100))
+-                painter.drawLine(2, lsmall - (lsmall * 0.90), lfull-2.0, lsmall - (lsmall * 0.90))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.90), lfull-2.0, lsmall - (lsmall * 0.90)))
+ 
+                 # Red
+                 painter.setPen(QColor(110, 15, 15, 100))
+-                painter.drawLine(2, lsmall - (lsmall * 0.96), lfull-2.0, lsmall - (lsmall * 0.96))
++                painter.drawLine(QLineF(2, lsmall - (lsmall * 0.96), lfull-2.0, lsmall - (lsmall * 0.96)))
+ 
+     # --------------------------------------------------------------------------------------------------------
+ 
+diff --git a/source/frontend/widgets/scalabledial.py b/source/frontend/widgets/scalabledial.py
+index 65a2f3c7fc..e06f5031cf 100644
+--- a/source/frontend/widgets/scalabledial.py
++++ b/source/frontend/widgets/scalabledial.py
+@@ -250,7 +250,7 @@ def setImage(self, imageId):
+     def setPrecision(self, value, isInteger):
+         self.fPrecision = value
+         self.fIsInteger = isInteger
+-        QDial.setMaximum(self, value)
++        QDial.setMaximum(self, int(value))
+ 
+     def setMinimum(self, value):
+         self.fMinimum = value
+@@ -437,7 +437,7 @@ def paintEvent(self, event):
+                     painter.setBrush(colorBlue)
+                     painter.setPen(QPen(colorBlue, 3))
+ 
+-                painter.drawArc(4.0, 4.0, 26.0, 26.0, startAngle, spanAngle)
++                painter.drawArc(QRectF(4.0, 4.0, 26.0, 26.0), int(startAngle), int(spanAngle))
+ 
+             # Custom knobs (L and R)
+             elif self.fCustomPaintMode in (self.CUSTOM_PAINT_MODE_CARLA_L, self.CUSTOM_PAINT_MODE_CARLA_R):
+@@ -466,7 +466,7 @@ def paintEvent(self, event):
+                     spanAngle  = 255.0*16*(1.0-normValue)
+ 
+                 painter.setPen(QPen(color, 2.5))
+-                painter.drawArc(3.5, 3.5, 22.0, 22.0, startAngle, spanAngle)
++                painter.drawArc(QRectF(3.5, 3.5, 22.0, 22.0), int(startAngle), int(spanAngle))
+ 
+             # Custom knobs (Color)
+             elif self.fCustomPaintMode == self.CUSTOM_PAINT_MODE_COLOR:
+@@ -491,7 +491,7 @@ def paintEvent(self, event):
+ 
+                 painter.setBrush(color)
+                 painter.setPen(QPen(color, 3))
+-                painter.drawArc(4.0, 4.8, 26.0, 26.0, startAngle, spanAngle)
++                painter.drawArc(QRectF(4.0, 4.8, 26.0, 26.0), int(startAngle), int(spanAngle))
+ 
+             # Custom knobs (Zita)
+             elif self.fCustomPaintMode == self.CUSTOM_PAINT_MODE_ZITA:
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 1562e0fb20e4..e7874be75494 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.4.1
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From 8a82d19331727d595f1e693935a736b7acd80dfe Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Tue, 11 Jan 2022 21:23:21 +0100
Subject: [PATCH 0203/1427] mda-lv2: update to 1.2.6, adopt

---
 srcpkgs/mda-lv2/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mda-lv2/template b/srcpkgs/mda-lv2/template
index c7e5c79415ea..c82cf1694c5e 100644
--- a/srcpkgs/mda-lv2/template
+++ b/srcpkgs/mda-lv2/template
@@ -1,14 +1,14 @@
 # Template file for 'mda-lv2'
 pkgname=mda-lv2
-version=1.2.4
+version=1.2.6
 revision=1
 build_style=waf3
 hostmakedepends="pkg-config"
 makedepends="lv2"
 depends="lv2"
 short_desc="LV2 port of the MDA plugins by Paul Kellett"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-only"
-homepage="http://drobilla.net/software/mda-lv2/"
+homepage="https://drobilla.net/software/mda-lv2.html"
 distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
-checksum=a81a00e19594881174526cd6ee7a3e301236e0ca25191982f5c9af5eb8d96ca8
+checksum=cd66117024ae049cf3aca83f9e904a70277224e23a969f72a9c5d010a49857db

From 7114f7a5571620bca8d9b1455b5ed1329f8ed1c1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 13 Jan 2022 20:31:02 +0200
Subject: [PATCH 0204/1427] FeatherPad: update to 1.1.1.

---
 srcpkgs/FeatherPad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index df1e466377a3..17c9bfbe5018 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 changelog="https://github.com/tsujan/FeatherPad/raw/master/ChangeLog"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=82bd94996f0d7be23be1b150a22d88b9c0b19c9852d5c2c7388e61ea9e05be03
+checksum=8f2943224f04a1ee4b30b5b7f5b60f34d10d6fe9000e786e1b3a38369d293f8f

From c4c8fbcef8d0ea98ad53d722b0c95561f5134668 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Thu, 13 Jan 2022 14:45:31 +0100
Subject: [PATCH 0205/1427] bitcoin: update to 22.0.

---
 srcpkgs/bitcoin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ed8800a1471a..ccc9c4cc5f10 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,6 +1,6 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.21.0
+version=22.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
@@ -9,13 +9,13 @@ hostmakedepends="automake libtool pkg-config yasm"
 makedepends="db-devel boost-devel miniupnpc-devel qt5-tools-devel
  libevent-devel qrencode-devel libatomic-devel sqlite-devel"
 short_desc="Bitcoin is a peer-to-peer network based digital currency"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"
 homepage="https://bitcoin.org/"
 distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
- https://raw.githubusercontent.com/bitcoin-core/packaging/${version%.*}/debian/bitcoin-qt.desktop
+ https://raw.githubusercontent.com/bitcoin-core/packaging/${version%.*}.x/debian/bitcoin-qt.desktop
  https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
-checksum="1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37
+checksum="d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b
  0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
  ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
 conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0

From 6c7edaa18e03c4ccc059b1f462aa6e32a5933ad0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 16 May 2021 03:17:07 +1100
Subject: [PATCH 0206/1427] parted: update to 3.4.

---
 .../parted/patches/disable-failed-tests.patch | 20 +++++++++++++++++++
 srcpkgs/parted/template                       |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/parted/patches/disable-failed-tests.patch

diff --git a/srcpkgs/parted/patches/disable-failed-tests.patch b/srcpkgs/parted/patches/disable-failed-tests.patch
new file mode 100644
index 000000000000..62255499260e
--- /dev/null
+++ b/srcpkgs/parted/patches/disable-failed-tests.patch
@@ -0,0 +1,20 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -72,7 +72,5 @@
+   t6000-dm.sh \
+   t6001-psep.sh \
+-  t6002-dm-busy.sh \
+-  t6003-dm-hide.sh \
+   t6004-dm-many-partitions.sh \
+   t6005-dm-uuid.sh \
+   t6006-dm-512b-sectors.sh \
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -1741,7 +1741,5 @@
+   t6000-dm.sh \
+   t6001-psep.sh \
+-  t6002-dm-busy.sh \
+-  t6003-dm-hide.sh \
+   t6004-dm-many-partitions.sh \
+   t6005-dm-uuid.sh \
+   t6006-dm-512b-sectors.sh \
diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index c8946b570cae..f808182b0475 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -1,18 +1,19 @@
 # Template file for 'parted'
 pkgname=parted
-version=3.3
+version=3.4
 revision=1
 build_style=gnu-configure
 # parted wants off_t as 64bit type
 configure_args="ac_cv_sizeof_off_t=8"
 hostmakedepends="pkg-config"
 makedepends="libuuid-devel libblkid-devel ncurses-devel readline-devel device-mapper-devel"
+checkdepends="e2fsprogs perl python3"
 short_desc="GNU Parted disk partition resizing program"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/parted/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44
+checksum=e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342
 
 libparted_package() {
 	short_desc+=" - shared library"

From a25c7438538626f36c7a839b57172903d5a60aa5 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 14:12:55 +1100
Subject: [PATCH 0207/1427] Manual.md: fix typo

---
 Manual.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index 3e641633ba6a..da72bd97128d 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1913,7 +1913,7 @@ Although `xbps-src` will automatically include the `dkms` trigger whenever
 before the modules are compiled.
 
 By default, the trigger uses `dracut --regenerate-all` to recreate initramfs
-images. If `/etc/defalt/initramfs-regenerate` exists and defines
+images. If `/etc/default/initramfs-regenerate` exists and defines
 `INITRAMFS_GENERATOR=mkinitcpio`, the trigger will instead use `mkinitcpio` and
 loop over all kernel versions for which modules appear to be installed.
 Alternatively, setting `INITRAMFS_GENERATOR=none` will disable image

From 75acfd61861f66b789320a4e140f7f10da9da84c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 13 Jan 2022 12:35:57 -0700
Subject: [PATCH 0208/1427] python3-rich: update to 11.0.0.

---
 srcpkgs/python3-rich/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 8d0b5c077afa..ff8fdf88b698 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.16.2
+version=11.0.0
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/willmcgugan/rich"
 distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=720974689960e06c2efdb54327f8bf0cdbdf4eae4ad73b6c94213cad405c371b
+checksum=c32a8340b21c75931f157466fefe81ae10b92c36a5ea34524dff3767238774a4
 
 post_install() {
 	vlicense LICENSE

From 5377a1052cb059c3866bdfa99c5c830f6c89b780 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 13 Jan 2022 12:46:29 -0700
Subject: [PATCH 0209/1427] python3-rfc3986: update to 2.0.0.

---
 srcpkgs/python3-rfc3986/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rfc3986/template b/srcpkgs/python3-rfc3986/template
index 6cc9e83b83e8..c816120af905 100644
--- a/srcpkgs/python3-rfc3986/template
+++ b/srcpkgs/python3-rfc3986/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rfc3986'
 pkgname=python3-rfc3986
-version=1.5.0
+version=2.0.0
 revision=1
 wrksrc="rfc3986-$version"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://rfc3986.readthedocs.io/"
 distfiles="https://github.com/python-hyper/rfc3986/archive/refs/tags/$version.tar.gz"
-checksum=120c235975198b3e23458ca7ff5b8628f609190c0b067fb6059b448fe1345f1b
+checksum=013d6e63898c4bcb96a2ebea75e9c511ec71c83d58c88721e532a7d2528ca638

From 3db9abb0d37b7a4a8818d1f987b46cd217a8fb93 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 13 Jan 2022 00:33:31 +0100
Subject: [PATCH 0210/1427] New package: xfce4-docklike-plugin-0.4.0

Closes: #35022 [via git-merge-pr]
---
 ...ame-called-but-libgen.h-not-included.patch | 56 +++++++++++++++++++
 srcpkgs/xfce4-docklike-plugin/template        | 14 +++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/xfce4-docklike-plugin/patches/0001-basename-called-but-libgen.h-not-included.patch
 create mode 100644 srcpkgs/xfce4-docklike-plugin/template

diff --git a/srcpkgs/xfce4-docklike-plugin/patches/0001-basename-called-but-libgen.h-not-included.patch b/srcpkgs/xfce4-docklike-plugin/patches/0001-basename-called-but-libgen.h-not-included.patch
new file mode 100644
index 000000000000..81624f468ad5
--- /dev/null
+++ b/srcpkgs/xfce4-docklike-plugin/patches/0001-basename-called-but-libgen.h-not-included.patch
@@ -0,0 +1,56 @@
+From 1af295dba41c2a5a6a91b83ce4eebc0cf6225598 Mon Sep 17 00:00:00 2001
+From: Hakan Erduman <hakan@erduman.de>
+Date: Fri, 7 Jan 2022 18:22:43 +0100
+Subject: [PATCH] basename() called but <libgen.h> not included
+
+	Seen while porting to alpine linux.
+	This compiles on GNU libc since it is not posixly strict
+	enough in regard to header files but fails on e.g. musl
+	or other c libraries.
+
+	The patch adresses this by using g_path_get_basename from
+	glib instead. This may also help compilation on the *BSDs.
+	and void linux, musl variety.
+---
+ src/Helpers.cpp | 2 +-
+ src/Wnck.cpp    | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Helpers.cpp b/src/Helpers.cpp
+index ece3e95..086dff3 100644
+--- a/src/Helpers.cpp
++++ b/src/Helpers.cpp
+@@ -83,7 +83,7 @@ namespace Help
+ 		{
+ 			char buffer[1024];
+ 			strcpy(buffer, str.c_str());
+-			return basename(buffer);
++			return g_path_get_basename(buffer);
+ 		}
+ 
+ 		std::string trim(const std::string str)
+diff --git a/src/Wnck.cpp b/src/Wnck.cpp
+index 2ab598f..1c08335 100644
+--- a/src/Wnck.cpp
++++ b/src/Wnck.cpp
+@@ -35,7 +35,7 @@ namespace Wnck
+ 				int nbr = read(fd, buffer, 512);
+ 				::close(fd);
+ 
+-				char* exe = basename(buffer);
++				char* exe = g_path_get_basename(buffer);
+ 				if (strcmp(exe, "python") != 0) // ADDIT graphical interpreters here
+ 					return exe;
+ 
+@@ -44,7 +44,7 @@ namespace Wnck
+ 					;
+ 
+ 				if (it < buffer + nbr)
+-					return basename(it);
++					return g_path_get_basename(it);
+ 			}
+ 
+ 			// fallback : return window's name
+-- 
+2.34.1
+
diff --git a/srcpkgs/xfce4-docklike-plugin/template b/srcpkgs/xfce4-docklike-plugin/template
new file mode 100644
index 000000000000..ab9f49f303c1
--- /dev/null
+++ b/srcpkgs/xfce4-docklike-plugin/template
@@ -0,0 +1,14 @@
+# Template file for 'xfce4-docklike-plugin'
+pkgname=xfce4-docklike-plugin
+version=0.4.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="xfce4-panel-devel libwnck-devel"
+short_desc="Modern, minimalist taskbar for Xfce"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-3.0-or-later"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-docklike-plugin/start"
+distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+checksum=b4136a70897895f0599e8e7237223dde17221f099a2fc816917d5894bbd4f372

From 067fa3e5a1d11538d95817c2090c2dbe70a8682d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 13 Jan 2022 21:28:58 +0100
Subject: [PATCH 0211/1427] kcm-wacomtablet: add update file

---
 srcpkgs/kcm-wacomtablet/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/kcm-wacomtablet/update

diff --git a/srcpkgs/kcm-wacomtablet/update b/srcpkgs/kcm-wacomtablet/update
new file mode 100644
index 000000000000..d89b0d3bb18a
--- /dev/null
+++ b/srcpkgs/kcm-wacomtablet/update
@@ -0,0 +1 @@
+pkgname=wacomtablet

From 1d6ecccad0605a21776803c9a95d1e77d64305f8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 13 Jan 2022 15:09:11 +0100
Subject: [PATCH 0212/1427] netpbm: update to 10.97.02.

---
 srcpkgs/netpbm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 4ba99f010ede..0ed8c8a5781a 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,9 +1,9 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.97.00
+version=10.97.02
 revision=1
-_githash=6e629f983aa205c3eaa5f339f1c71bb5e7938049
+_githash=7363c9a203f82c172be2a06356eb8a2bdf0833a4
 _githash_guide=1feb4eb4d9783d530653f6e6ac8bc4264732501d
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
@@ -16,7 +16,7 @@ license="BSD-3-Clause,GPL-2.0-only,custom:netpbm"
 homepage="http://netpbm.sourceforge.net/"
 distfiles="https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
  https://github.com/leahneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
-checksum="bc599598fa65e17518475975de2cffe500d7f2c664a99a390df00de7553f6e84
+checksum="1bb79544e77a9b80ad7a1a83cc5eceace267748f6098c985997bc9d0c2c07f06
  e90ddc2133cb2705190c26ba648939b3756082e69558862ff9d7ae72d485015a"
 
 post_extract() {

From 91f35357a4c961768e25a758f3c98a0441fd247b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 13 Jan 2022 21:50:46 +0100
Subject: [PATCH 0213/1427] ugrep: update to 3.6.0.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index f51a42348c98..57e49ba1ca74 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.5.0
+version=3.6.0
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=9f8469e111ee665f6f03e3a8c0e4b06e632ce3fcb90e955b8979696973cfa0db
+checksum=8bed6f204161a81d090cfeb9d5fc6f6ec7ef4703b2ae06d4355c65a5f18a0f84
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 515dab380c04f98c2a0f14423867732ac5707f49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 13 Jan 2022 22:37:07 +0100
Subject: [PATCH 0214/1427] nodejs: update to 16.13.2.

---
 srcpkgs/nodejs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 4055f65beb58..e9c439903553 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs'
 pkgname=nodejs
-version=16.9.1
+version=16.13.2
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=2cfab037d84550556999af6328e9b657842d9b183e6be2a4995c87d2c49e9d03
+checksum=cd5a07cae25985704a5b1878355b2793d62d70fc97b8a181ad2bf86201121b08
 python_version=3
 
 build_options="ssl libuv icu nghttp2 cares"

From 4ec3d44b55676170a5292e4f8e42af2fbbbd6476 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 13 Jan 2022 22:40:47 +0100
Subject: [PATCH 0215/1427] nodejs-lts: update to 12.22.9.

---
 srcpkgs/nodejs-lts/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 915d53cf851d..d5120219cca4 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,6 +1,6 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
-version=12.22.4
+version=12.22.9
 revision=1
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
+checksum=592ecc53ed8a64dd1a2eb574b4c85d30656e4aee3a02ef997fa8ad92bf025d6a
 python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
@@ -46,6 +46,11 @@ esac
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
+post_patch() {
+	# XXX Drop after c-ares 1.17.3 has been released.
+	vsed -i -e 's:<ares_nameser.h>:<arpa/nameser.h>:g' src/cares_wrap.cc
+}
+
 do_configure() {
 	local _args
 

From cd544df2c91d9f65ccb6cdd3493a26459e1e03a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 13 Jan 2022 23:01:38 +0100
Subject: [PATCH 0216/1427] openssh: disable KbdInteractiveAuthentication.

The name of this flag changed in OpenSSH 8.7.
---
 srcpkgs/openssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 5b1f4606637c..b8dea41ec5a5 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.8p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -66,7 +66,7 @@ post_install() {
 	# configure to use PAM
 	vsed -i ${DESTDIR}/etc/ssh/sshd_config \
 		-e 's|^#\(UsePAM\) no|\1 yes|g' \
-		-e 's|^#\(ChallengeResponseAuthentication\) yes|\1 no|g' \
+		-e 's|^#\(KbdInteractiveAuthentication\) yes|\1 no|g' \
 		-e 's|^#\(PrintMotd\) yes|\1 no|g'
 
 	vinstall ${FILESDIR}/sshd.pam 644 etc/pam.d sshd

From d7818a7851554ba0cfb038e2d7d215b632dc13d7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 14 Jan 2022 00:49:03 +0100
Subject: [PATCH 0217/1427] imlib2: fix build on big endian

---
 srcpkgs/imlib2/patches/big-endian.patch | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/imlib2/patches/big-endian.patch

diff --git a/srcpkgs/imlib2/patches/big-endian.patch b/srcpkgs/imlib2/patches/big-endian.patch
new file mode 100644
index 000000000000..54fb7f8f1001
--- /dev/null
+++ b/srcpkgs/imlib2/patches/big-endian.patch
@@ -0,0 +1,37 @@
+From 7d60151ba9696ef07be79af68d5c631a97c63906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 10:56:03 +0100
+Subject: ICO loader: Fix compilation on big endian architectures
+
+Commit ff79901a071a76ec73cc98c7ff15102c514afb7b refactors the
+ico_read_idir function and removed the local nr variable. Unfortunately,
+this variable is still used within an `#ifdef WORDS_BIGENDIAN` block on
+big endian architectures as a for loop index variable. As such, the code
+does presently not compile since the aforementioned commit. This patch
+fixes this issue by re-introducing the variable conditionally on big
+endian architectures.
+
+Note: It would likely be cleaner to declare the nr variable as part of
+the loop declaration, however, this C99 feature does not seem to be used
+anywhere in the code base, hence I refrained from using it here.
+---
+ src/modules/loaders/loader_ico.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c
+index e8cef41..66c3643 100644
+--- a/src/modules/loaders/loader_ico.c
++++ b/src/modules/loaders/loader_ico.c
+@@ -139,6 +139,9 @@ ico_read_icon(ico_t * ico, int ino)
+ {
+    ie_t               *ie;
+    unsigned int        size;
++#ifdef WORDS_BIGENDIAN
++   unsigned int        nr;
++#endif
+ 
+    ie = &ico->ie[ino];
+ 
+-- 
+cgit v1.2.3
+

From 1f68ddd36e8602aefff9c30747d2a3d78492db1b 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, 13 Jan 2022 21:20:53 +0700
Subject: [PATCH 0218/1427] ca-certificates: update to 20211016+3.74.

---
 srcpkgs/ca-certificates/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 30b2c68d95db..450772d160e2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20211016+3.72
+version=20211016+3.74
 revision=1
 _nss_version=${version#*+}
 bootstrap=yes
@@ -16,7 +16,7 @@ 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
- 6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e"
+ 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056"
 
 post_extract() {
 	cp ${FILESDIR}/* $build_wrksrc/mozilla

From ef81c4b18b3e0b32d5aa79c59e5b65a62a5f5585 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, 12 Jan 2022 19:25:09 +0700
Subject: [PATCH 0219/1427] nss: update to 3.74.

Tests failed because PayPalEE.cert expires at Jan 12 12:00:00 2022 GMT
---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index ed239be21deb..88e7afa2087e 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.73.1
+version=3.74
 revision=1
 hostmakedepends="perl"
 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=c768f9fe3129e8bcc2e9679456d7edd9453a225784a8fc7dc4501806f1fe9abe
+checksum=88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 914e0fb9d447ece3be109ad0e30a9a0d24ed42ac Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Sun, 2 Jan 2022 23:40:29 +0100
Subject: [PATCH 0220/1427] xfce4-panel: enable StatusNotifier support.

The Status Tray plugin then works properly for applications using the
StatusNotifier API. Context:
- https://github.com/J-Lentz/iwgtk/issues/21
- https://forum.xfce.org/viewtopic.php?pid=65399#p65399
---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index a02e9bc24830..210113d3d67d 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.3
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
  --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
-makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
+makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel
+ libdbusmenu-gtk3-devel"
 short_desc="Next generation panel for the XFCE desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From c6fea73256cfbf638b0d4b94d2eb7a81a2448ff0 Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Wed, 15 Dec 2021 10:47:29 +0100
Subject: [PATCH 0221/1427] vscode: update to 1.63.2.

---
 srcpkgs/vscode/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 20b84996bf27..97f1a142a814 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.63.0
+version=1.63.2
 revision=1
 _electronver=13.6.1
 hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=e71637baa6e3ccba876e6d465bda517f40aef2548f8941f69f38891bd0f983f3
+checksum=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -33,7 +33,7 @@ do_configure() {
 	grep -rl --exclude-dir=.git -E $_TELEMETRY_URLS | xargs sed -i -E $_REPLACEMENT
 
 	# set used electron version
-	sed -i "s/^target .*/target \"${_electronver}\"/" .yarnrc
+	vsed -e "s/^target .*/target \"${_electronver}\"/" -i .yarnrc
 }
 
 do_build() {

From 23d040c262c6c4620d6fda7b384bc31115a5c2c1 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Mon, 3 Jan 2022 19:42:48 +0100
Subject: [PATCH 0222/1427] canto-next: update to 0.9.8.

---
 srcpkgs/canto-next/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index 36eaab9d43c3..9f3373c67b38 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,7 +1,7 @@
 # Template file for 'canto-next'
 pkgname=canto-next
-version=0.9.7
-revision=6
+version=0.9.8
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
-checksum=222d0382c145f81010653fbe1006f61455ed0aeb6c3940145524e633e3567ad5
+checksum=647a6bc23423fcf465080f1c7e3c227c323c401447bd422ff01c1416c7e826ad
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 7684650e9c3d5cdc410c39f4f9215822843c6d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 14 Jan 2022 11:01:41 +0100
Subject: [PATCH 0223/1427] doomretro: update to 4.4.2.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index d8968e24e67f..e33db85c7245 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.1
+version=4.4.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=2778a21c45804875d69460f2695b4e48687f3b38b1e6c7ff0c62114a51f1d5c3
+checksum=0c4ed1a51c5896d36f913f93acd334c495eb13129cfe94a8625e268c3a8e180b

From e88bf4adffa297debb8f8565bcb9ec878f2a1861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 14 Jan 2022 10:34:23 +0100
Subject: [PATCH 0224/1427] exiftool: update to 12.39.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 7684ecb09eef..7612f535d35b 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.38
+version=12.39
 revision=1
 wrksrc="Image-ExifTool-${version}"
 build_style=perl-module
@@ -10,4 +10,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=dcbb9ac3b913636ff95542022fcf036e8e92c0cc2e518f9b06d21b44bb5ecddf
+checksum=403ab5293a44725f045a3f5afdbc45d13c20854ba51f7d0ee720d5d30b31cba2

From 2bb798ce08e2413a9a54c5387ee2077fd3b3103b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 16:18:04 -0300
Subject: [PATCH 0225/1427] New package: gap-4.11.1

---
 common/shlibs        |  1 +
 srcpkgs/gap-devel    |  1 +
 srcpkgs/gap/template | 47 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template

diff --git a/common/shlibs b/common/shlibs
index ebbd48a3d84c..c4b2c348f6f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4021,6 +4021,7 @@ libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libplanarity.so.0 planarity-3.0.1.1_1
+libgap.so.0 gap-4.11.1_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
diff --git a/srcpkgs/gap-devel b/srcpkgs/gap-devel
new file mode 120000
index 000000000000..e195f60d0b1a
--- /dev/null
+++ b/srcpkgs/gap-devel
@@ -0,0 +1 @@
+gap
\ No newline at end of file
diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
new file mode 100644
index 000000000000..7bc7d13ace20
--- /dev/null
+++ b/srcpkgs/gap/template
@@ -0,0 +1,47 @@
+# Template file for 'gap'
+pkgname=gap
+version=4.11.1
+revision=1
+build_style=gnu-configure
+make_install_target="install-bin install-gaproot install-headers install-libgap"
+makedepends="gmp-devel zlib-devel readline-devel"
+checkdepends="perl"
+short_desc="Groups, Algorithms, Programming - computational discrete algebra"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="http://www.gap-system.org/"
+distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
+checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	# not sure about this -- takes about 25 minutes
+	make_check_target=teststandard
+fi
+
+_GAPROOT=/usr/share/gap/
+
+# minimal required packages
+_GAPPKGS="GAPDoc primgrp SmallGrp transgrp"
+
+# other expected packages
+_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna
+ polenta polycyclic resclasses sophus tomlib"
+
+post_install() {
+	vmkdir ${_GAPROOT}/pkg
+	for p in ${_GAPPKGS}; do
+		[ -d pkg/$p ] || p="$p-*"
+		vcopy "pkg/$p" ${_GAPROOT}/pkg
+	done
+	# not handled by make install-headers
+	vcopy gen/config.h /usr/include/gap
+}
+
+gap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1b717d7fc904272ddf70d8056f82af45665e707d Mon Sep 17 00:00:00 2001
From: Cullen Ross <cullenrss@gmail.com>
Date: Fri, 14 Jan 2022 08:12:31 -0500
Subject: [PATCH 0226/1427] New package: python3-tasklib-2.4.3

---
 srcpkgs/python3-tasklib/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-tasklib/template

diff --git a/srcpkgs/python3-tasklib/template b/srcpkgs/python3-tasklib/template
new file mode 100644
index 000000000000..3787fdc764af
--- /dev/null
+++ b/srcpkgs/python3-tasklib/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-tasklib'
+pkgname=python3-tasklib
+version=2.4.3
+revision=1
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="task python3-tzlocal python3-pytz"
+checkdepends="$depends"
+short_desc="Library for interacting with taskwarrior databases (Python3)"
+maintainer="Cullen Ross <cullenrss@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/GothenburgBitFactory/tasklib"
+distfiles="${PYPI_SITE}/t/tasklib/tasklib-${version}.tar.gz"
+checksum=b523bc12893d26c8173a6b8d84b16259c9a9c5acaaf8932bc018117f907b3bc5
+
+post_install() {
+	vlicense LICENSE
+}

From 855e9fb155e5a13a0ce3e195a5b9e0f90ad9164b Mon Sep 17 00:00:00 2001
From: Cullen Ross <cullenrss@gmail.com>
Date: Fri, 14 Jan 2022 08:13:04 -0500
Subject: [PATCH 0227/1427] New package: vit-2.1.0

---
 srcpkgs/vit/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/vit/template

diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template
new file mode 100644
index 000000000000..173648d69b95
--- /dev/null
+++ b/srcpkgs/vit/template
@@ -0,0 +1,22 @@
+# Template file for 'vit'
+pkgname=vit
+version=2.1.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="task python3-pytz python3-urwid python3-tzlocal python3-tasklib"
+checkdepends="python3-pytest $depends"
+short_desc="Visual Interactive Taskwarrior full-screen terminal interface"
+maintainer="Cullen Ross <cullenrss@gmail.com>"
+license="MIT"
+homepage="https://github.com/vit-project/vit"
+distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz"
+checksum=fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f
+
+do_check() {
+	TERM=linux python3 -m pytest
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 307786256488cc1ffa31000732449224fa5c33d2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 12 Jan 2022 16:33:19 +0100
Subject: [PATCH 0228/1427] singular: update to 4.3.0

---
 common/shlibs                                 | 10 ++---
 .../patches/upstream_omalloc_new_musl.patch   | 40 -------------------
 .../patches/upstream_polys_test_musl.patch    | 22 ----------
 srcpkgs/singular/template                     |  6 +--
 4 files changed, 8 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
 delete mode 100644 srcpkgs/singular/patches/upstream_polys_test_musl.patch

diff --git a/common/shlibs b/common/shlibs
index c4b2c348f6f3..d35944228287 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4066,11 +4066,11 @@ libumfpack.so.5 SuiteSparse-5.10.1_1
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
-libSingular-4.2.1.so singular-4.2.1_1
-libfactory-4.2.1.so singular-4.2.1_1
-libpolys-4.2.1.so singular-4.2.1_1
-libomalloc-0.9.6.so singular-4.2.1_1
-libsingular_resources-4.2.1.so singular-4.2.1_1
+libSingular-4.3.0.so singular-4.3.0_1
+libfactory-4.3.0.so singular-4.3.0_1
+libpolys-4.3.0.so singular-4.3.0_1
+libomalloc-0.9.6.so singular-4.3.0_1
+libsingular_resources-4.3.0.so singular-4.3.0_1
 libbrial.so.3 brial-1.2.10_1
 libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
diff --git a/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch b/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
deleted file mode 100644
index 354603bb2c44..000000000000
--- a/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e1643135645a3cc97af8659018defd2b8617bb4e Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Thu, 23 Sep 2021 10:57:25 +0200
-Subject: [PATCH] omalloc: fix alignment stuff for "make check"
-
----
- omalloc/omtTest.c | 6 ------
- omalloc/omtTest.h | 2 +-
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/omalloc/omtTest.c b/omalloc/omtTest.c
-index 715fbb113c..75c8cdb210 100644
---- a/omalloc/omtTest.c
-+++ b/omalloc/omtTest.c
-@@ -70,12 +70,6 @@ void omtTestDebug(omMemCell cell)
-   }
- 
-   is_size = omSizeOfAddr(cell->addr);
--  if (!OM_IS_ALIGNED(is_size))
--  {
--    omReportError(omError_Unknown, omError_NoError, OM_FLR,
--                  "is_size == %u is unaligned", is_size);
--    return;
--  }
-   if (is_size < size)
-   {
-     omReportError(omError_Unknown, omError_NoError, OM_FLR,
-diff --git a/omalloc/omtTest.h b/omalloc/omtTest.h
-index a579d88011..6faa099c89 100644
---- a/omalloc/omtTest.h
-+++ b/omalloc/omtTest.h
-@@ -48,7 +48,7 @@ void TestFree(omMemCell cell);
- 
- #define IS_STICKY_BIN(spec) (spec & 1)
- // #define IS_STICKY_BIN(spec) (0)
--#define GET_SIZE(spec)      (spec & ((((unsigned long) 1) << 14) -1))
-+#define GET_SIZE(spec)      OM_ALIGN_SIZE((spec & ((((unsigned long) 1) << 14) -1)))
- #define SET_SIZE(spec, size) spec = ((spec & ~((((unsigned long) 1) << 14) -1)) | (size))
- #define IS_ALIGNED(spec)    (spec & (((unsigned long) 1) << 15))
- #define IS_ZERO(spec)       (spec & (((unsigned long) 1) << 16))
diff --git a/srcpkgs/singular/patches/upstream_polys_test_musl.patch b/srcpkgs/singular/patches/upstream_polys_test_musl.patch
deleted file mode 100644
index 73ee062e2f89..000000000000
--- a/srcpkgs/singular/patches/upstream_polys_test_musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6e2383111a18b2fa2d3421045625d1d424eb1e25 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Mon, 20 Sep 2021 15:13:36 +0200
-Subject: [PATCH] fix: make check: polys_test
-
----
- libpolys/tests/polys_test.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libpolys/tests/polys_test.h b/libpolys/tests/polys_test.h
-index 5526aa5a6b..5b4c561238 100644
---- a/libpolys/tests/polys_test.h
-+++ b/libpolys/tests/polys_test.h
-@@ -2481,7 +2481,7 @@ class PolysTestSuite : public CxxTest::TestSuite
-     {
-       for (int qi = 0; qi <= 100; qi++)
-       {
--        int c = rand() % 1000000;
-+        int c = rand() % 1000000+1; /* c must not be 0 */
-         poly qterm = p_ISet(c, r); p_SetExp(qterm, 1, qi, r);
-         p_Setm(qterm, r);
-         number qtermAsN = toFractionNumber(qterm, cf);
diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template
index d3af1c8b919b..2d279f6c5385 100644
--- a/srcpkgs/singular/template
+++ b/srcpkgs/singular/template
@@ -1,6 +1,6 @@
 # Template file for 'singular'
 pkgname=singular
-version=4.2.1
+version=4.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-readline=ncurses
@@ -18,8 +18,8 @@ short_desc="Computer algebra system for polynomial computations"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.singular.uni-kl.de"
-distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/${version//./-}/singular-${version}.tar.gz"
-checksum=28a56df84f85b116e0068ffecf92fbe08fc27bd4c5ba902997f1a367db0bfe8d
+distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${version//./-}/singular-${version}.tar.gz"
+checksum=74f38288203720e3f280256f2f8deb94030dd032b4237d844652aff0faab36e7
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" ntl-devel"

From 111581008974174ba9dc77c01fb213a19c212384 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jan 2022 18:26:41 +0100
Subject: [PATCH 0229/1427] nodejs: mark broken on aarch64.

---
 srcpkgs/nodejs/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index e9c439903553..ed0b7158e688 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -43,6 +43,7 @@ fi
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+	aarch64*) broken="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/36246/steps/shell_3/logs/stdio maybe https://github.com/nodejs/node/issues/36287" ;;
 esac
 
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

From cac9c6d17f5eec04556901b3182bc383fa9dafa5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 14 Jan 2022 19:00:52 +0100
Subject: [PATCH 0230/1427] gnuplot: enable cairo for all builds.

---
 srcpkgs/gnuplot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index 925f4a92d144..7b1c7d0c5599 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,7 +1,7 @@
 # Template file for 'gnuplot'
 pkgname=gnuplot
 version=5.4.3
-revision=1
+revision=2
 configure_args="--with-readline=builtin"
 hostmakedepends="pkg-config lua52"
 makedepends="zlib-devel libX11-devel gd-devel lua52-devel"
@@ -44,7 +44,7 @@ pre_configure() {
 do_configure() {
 	if [ -z "$CROSS_BUILD" ]; then
 		cd ${wrksrc}/x11
-		./configure ${configure_args} --disable-wxwidgets --without-cairo --without-qt
+		./configure ${configure_args} --disable-wxwidgets --without-qt
 		cd ${wrksrc}/wx
 		./configure ${configure_args} --without-qt ac_cv_path_WX_CONFIG=wx-config-gtk3 LIBS="-lX11"
 		cd ${wrksrc}/qt

From af1c632ea05188e588b8c6559255fb43c5e737bc Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
Date: Thu, 13 Jan 2022 19:26:14 +0100
Subject: [PATCH 0231/1427] gallery-dl: update to 1.20.1.

---
 srcpkgs/gallery-dl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index a55ead4d37c8..363b7b2cc4e2 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,18 +1,18 @@
 # Template file for 'gallery-dl'
 pkgname=gallery-dl
-version=1.19.0
-revision=2
+version=1.20.1
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests"
-checkdepends="python3-requests python3-nose"
+checkdepends="python3-requests"
 short_desc="Command-line program to download image galleries"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/mikf/gallery-dl"
 changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
 distfiles="https://github.com/mikf/gallery-dl/archive/v${version}.tar.gz"
-checksum=0cc1bf7685d6866cf52fe60f1a9d67fc9929b32d75b703db8f6e677db945c644
+checksum=4186901ae6aaec389c9e6c138cb9c0408bb70e634c25af0843e9132cf1c50f4b
 
 do_check() {
 	make test

From c2294bfd11bbafac0322e25cae4429024fa86e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:16 +0100
Subject: [PATCH 0232/1427] kde5-baseapps: update to 21.12.1.

---
 srcpkgs/kde5-baseapps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde5-baseapps/template b/srcpkgs/kde5-baseapps/template
index 15db05fa3fab..8d46dc8616f6 100644
--- a/srcpkgs/kde5-baseapps/template
+++ b/srcpkgs/kde5-baseapps/template
@@ -1,6 +1,6 @@
 # Template file for 'kde5-baseapps'
 pkgname=kde5-baseapps
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=meta
 depends="

From d6c6a285b28beb9d54355cdeaebb5ef1a96cd03f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:18 +0100
Subject: [PATCH 0233/1427] dolphin: update to 21.12.1.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 90faa712faad..d53cf35bb876 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e70fc08ee292c5f9bfd4fc3bb12eef524528bee8e856d294bf484b3eff7b2669
+checksum=6a4b16562b31574b7bc35eb46c754d4f19b047e182ec8a9487cfd1db73af254c
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From bff36f5d933189579cc6fb6952e21bcf7dd35b5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:19 +0100
Subject: [PATCH 0234/1427] dolphin-plugins: update to 21.12.1.

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 2d5335dfdf53..36c5adf31838 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f2bc5b9874e36376afc3bcdaaa558ae7277cea724597353026dd403c2a741394
+checksum=7ca1acc82ae1fb1909b1f98797a1a6f5d74ad78cc969f96cb65bb7e5f7062279

From ccd945201ea51df31791d4b13014f5c3861760f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:21 +0100
Subject: [PATCH 0235/1427] khelpcenter: update to 21.12.1.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 2434b89fe6f1..61839af88a2a 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ac6867ef408a3e8ea1a06d776c7d1e78d002e5588d21b6b48502d7390f835a55
+checksum=14257aa6be8ad1c329f6b4fa0ecb446f440af6e9cc90df65ec675a7255298559
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From 34747daec6dc05ce80d45e1bafbd311d91ef8175 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:24 +0100
Subject: [PATCH 0236/1427] kate5: update to 21.12.1.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index f9336f1a6c47..d46828009022 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=b4122e7c7078a853bde82a4177f19148d2c1cb952dca0636c07f741989146f7b
+checksum=7e48ccfdb58a41252566b5d6f263db16d6c88af60e2a15aef305bc0fa305a011
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 4c198893384a2080dd54a202c4f7819619adb3bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:26 +0100
Subject: [PATCH 0237/1427] konsole: update to 21.12.1.

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index bd44889cf4d3..b46bfe5feeb1 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=f3529987eb7b7c1a11f2efa110023925a47a7d02cc96a41160e671742fe36f73
+checksum=f46b68f19dd45d5bb2feef3fe6641e5c02d26ee6a669670765e23d28f7ee5a5d
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From 86092e402617d7aad71f2d8b333f1210db6fcd8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:27 +0100
Subject: [PATCH 0238/1427] baloo-widgets5: update to 21.12.1.

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 5fee34f162d6..609f12da82a4 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=f720c9cfe81e3ec31a2c9ebd91011fb1320011ca39325ce070a646368e56c9a5
+checksum=91d0b15e8b9a59e2c5d60576a75b3c3e2380d9db969b47c0494c661f577a6b06
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From e6791d1e8a96bbb2fe3e2afcef4f7d1b6f7b3843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:24:28 +0100
Subject: [PATCH 0239/1427] kio-extras: update to 21.12.1.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index 81b90a5a3ca2..8dec98851ca1 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=246234481d7a8ad4047b46cd7dde6b3eb4a7507122a0eb6df73893749ad19c96
+checksum=cc7d5465602c0cd26577a30572ebfa3141414828a360f17e6e456a2d6faa505f

From 54178a14cd573f67bedd22e5f3f302a1f26a42f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:10 +0100
Subject: [PATCH 0240/1427] akonadi-calendar: update to 21.12.1.

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index ad6777354a9c..a05a78dd91cf 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=7a5df066f330b1dfdd290c579132f7e84d3f8cea941da4b2f6830b170ec07f4a
+checksum=e743797c2909c93cc513946e0ba719db07888d26e6f35a134d04da4254abe10c
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a1db26abb30075c6ecc74bbe0421c8dc5275f213 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:11 +0100
Subject: [PATCH 0241/1427] akonadi-contacts: update to 21.12.1.

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index d5ab3258e6ef..d113602eae4f 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=e46350eff479e22f14e6a95fb0e8de0f823c5921b58c305ba4c1c1b4bdd8842a
+checksum=43598a2075613297ca08cdd4a3227749779fbca7a15244c029efcd76705903fa
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From b2917e1d3c865388d17654b70ad0e06abdddec02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:12 +0100
Subject: [PATCH 0242/1427] akonadi-import-wizard: update to 21.12.1.

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index 035874d4bfc4..1e1cd5aaa960 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b1977d691d4b8b89772d10b711ee9307178f47bd82d9819ad2646678d5ac3b53
+checksum=57388979ee68e8d7bd4f2b7101f8d843d4ea36d71d07b45e2f4a2d3175d2bf25
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ce606daf38516acc6bd1ad1589a8177556a28a49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:14 +0100
Subject: [PATCH 0243/1427] akonadi-mime: update to 21.12.1.

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index 033a7e294d05..7949994b2281 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=d86b6d72be0e046bc56dfe9c29256f5dfd727da1f542659144c3c3979fa6351f
+checksum=a6016f9c58fa899773c3f79f61aaae179a508e37405771a836bafcde72c22fca
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From cdd240d6119259db8448d3db8fa7b8f547d7d5db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:15 +0100
Subject: [PATCH 0244/1427] akonadi-notes: update to 21.12.1.

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 80dc18aa9618..6c6d7ada5c63 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=42d87fa2bf4ba4316917b90745089b446da1120d86dcd32709d0c34273b22f5c
+checksum=db4a8435ae63f935d05d60313c849652c7e61dfe2d88efbfc9a56328cfaa2cd1
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f4194c1a8bb1e1f42d9273c5f2cd266d581c391b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:16 +0100
Subject: [PATCH 0245/1427] akonadi-search: update to 21.12.1.

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 52c532865b3e..6d5731870bf8 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=3305dea1b1c1844fd15dc2cc3a631264beb9b00106e62ddfbecd260c41feca1d
+checksum=5608ff3b0f3b131c556a9502223e887d7a9f78945d31e6b983b1e02828f9142d
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 5dd7013b170ea4c07e6724257da3703589be02a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:18 +0100
Subject: [PATCH 0246/1427] calendarsupport: update to 21.12.1.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 5aec31664efc..1b179e13e250 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=345ce151c2811dd9172b79a142b8f3384e19b55920f56022bc9446f18aef79a8
+checksum=d0cb28f180b760ed5314e55dda9083be024c019e170962ccdcdc2bbf8a468b3e
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From c87676c293126e02eb99c9f12fac5f76825e02df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:19 +0100
Subject: [PATCH 0247/1427] grantleetheme: update to 21.12.1.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index 4d19ca4518c3..21cf3ba009f2 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=545db22246d95c47a53fcf9c54c8b42060bbbcf3844a443a0963c52472c6f3a9
+checksum=e222b5ebcc8c8422a2cb6535e4ef4dd8c902dd55852e4dd6400920b561114246
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 578c19ce53ba6b6480497078d55ce552c55a684b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:21 +0100
Subject: [PATCH 0248/1427] kalarmcal: update to 21.12.1.

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index bb15a284b0b9..090a2af1519e 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1dc2619888c33757a39d9ba2bd204159e47aae01cde963c7e9439d6c1b3a6066
+checksum=e58fdd64dd7c9ee7cc098878cb750a89eaba3338239dc817908317e688eff7e4
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 8737a1c5458b7d9b6bbf7188d782c8b26be70899 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:22 +0100
Subject: [PATCH 0249/1427] kcalutils: update to 21.12.1.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 1fecd2d2d7d6..493fb50ac75b 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=de2ef3a3532d0a474fb22834b14c3a40e5bd4284806eda7229fc5ffedc9a2426
+checksum=35c3d088ce989bf885bedf741e70bc00a4d1537d6f835d77df284e2bf29b7cc6
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 7e7e2a10e9d938d06251cfef30afa119aeb95d23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:23 +0100
Subject: [PATCH 0250/1427] kdepim-runtime: update to 21.12.1.

---
 ...abcefb45790175e209ef8ae394def4a805e9.patch | 127 ------------------
 srcpkgs/kdepim-runtime/template               |   6 +-
 2 files changed, 3 insertions(+), 130 deletions(-)
 delete mode 100644 srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch

diff --git a/srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch b/srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch
deleted file mode 100644
index e911588dbdcb..000000000000
--- a/srcpkgs/kdepim-runtime/patches/f14fabcefb45790175e209ef8ae394def4a805e9.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From f14fabcefb45790175e209ef8ae394def4a805e9 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 10 Dec 2021 21:55:13 +0100
-Subject: [PATCH] POP3: Fix SSL connections
-
-We need to go into ssl before trying to read from the socket, otherwise
-nothing works
-
-BUGS: 446751
----
- resources/pop3/pop3protocol.cpp | 72 ++++++++++++++++++++-------------
- resources/pop3/pop3protocol.h   |  2 +
- 2 files changed, 45 insertions(+), 29 deletions(-)
-
-diff --git a/resources/pop3/pop3protocol.cpp b/resources/pop3/pop3protocol.cpp
-index c2d01d33a..15971919e 100644
---- a/resources/pop3/pop3protocol.cpp
-+++ b/resources/pop3/pop3protocol.cpp
-@@ -535,6 +535,39 @@ Result POP3Protocol::loginPASS()
-     return Result::pass();
- }
- 
-+Result POP3Protocol::startSsl()
-+{
-+    mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
-+    mSocket->startClientEncryption();
-+    const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
-+
-+    const QSslCipher cipher = mSocket->sessionCipher();
-+    const QList<QSslError> errors = mSocket->sslHandshakeErrors();
-+    if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
-+        QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
-+            if (!cur.isEmpty())
-+                cur += QLatin1Char('\n');
-+            cur += error.errorString();
-+            return cur;
-+        });
-+
-+        qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
-+                          << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
-+        mContinueAfterSslError = false;
-+        Q_EMIT sslError(KSslErrorUiData(mSocket));
-+        if (!mContinueAfterSslError) {
-+            if (errorString.isEmpty())
-+                errorString = mSocket->errorString();
-+            qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
-+            closeConnection();
-+            return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
-+        }
-+    } else {
-+        qCDebug(POP3_LOG) << "TLS has been enabled.";
-+    }
-+    return Result::pass();
-+}
-+
- Result POP3Protocol::openConnection()
- {
-     m_try_apop = mSettings.authenticationMethod() == MailTransport::Transport::EnumAuthenticationType::APOP;
-@@ -560,6 +593,13 @@ Result POP3Protocol::openConnection()
-             return Result::fail(mSocket->error(), errorString);
-         }
- 
-+        if (mSettings.useSSL()) {
-+            const Result res = startSsl();
-+            if (!res.success) {
-+                return res;
-+            }
-+        }
-+
-         mConnected = true;
- 
-         greeting_buf = new char[GREETING_BUF_LEN];
-@@ -608,35 +648,9 @@ Result POP3Protocol::openConnection()
-                                          "was unsuccessful.\nYou can "
-                                          "disable TLS in the POP account settings dialog."));
-             }
--        }
--        if (mSettings.useSSL() || mSettings.useTLS()) {
--            mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
--            mSocket->startClientEncryption();
--            const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
--
--            const QSslCipher cipher = mSocket->sessionCipher();
--            const QList<QSslError> errors = mSocket->sslHandshakeErrors();
--            if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
--                QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
--                    if (!cur.isEmpty())
--                        cur += QLatin1Char('\n');
--                    cur += error.errorString();
--                    return cur;
--                });
--
--                qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
--                                  << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
--                mContinueAfterSslError = false;
--                Q_EMIT sslError(KSslErrorUiData(mSocket));
--                if (!mContinueAfterSslError) {
--                    if (errorString.isEmpty())
--                        errorString = mSocket->errorString();
--                    qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
--                    closeConnection();
--                    return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
--                }
--            } else {
--                qCDebug(POP3_LOG) << "TLS has been enabled.";
-+            const Result res = startSsl();
-+            if (!res.success) {
-+                return res;
-             }
-         }
- 
-diff --git a/resources/pop3/pop3protocol.h b/resources/pop3/pop3protocol.h
-index 9b40b334f..d01f7ab7a 100644
---- a/resources/pop3/pop3protocol.h
-+++ b/resources/pop3/pop3protocol.h
-@@ -127,6 +127,8 @@ private:
-      */
-     Q_REQUIRED_RESULT Result loginPASS();
- 
-+    Q_REQUIRED_RESULT Result startSsl();
-+
-     const Settings &mSettings;
-     QSslSocket *const mSocket;
-     unsigned short int m_iPort;
--- 
-GitLab
-
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 48cb1d8c523a..8472c202a75c 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,7 +1,7 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.12.0
-revision=2
+version=21.12.1
+revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
 hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2a0c0caa75aa0aef2f790b044a49d84ff5de22de6e07a4ffe45b990a2947b7d6
+checksum=3df4111f3a443f0562c3b7a33b76ba1ad14872138ca2a45f67d7293528f869df
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From b0da0b4ea74a26a003d64d88fb4e4149e0baa942 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:25 +0100
Subject: [PATCH 0251/1427] kimap: update to 21.12.1.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 373935af7b3a..939bc968b948 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=cd21661089ee22d8b189dd79f5b22c8d53763bd5d7d5f0f03a87703329c05a39
+checksum=9780d770a158cf3415fe7238892498d2dc81ae19bc314adb3d8098dffa7d7ef2
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From be33e4da5b2b8e1dea9fbfa67480ee6e25e5603f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:26 +0100
Subject: [PATCH 0252/1427] kldap: update to 21.12.1.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index e0ed30c30c51..7f347ec2898f 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=6f78eadf6e0bc7a6c4bb0ddea699393f5506f093163cc803194d75024d3ed760
+checksum=7d61b4d4dc31870054e984ec34304fbd2f804f63125c4b2df04003f48aa60c8a
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 76dd58ac786a5e19b3cb0ba80027d0d1b0c801f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:28 +0100
Subject: [PATCH 0253/1427] kmail: update to 21.12.1.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 5def2de7509a..cfc95a8dc936 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=e08018e1c74cea5361a449a799a6a689886643842a460c3916c12c4311438a86
+checksum=3ddb93feb575eb430092e928f347e0b59a0a3053d40a0839d18d756a68cb9e9f

From 5f2a1994fed826f00629227430186c2143da74ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:30 +0100
Subject: [PATCH 0254/1427] kmail-account-wizard: update to 21.12.1.

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index 7774364bc7cf..358c1b84d96b 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=72cbb9509d72625dd19eca1e64fcc52213629666438105c7f4a524edc8367421
+checksum=76e265116cacea6326049f0545beac2e76ec372d27b1eefa368de9c2406952c4

From 3032dd4fbed20eef43619d7e133512b80d6ebeb9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:31 +0100
Subject: [PATCH 0255/1427] kmailtransport: update to 21.12.1.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 8189cdfd5822..8c675fd7826c 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=f021ea644ad649fb680b61ed498124c1dc089db6b0b8a72726ec2049da323f98
+checksum=a2ada2ecf6532cd347b8cc630d6ba1429b02402cc6f95a3a4b72d1dd012ecf56
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 041be8b4353b3f24fd998dd2df2889aa72857dee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:32 +0100
Subject: [PATCH 0256/1427] kmbox: update to 21.12.1.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 4d6d67c7fee3..c54b7f2700d7 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=139fbe4bfff0fdc07436e4af2d00915534f7b1b34b28793cfc0d3f6cf285a280
+checksum=8aa4e44ba2713e4b70cc8d6b79fb11057e1839f451196b21452c7e50c3e2bcb4
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5f270963651c4bda84879b801265b377c6243699 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:34 +0100
Subject: [PATCH 0257/1427] kmime: update to 21.12.1.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index cfe8715e4bc2..d98cc9728c80 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=75bb5cc9da5fbaa2be4797e372cff47fb426cbeab9581ccdde48a92285f2d858
+checksum=c1f4c06c61f6b4ddde7395b1cfb1f2411a32638e09c6f0a58c6557a7dffe4120
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From e9b7c2539c865a08d7155206e286d926e6d5b1e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:35 +0100
Subject: [PATCH 0258/1427] kontactinterface: update to 21.12.1.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 44cb56587d5e..8aff2fcead58 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=7b4849eab07b26ef9406fe7afcfe011116502dbc1eaffa1ea8a819575d4c9f07
+checksum=ca5e0e907b73472d68b8322a6d6c008f0e8b61087a70d5dbefab0d8afe2cf713
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 589b6a5e8dd80cbedf383e1208d2fafd990c29f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:36 +0100
Subject: [PATCH 0259/1427] ksmtp: update to 21.12.1.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index e611f71eb012..4ac88679fb58 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=2cda0ac5a355e2828770fb34e5684a01db306918a9fe748a897471bf3552055d
+checksum=981273efff8f47aaca1672aabdc0f40d5cbfd5d730d35dd25758d58bdd320c89
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0e925237ad181b0691e08c7a02dc8af321ce1d9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:37 +0100
Subject: [PATCH 0260/1427] ktnef: update to 21.12.1.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index eecab8b6a31c..fe2123294d5b 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=08e6565ba81d93154f8fca8f500c1570e357c28b48997713d3f519eaaafc650d
+checksum=7ac7bdf6e7261ae09b621f1f563f746baf288d291c285c1cda97c200bb3d1447
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From eb3d2545e13cb44d105f998c2bb2f7aef50d030f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:39 +0100
Subject: [PATCH 0261/1427] libgravatar: update to 21.12.1.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 1f3ece6c3ff0..16c811fe8289 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=58979aefd90e431413d8375d0cb5a8899f95b515768c6d89d3ce83cbe95747b0
+checksum=6ebd60b1eb5ae627313ee2fedde2f90ee4e649474a0339be2e83d0285eef1452
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7d020ad8fbcd5f80472b1c1786762c0ef9b2b0b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:40 +0100
Subject: [PATCH 0262/1427] libkdepim: update to 21.12.1.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index df3d26041970..5b372216c1eb 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=d1330781d2689481f408d1b1c0f3cf1d4adfc231b4a3fe1d5d6d6662cf3ca6cd
+checksum=d6ad6c6efe130390f854969c420a91d5a87c6fe89fee14e8ca8b32cca358bb3c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 81a266f1102841d298f2a6c7a53e53c9027c8675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:41 +0100
Subject: [PATCH 0263/1427] libkgapi: update to 21.12.1.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 7aecf65f4d31..6c5242c30937 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=89f7273f7feedac50e2117253242ecb0e943d4a9e8c077ef85900f068d9dc585
+checksum=339479a3becbaeb0216c793c1fc4d5c4349e049d066c5f4697a305e1dd199967
 
 do_check() {
 	:

From 425e713a39ae5de6d7f0e6c5cd9030a5a6826952 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:43 +0100
Subject: [PATCH 0264/1427] libkleo: update to 21.12.1.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 720b13e2f117..dc1236ee21f5 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=572de9a37b6c56a1aaa23f5cb5e9d7ae1250a24ed2a0746574872081edf5a5d6
+checksum=97f031ee3d8ae4b0ade5a1699db7a0224cd529b3c031a1902440d4c10fe3b638
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a5ebb0178dd32f497de906f9c23b9a1b1092c61c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:44 +0100
Subject: [PATCH 0265/1427] kleopatra: update to 21.12.1.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 2ef86f5b3dea..b18c2e6a795c 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=878a0c2b92d3d6ee81253f527cd8ed9fdca3aa4b61c725da54145ed53fb11861
+checksum=29a173ba95ea97b650ba8645d99fb7ac848ccd3a979a6097dcc378fd88536742
 
 do_check() {
 	dbus-run-session ninja -C build test

From 2176d7ff0fdad37946248be28865634824e10c95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:46 +0100
Subject: [PATCH 0266/1427] libksieve: update to 21.12.1.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index 26d731688ab8..9b5a9e4cfeb8 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=e0a3e1ba668c3b4f47856f04394fb9d9c483e9acab4f752c744e43dc1537aa71
+checksum=911c2d61925679cf9f7dab19b56f8b088fcfb7734de901727daa07cbe68a2ab4
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6448ff06f0dea53ac844be16d2ea630999d545cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:47 +0100
Subject: [PATCH 0267/1427] mailcommon: update to 21.12.1.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 70f39133bc4e..ed8be131d55a 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=7c5fd837c7786bf24f2e662e7708463a2db703632887ae5086255a92dedf209a
+checksum=63289da2ed878ed354e7495d3a5101ffb74db15459fe600f5e9c20e344a47e12
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 3f57401d37eea391f15bd13536bfe2329ada9c18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:49 +0100
Subject: [PATCH 0268/1427] mailimporter: update to 21.12.1.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index a14b0b19a575..78ccfdc1ccf7 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=3f223596f49b0952572bab1cc6e85af361c454c96cae9aaca4d52b313067425b
+checksum=e39eabde8ad08bfd84071d476ec05bc7a8872881aafd83a2ad560bfd1a276b92
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9cf0933cf2e5c387cb0ec418e87a273226f6fc76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:52 +0100
Subject: [PATCH 0269/1427] messagelib: update to 21.12.1.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 28634396876e..0a4fc560f040 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=6119e69d875f3f3092604265203f750c95a9f49db64f67a95c509bad6c2457e4
+checksum=ac2d4bf0d6ee66efb604bcb70a346b3762570a34666764662b7dc5c03bccdcab
 
 #TODO: fix build without qca-qt5
 

From ddf0aacf243c9c2406059fb654e7bd264785c217 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:53 +0100
Subject: [PATCH 0270/1427] pimcommon: update to 21.12.1.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index bb1ae9607290..999de580a683 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=5849ff5750228a3eacd5a878cf4538e9086df0ee2070bc2386608019ace1b70b
+checksum=0fb194291c91ac65b9ef4c32918adcbd5205ef015c6edeefcf2767b71762e4e5
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6dc36b8b44225adadc615ccbe79a4a96a27ca155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:54 +0100
Subject: [PATCH 0271/1427] kpimtextedit: update to 21.12.1.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index b701bc153568..326bc28052ba 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4157a163a9ecb339baecc19176f03f0478371b1b635187adef4d5ec98681d09f
+checksum=d92ace9e4f38b40c6278e813c92e02c90d9a615e541a3efbd92b358a34235ad2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 124a7a568703ac1c5f52ab178929f4fce64aec69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:55 +0100
Subject: [PATCH 0272/1427] kidentitymanagement: update to 21.12.1.

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 666abde7e008..68825de39d4c 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fc653adf022fb4c0c2f8ec8f910dbed7e6a713f6d7570d27148841fd71874d3e
+checksum=9c37162dd4dfbca096d0b656e0ea9b49ae43c30cf92f1cd82ba8b5300d536ae4
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From aa91cdcf4b571c1c579097bf078bf34845bb561f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:57 +0100
Subject: [PATCH 0273/1427] akonadi5: update to 21.12.1.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 0da1b8b6a2b4..af255d2e5f05 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=23bf7036b9b6f5d8ce01535c2698d54768bfa7c70c9257e4c92dca4d319cb8f3
+checksum=d43833f1e587aacb758ed42b7431eea908dc6c69cf89183afcd9059d511b08c6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 7326f525650e71d46dd6c029b3d09692a7a15e58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:25:58 +0100
Subject: [PATCH 0274/1427] pim-data-exporter: update to 21.12.1.

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 3f3f6381cafb..1055d1e8c277 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=1770587412aa8ac118e3cd37f44b47968074b420ad4214455095743140d31aa7
+checksum=698cd14a7d4b3401226ad78944c6b7cfa75448a94d3c22631af649e29a45e4d0

From ab29f3b856f049433a7698a06c0ad32516fe5b8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:56:39 +0100
Subject: [PATCH 0275/1427] okular: update to 21.12.1.

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index b49dff295222..c1b73f60fd88 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c8d487e5f86cd951ae0f8d0b057393c3a1d4136c8d2f99e04a0e2ec0e85d7e23
+checksum=04bd61cec2b794cce0f6381cf7c4db7778a8cefc5716d8a4bfd3efaafd212ba1
 
 do_check() {
 	cd build

From 874d1eec920f6b34692739c9e6b59ea455dede2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:56:41 +0100
Subject: [PATCH 0276/1427] libkexiv25: update to 21.12.1.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index d6c0e1ac6aed..d88433483acd 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=9064a900dbad287dbdf2b6dd6b1202695f9409706040b43c5cad3f77490afed6
+checksum=ab30b86ad489faf1feea2949c74844c6d3f4c46219974b924e157bae2012aafb
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 9b7572976a4eaf2ef01a45b289d5eaa21ca69ecb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:13 +0100
Subject: [PATCH 0277/1427] spectacle: update to 21.12.1.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 93a4ff5a638a..962219aa9851 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=568f4029bcb3959ab6d8a088e4853256cd4edda06d8f85b9531a727865362968
+checksum=e2c0c4b8a7936f85a741ce816aced38aa626ccfd89015a7bdb3d942d7cd7178f

From bcf9c69e0f3d048c90bdb2d44accf79a4be7b38b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:14 +0100
Subject: [PATCH 0278/1427] libkipi5: update to 21.12.1.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index daf518bb43ee..e420c6433bd0 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=ecd6390143f997b62b7f2698332ca6fc79b03e438b6ce9522694f7933c096ede
+checksum=7eb5921935c41f58d8ebde6d9ce3aa5d76320fe32beb5f76c3ab9e260e1ce51a
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 4ce3f7dd0f469191f362ccdbc9f5f70dd7cb221b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:24 +0100
Subject: [PATCH 0279/1427] ark: update to 21.12.1.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1a9f915c321b..409f357ad7c5 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dd647821993fa553d94778ace172418cab55bdca6f35142df9a092a520ec30cf
+checksum=a07654af5a3d7714a485027765ea29a94f62b3aef670cb78532a1561afb978d6
 
 do_check() {
 	cd build

From 3822548594c4626e02a781fc069f6cb483fbfb79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:25 +0100
Subject: [PATCH 0280/1427] dragon-player: update to 21.12.1.

---
 srcpkgs/dragon-player/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index 339673195df9..5a360931dd00 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=101dfce62050491845a425edf0f95c2c7a13d81956b90462621d6911672ef590
+checksum=3f94ceaf4560b1d5fdf58c2a10daf6a4d94924470f08fd2df1387f65ea0d3f13

From 29f323709430b517034788dfd8f0a37b0fbdae66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:27 +0100
Subject: [PATCH 0281/1427] elisa: update to 21.12.1.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index 45e99ffdcf25..5cbef1e01b30 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=dcbbd33f258e3150a0a8c28019c4a5c90ec44257ddc0f3b508e434fdd60c4867
+checksum=1aca4a62253185306c725fbdd6954fbe53cd0bb68dd46a02b0164ff2927a90d8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From a932c04c81b704698a4169f06478eb6ccc9fa795 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:29 +0100
Subject: [PATCH 0282/1427] juk: update to 21.12.1.

---
 srcpkgs/juk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e90c9673058f..010882332e61 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=82c3a6d71476c668d4226eed894553c3b247e140a891c1c414b39646b58f4d3f
+checksum=27bc1c3c3bb5d516621cfd42916a0f2e81a55968da44dbbe23951522fde97b02

From 587d7989506f89f485b7160e01d3c15eb5bc029e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:30 +0100
Subject: [PATCH 0283/1427] kdeconnect: update to 21.12.1.

---
 srcpkgs/kdeconnect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index ebb7a02e618e..91290d4eed73 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.12.0
+version=21.12.1
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -19,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=519e1d03cef6c8b68902be7907fada4988b34c20816a977077576bf168369d4a
+checksum=4c70baecf581b1d4aa0569ebe2161b95f1973d6421b321b8ae87ace461b481d7
 python_version=3

From ab7d8665ef13f5f9487128ddea530aeb7a02de50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:32 +0100
Subject: [PATCH 0284/1427] kdegraphics-thumbnailers: update to 21.12.1.

---
 srcpkgs/kdegraphics-thumbnailers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 0b113d03bb3e..90e5a6614519 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,6 +1,6 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=70dcb030731b7844fabbba6b67ac9bb1495981911f7e0782a7927ea15422917e
+checksum=a62bd8342627137a99da4b0b86a7f03be7e9a47af5c55def2845dbc8680a4678

From 59b2e6650b618d235337070f23ad893ba6f11cde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:34 +0100
Subject: [PATCH 0285/1427] knights: update to 21.12.1.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 2c12c0c573aa..f6d4b2ce485a 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=69245840e2cbb2f1ea17ee74fa6d7a5468c23983da111057e5705ba2ff092c9d
+checksum=12845f0bdaf030ff28bab0f144773f1d3b3c04d32eae63033b24a7824c02cbd9

From d41166a8a58a27d6ce0eba0d5882cf7d4e0a1c3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:35 +0100
Subject: [PATCH 0286/1427] kqtquickcharts: update to 21.12.1.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index fda8b584d451..7e344a2732d0 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=36769928c967d05bbdeffc375798c6ade4b21e8c16042be206269cc5d5fddc2e
+checksum=7aab42d0932bb18880f937fe06b733aed5a38ac611a2b8043fb3f77ca5220136
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 26fa0a8a87bc4d623c4449062f767d616f8e2ac6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:42 +0100
Subject: [PATCH 0287/1427] akregator: update to 21.12.1.

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 9571ef409e7e..69bddc5bd270 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9b9952c799e9469193c1e78aa733c6c25f41362129a68c92ec679fa05eb3a170
+checksum=c4ed63c612f5ab371a766d3e06f226e05d76520275a145e45082e1b0c330c7f9

From 62eb54bfba17ab1c54aefad78a9a6dbb5b46e4de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:43 +0100
Subject: [PATCH 0288/1427] eventviews: update to 21.12.1.

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index 6d74207d9185..ac97fe5ae939 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=dedcd7583c8522a85561f544d67a25809bc533cd47cffe94c2522165d364c798
+checksum=a3f13127220428dd3519dae7d5dd4fb10cc234145dfe36be1481c564d085cbbc
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From d9d00f7866f0ae3b66307156fdde709c8dd13ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:45 +0100
Subject: [PATCH 0289/1427] incidenceeditor: update to 21.12.1.

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index f6a82aad6169..adf3978f827a 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=57df77be28e81f5b1b15cd1e65dc5b7f549f32e5e4c0be37768f0000c5502de7
+checksum=b300a0e5dcd621d9b987dbb61e7bd4c9159c31e3aaa152f299029b5b650855c5
 
 do_check() {
 	# failing tests are disabled

From f90cbb056f9edbfa76e20fc4ff0cc2dd8d7f677f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:47 +0100
Subject: [PATCH 0290/1427] kaddressbook: update to 21.12.1.

---
 srcpkgs/kaddressbook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index 41d599bfe9d5..8fb7fb7bc4b4 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kaddressbook"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=3a86dfddcf2e522a7eafd60f0cd6ac558b371712edae4df06c488af71472da88
+checksum=2634271f6b9f07b5ca7b7b3bd3ed988c5cdd33d0e0bf619a51e30835371f62db
 
 kaddressbook-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From fe92e2e8fd5e950ac9a15bcb4beac768951a9745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:48 +0100
Subject: [PATCH 0291/1427] kalarm: update to 21.12.1.

---
 srcpkgs/kalarm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 2402743c5a53..22a04b192f5c 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=353fa8c78426e6f92facae1b5e37f000442441bb981cf828895240f6cdec8142
+checksum=a1f768e0414b6cb3dc48f10c12a4699e93ac599fcfbb85f16af12299d1d8fd98

From dae422c0e157bca560c7ad61bf1d7fc02de22cfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:50 +0100
Subject: [PATCH 0292/1427] kdenlive: update to 21.12.1.

---
 srcpkgs/kdenlive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index e5b2f738c4cb..d028999294df 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e11d2ee058d89ad1c7b8bb230bf3e26e9c4b8fdf7fb98fc790de7e4a1bd77420
+checksum=dcd56718b2db687f9d4c63974a648c2b6641173d011362d2d9619442baef6fe4
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From 6bd7e7c13c03e12f6243b9e97ea7dfc3bf53da28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:52 +0100
Subject: [PATCH 0293/1427] kget: update to 21.12.1.

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 9ade463e2492..ef42e8222219 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kget"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5f55ea13f150ac063f9b2e04ffad9c0b86477a39158adcf4a319ec2a483aa535
+checksum=7be820e6a8ec8ec0cdedb94705503b2d8a00e9f06043cbe95b6f6fbb40f776c9

From 736709adb30e7271090a68ef48860c10bd9a69a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:53 +0100
Subject: [PATCH 0294/1427] knotes: update to 21.12.1.

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index 9782cbe3dba6..e33e07c6c801 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://apps.kde.org/knotes/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=afeb17534fe609255785770cd883947ccff805908a9ab9ad3250a6739775bc61
+checksum=bc45ae2f4a169e143e733c9ddb36dbc9ee5098d010a40db16fcb3bcd7d6bdb97

From 0086e3b9507332c89882af5948cacae31f3d48e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:55 +0100
Subject: [PATCH 0295/1427] konqueror: update to 21.12.1.

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index 09988a1e266f..5de76a679a94 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/org.kde.konqueror"
 distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz"
-checksum=67360d0a5051c1f572b2234f5b9e8c5ea9510d3eb748ca80aedc656b09b0c0b3
+checksum=69f49b9dafe97807bef3b87562249650b0fb0fffbe8d6297ba270ed6ad0e0eec
 
 do_check() {
 	:

From 0aa4891d503c630baabc96aa50e7889fdeadce7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:57 +0100
Subject: [PATCH 0296/1427] kontact: update to 21.12.1.

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index 1c0399952d89..345ec000f20c 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kontact"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4996ad097b97cf25506a68fc5b06304bcee50ae0bfed596510e1f6258390599e
+checksum=1d70fd0a0c6c0fab945bae8336add330e345b5a82ce01a00721da07f10cf1636

From 04b1c8d5b090ebcc493c444b2d4c87e2120f0327 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:57:58 +0100
Subject: [PATCH 0297/1427] korganizer: update to 21.12.1.

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index 3199f69a5abc..36c95350de0f 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.korganizer"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=28cd09bec0559b66199d57f95201ba1f12aad6002f419a6620297148e920cce1
+checksum=cd3cc977c0dcefc3a43ab04c8713690c34ca5c4c57e5689a654c1d1df7d8c164

From a3a9f103ee211060f12c43f09b2c9fbe9c638629 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:58:00 +0100
Subject: [PATCH 0298/1427] krdc: update to 21.12.1.

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index f05752a1d87a..1a1da4b9888b 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.krdc"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=c1a4bc7be2391ff2e7e8088a18cd50483d2037b6febe698f68eb4d5b5c73a96c
+checksum=547cf6226118d2aead49e864730ff26d12e4b58a207ed426fa4d388ab90cf52b
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From 950efb5b195206edac28c787e627565f8ec84d65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:58:02 +0100
Subject: [PATCH 0299/1427] krfb: update to 21.12.1.

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 24391100ff12..c57c8c2b9966 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -15,4 +15,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=6d4659fc936573941dd8d429ca3605229f362192a12ace3ac516d738c1fc7487
+checksum=7ebf2ba04119646bf2db2adca6602dc1a18f5bc4b95497d32a2933cff420ef50

From 6dd75db7d9aad457eb3e4dd2597df6111de0444b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:58:13 +0100
Subject: [PATCH 0300/1427] ktuberling: update to 21.12.1.

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index f5471af526ce..62142ffc61e8 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=54e02dac7eaa5a453174e9e2ca38a1860835e66613cf6e242aac08b18fa45058
+checksum=06d7d04626087e684455a0daaabd5d32aad053508468903008d2fd932aaad260

From 11b395d21e1ef90bda69a4d735b74563adb64a62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 9 Jan 2022 14:58:15 +0100
Subject: [PATCH 0301/1427] libktorrent: update to 21.12.1.

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index 1513cb64ed43..d0b50b34a7a0 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/en/ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
-checksum=5ec0b6b676d96b9b552e04a9c042804ec0c559c9e56f7b28c50b80c2ed1eeb53
+checksum=fbb57cdb079c93e70f12c1ccdd135d9989c5a7f15dc2043d09a1bbecaee77309
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 3f01ca24d07089688163b0f147806cdf2f534c80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 14 Jan 2022 21:29:54 -0500
Subject: [PATCH 0302/1427] python3: update to 3.10.2.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index e47733161a6e..30055a201a6c 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.10.1
+version=3.10.2
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177
+checksum=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 170805f0226b23638c8f773b65ecec30ea941105 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 14 Jan 2022 21:31:50 -0500
Subject: [PATCH 0303/1427] python3-tkinter: update to 3.10.2.

---
 srcpkgs/python3-tkinter/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index b4ccde5f4114..3c7ecb8cfd82 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,8 +8,8 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.1
-revision=2
+version=3.10.2
+revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
 configure_args="--enable-shared --enable-ipv6
@@ -29,7 +29,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 homepage="https://www.python.org"
 license="Python-2.0"
 distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177
+checksum=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From d409f679321550fdecec715153b096403736f698 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 14 Jan 2022 21:42:16 -0500
Subject: [PATCH 0304/1427] python3-numpy: update to 1.22.1.

---
 srcpkgs/python3-numpy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index f736b5e3d45c..55d0c2a9e10b 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-numpy'
 pkgname=python3-numpy
-version=1.22.0
+version=1.22.1
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=34957b830448ae34b8bed1f5334ad790431b23bf1a16571b5a29dcd49bceafa4
+checksum=7d916a1882a1a54e4121d96ca8ed67846a92bfb1f3ad65a314a3cb307432ccc9
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"

From 60ade6a00ab9458f37db2356d470e5c4f923a787 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Fri, 14 Jan 2022 21:11:11 -0600
Subject: [PATCH 0305/1427] NetAuth: update to 0.6.0.

---
 srcpkgs/NetAuth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index 6932b3ac109a..4a227be08ea2 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,6 +1,6 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
-version=0.5.0
+version=0.6.0
 revision=1
 wrksrc=netauth-$version
 build_style="go"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"
 homepage="https://netauth.org"
 distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz"
-checksum=38f231d336a1088458daccd0a15b7dfdbb5dbe2f1f82217ad968e6000a5b1386
+checksum=6964f313ffa558f225734926ef220a7fb573747ed841a629e006d159003871da
 
 do_check() {
 	# Flaky test in 0.5.0, deflaked in next release.

From 8c38d998c45c87273fd75adef6071ae6352a7a47 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 15 Jan 2022 09:19:37 +0100
Subject: [PATCH 0306/1427] libvirt: update to 8.0.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 863e69bb5021..bd535a09d0f6 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=7.10.0
+version=8.0.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libvirt.org"
 changelog="https://libvirt.org/news.html"
 distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz"
-checksum=cb318014af097327928c6e3d72922e3be02a3e6401247b2aa52d9ab8e0b480f9
+checksum=51e6e8ff04bafe96d7e314b213dcd41fb1163d9b4f0f75cdab01e663728f4cf6
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From 7b385ed00557faf931dfbc7b4884750d6a2424de Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 15 Jan 2022 09:19:40 +0100
Subject: [PATCH 0307/1427] libvirt-python3: update to 8.0.0.

---
 srcpkgs/libvirt-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index faa9345aaef4..86812d39a93e 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=7.10.0
+version=8.0.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://pypi.org/project/libvirt-python/"
 distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz"
-checksum=267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975
+checksum=0245c226d7b83b32449299d0ca5f1f250dcc07edf9f2fcd87cb7462f09e4c026
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 3d669c1e8089641cb235e4b97fe43723491d9528 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 15 Jan 2022 09:22:19 +0100
Subject: [PATCH 0308/1427] linux5.4: update to 5.4.171.

---
 srcpkgs/linux5.4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index fbb0eb3646b5..4cc9c26ed2cf 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
-version=5.4.170
+version=5.4.171
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c
+checksum=afbcc8ed7d85485af299567f307b03057ffff3ec7bee02a21c33933d435b4958
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 2a60f0dd17c279309173e6b5717b924350aec323 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 15 Jan 2022 09:24:35 +0100
Subject: [PATCH 0309/1427] linux4.19: update to 4.19.225.

---
 srcpkgs/linux4.19/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index c74b9b8cec77..59b6b8b796c2 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.19'
 pkgname=linux4.19
-version=4.19.224
+version=4.19.225
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=01ccfc3413c3bb305653ceb0aa528aba0caa61b326e43709bf1f8b624f211031
+checksum=4b9ab3979541cd436b7b7e8905c77ffcf594a9cf4ea3fb9474ef95fe09586796
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 2a99303a5e1e8a5ab2a51863c887d2fca36b7229 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 15 Jan 2022 10:15:09 +0100
Subject: [PATCH 0310/1427] wine: update to 7.0rc6.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index cf1940a06a6f..61933a038174 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.0-rc5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.0-rc5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.0-rc6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.0-rc6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index c8b077457d5f..c4f80deb7db8 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.0-rc5/configure
-+++ b/wine-7.0-rc5/configure
+--- a/wine-7.0-rc6/configure
++++ b/wine-7.0-rc6/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.0-rc5/configure.ac
-+++ b/wine-7.0-rc5/configure.ac
+--- a/wine-7.0-rc6/configure.ac
++++ b/wine-7.0-rc6/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 4a5d74855dee..197df6d584bf 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.0-rc5/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-7.0-rc5/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-7.0-rc6/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-7.0-rc6/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 88f0b7f8cbe3..df8810b62c5f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.0rc5
+version=7.0rc6
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="8d08c79de6006771f6e845e37bd732a1db9737b4da9222e4b037733688b77758
- df00729d057da201ab4cd0cc348d3ce13b8c790aac1d1093796ca0f90f8e8727"
+checksum="63155081508b974d24654f26edb02878b2089096748d14a0e9d7cda453c27b50
+ ea3069210075dbb4672b342190b7f6b85fe0c5d607e21427d9709f7c8c3bf2d6"
 
 build_options="mingw staging"
 build_options_default="mingw"

From 99d8e404d1e8cd5fdfc933a356e01f14fd19a24c Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 13 Jan 2022 19:54:17 -0700
Subject: [PATCH 0311/1427] Field3D: fix license

---
 srcpkgs/Field3D/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index a9791dbfde40..62f0589e9e0b 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,16 +1,20 @@
 # Template file for 'Field3D'
 pkgname=Field3D
 version=1.7.3
-revision=1
+revision=2
 build_style=cmake
 makedepends="boost-devel hdf5-devel ilmbase-devel"
 short_desc="Library for storing voxel data on disk and in memory"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
+license="BSD-3-Clause"
 homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
 distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
 checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
 
+post_install() {
+	vlicense COPYING
+}
+
 Field3D-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} $makedepends"
 	short_desc+=" - development files"

From 0d39e53d04a0484982d8d17646bba3ad3702f28f Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 14 Jan 2022 17:03:50 -0500
Subject: [PATCH 0312/1427] tailscale: update to 1.20.1.

- Also removed now-obsolete hostmakedep
---
 srcpkgs/tailscale/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 44055fc87bc2..6d220cf03d30 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.18.2
+version=1.20.1
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -8,13 +8,12 @@ go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"
 go_build_tags='xversion'
 go_ldflags="-X 'tailscale.com/version.Long=${version}_${revision} (Void Linux)' -X 'tailscale.com/version.Short=${version}'"
 make_dirs="/var/lib/tailscale 0755 root root"
-hostmakedepends="git"
 short_desc="Easy, secure, cross platform WireGuard, oauth2, and 2FA/SSO"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-3-Clause"
 homepage="https://tailscale.com"
 distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz"
-checksum=57206181868299027689651b6cd133627acad0c8c38f0151f469ab36d4130012
+checksum=a2a9961e80f28504fcab6cf9262feb8e4c098ae6efcb2850ba009651729157e0
 
 post_install() {
 	vlicense LICENSE

From 664556b2228e4d8344aa8a08f2e77ec592177bde Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 15 Jan 2022 09:23:50 -0500
Subject: [PATCH 0313/1427] python3: remove license file from libdir

We already install the license in the usual location; leaving it out of
the libdir prevents the XBPS trigger from attempting to byte-compile it.
---
 srcpkgs/python3/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 30055a201a6c..85cd88971a4d 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -75,7 +75,11 @@ do_check() {
 
 do_install() {
 	make DESTDIR=${DESTDIR} install maninstall
+
+	# Put the license in the usual location and remove from the libdir
+	# to prevent the XBPS trigger from attempting to byte-compile it
 	vlicense LICENSE
+	rm ${DESTDIR}/${py3_lib}/LICENSE.txt
 
 	rm -f ${DESTDIR}/usr/bin/2to3
 	# Remove files that belong to python3-tkinter and idle-python3

From 763dda55310811a2cae78471c7cca407df5f7cd9 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <66054069+ReneganRonin@users.noreply.github.com>
Date: Fri, 25 Jun 2021 18:31:43 +0800
Subject: [PATCH 0314/1427] New package: leftwm-0.2.11

---
 srcpkgs/leftwm/patches/fix-arm-builds.patch | 31 +++++++++++++++++++++
 srcpkgs/leftwm/patches/series               |  1 +
 srcpkgs/leftwm/template                     | 30 ++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 srcpkgs/leftwm/patches/fix-arm-builds.patch
 create mode 100644 srcpkgs/leftwm/patches/series
 create mode 100644 srcpkgs/leftwm/template

diff --git a/srcpkgs/leftwm/patches/fix-arm-builds.patch b/srcpkgs/leftwm/patches/fix-arm-builds.patch
new file mode 100644
index 000000000000..9337bc90ec52
--- /dev/null
+++ b/srcpkgs/leftwm/patches/fix-arm-builds.patch
@@ -0,0 +1,31 @@
+From 876216bcc0398fb869240cd51d5ea0d12ba699b1 Mon Sep 17 00:00:00 2001
+From: pkubaj <pkubaj@anongoth.pl>
+Date: Tue, 14 Dec 2021 06:37:11 +0000
+Subject: [PATCH] Fix build errors on architectures with u8 (#623)
+
+---
+ .../src/display_servers/xlib_display_server/xwrap/getters.rs  | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs b/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
+index 2fe20d3a..b8a90495 100644
+--- a/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
++++ b/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
+@@ -3,7 +3,7 @@ use super::{Screen, WindowHandle, XlibError, MAX_PROPERTY_VALUE_LEN};
+ use crate::models::{DockArea, WindowState, WindowType, XyhwChange};
+ use crate::XWrap;
+ use std::ffi::CString;
+-use std::os::raw::{c_int, c_long, c_uchar, c_uint, c_ulong};
++use std::os::raw::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong};
+ use std::slice;
+ use x11_dl::xlib;
+ 
+@@ -575,7 +575,7 @@ impl XWrap {
+             if status == 0 {
+                 return Err(XlibError::FailedStatus);
+             }
+-            if let Ok(s) = CString::from_raw(text_prop.value.cast::<i8>()).into_string() {
++            if let Ok(s) = CString::from_raw(text_prop.value.cast::<c_char>()).into_string() {
+                 return Ok(s);
+             }
+         };
diff --git a/srcpkgs/leftwm/patches/series b/srcpkgs/leftwm/patches/series
new file mode 100644
index 000000000000..5f8e5e089321
--- /dev/null
+++ b/srcpkgs/leftwm/patches/series
@@ -0,0 +1 @@
+fix-arm-builds.patch
diff --git a/srcpkgs/leftwm/template b/srcpkgs/leftwm/template
new file mode 100644
index 000000000000..6da896578e3b
--- /dev/null
+++ b/srcpkgs/leftwm/template
@@ -0,0 +1,30 @@
+# Template file for 'leftwm'
+pkgname=leftwm
+version=0.2.11
+revision=1
+build_style=cargo
+makedepends="libX11-devel libXinerama-devel libXrandr-devel xorg-server-devel"
+depends="libX11 libXinerama xorg-server xrandr"
+short_desc="Tiling window manager for Adventurers"
+maintainer="Soc Virnyl S. Estela <socvirnyl.estela@gmail.com>"
+license="MIT"
+homepage="https://github.com/leftwm/leftwm"
+distfiles="https://github.com/leftwm/leftwm/archive/${version}.tar.gz"
+checksum=3a2bd59f12566d94b6be3b162c95d280acbaec1b40da415cb42fe07332a5b709
+
+do_install() {
+	vdoc README.md
+	vlicense LICENSE.md
+	# Example themes to use as references
+	vmkdir usr/share/examples/leftwm/
+	vcopy themes usr/share/examples/leftwm/
+	# Add to xsession
+	vinstall leftwm.desktop 644 usr/share/xsessions/
+	# Installing corresponding binaries
+	local _bin_path="${wrksrc}/target/${RUST_TARGET}/release"
+	vbin ${_bin_path}/leftwm
+	vbin ${_bin_path}/leftwm-check
+	vbin ${_bin_path}/leftwm-worker
+	vbin ${_bin_path}/leftwm-state
+	vbin ${_bin_path}/leftwm-command
+}

From 4d38c32f4281da00528fc35b98047398cc4b7066 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 Jan 2022 14:49:30 +0200
Subject: [PATCH 0315/1427] kvantum: update to 1.0.0.

---
 srcpkgs/kvantum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index 3b138ff583f3..68be85c44e6b 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.20.2
+version=1.0.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 changelog="https://raw.githubusercontent.com/tsujan/Kvantum/master/Kvantum/ChangeLog"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=863b7d1d656525464aeb59911f8d78ceb35507a85c5f4c4bdb2ea5c024bc2142
+checksum=0b80d934e1d38588582a2f5c10e362aa8ee37f00446e5c028bda4e5eca6a2b4c
 
 post_install() {
 	vdoc doc/Theme-Config.pdf

From f4ec56f0ae88fc7e900966f691dc5406ea848fa1 Mon Sep 17 00:00:00 2001
From: 674Y3r <87250374+674Y3r@users.noreply.github.com>
Date: Thu, 13 Jan 2022 19:47:38 +0100
Subject: [PATCH 0316/1427] kblocks: update to 21.12.1.

---
 srcpkgs/kblocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index 5de9c1708443..32b458a5cc7a 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=21.12.0
+version=21.12.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=8f6fcf34daa88ea9b8e786f8e5c374aa703ddac452290f893fa81fb05ee58451
+checksum=adc4c9ec09815d6b91c882cc8693913bfd91d6f94d68050fc030238aa7f78929

From 9febeb597364ed69e902f46774ea6974d293efa1 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Jul 2021 11:23:35 +0200
Subject: [PATCH 0317/1427] New package: gdu-5.12.1

---
 srcpkgs/gdu/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/gdu/template

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
new file mode 100644
index 000000000000..9c47a649b805
--- /dev/null
+++ b/srcpkgs/gdu/template
@@ -0,0 +1,17 @@
+# Template file for 'gdu'
+pkgname=gdu
+version=5.12.1
+revision=1
+build_style=go
+go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+short_desc="Disk usage analyzer intended primarily for SSD disks"
+maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
+license="MIT"
+homepage="https://github.com/dundee/gdu"
+distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
+checksum=81471d80aedcf20c84bcee67814d34ab2cf43477b831ffa320b7721d481c64ab
+
+post_install() {
+	vman gdu.1
+	vlicense LICENSE.md
+}

From ed75b170b17c5e6c453a82c4a8346f8919871836 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 15 Jan 2022 17:56:02 +0100
Subject: [PATCH 0318/1427] perl-Net-SSLeay: update to 1.92.

---
 srcpkgs/perl-Net-SSLeay/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 33082f57020a..a06ccc1d97b1 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
-version=1.90
-revision=3
+version=1.92
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl openssl"
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/Net-SSLeay"
 distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-$version.tar.gz"
-checksum=f8696cfaca98234679efeedc288a9398fcf77176f1f515dbc589ada7c650dc93
+checksum=47c2f2b300f2e7162d71d699f633dd6a35b0625a00cbda8c50ac01144a9396a9

From 551fda5f6a4a04c77a371cab97937a94030a2bca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 15 Jan 2022 17:58:50 +0100
Subject: [PATCH 0319/1427] elektroid: update to 2.0.

---
 srcpkgs/elektroid/patches/musl.patch | 21 ---------------------
 srcpkgs/elektroid/template           |  7 ++++---
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/elektroid/patches/musl.patch

diff --git a/srcpkgs/elektroid/patches/musl.patch b/srcpkgs/elektroid/patches/musl.patch
deleted file mode 100644
index d4442b77f0dd..000000000000
--- a/srcpkgs/elektroid/patches/musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/connector.c
-+++ b/src/connector.c
-@@ -21,7 +21,7 @@
- #include <stdio.h>
- #include <math.h>
- #include <endian.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <zlib.h>
- #include <libgen.h>
- #include "connector.h"
---- a/src/elektroid.c
-+++ b/src/elektroid.c
-@@ -20,6 +20,7 @@
- 
- #include "../config.h"
- #include <limits.h>
-+#include <locale.h>
- #include <gtk/gtk.h>
- #include <unistd.h>
- #include "connector.h"
diff --git a/srcpkgs/elektroid/template b/srcpkgs/elektroid/template
index f0ff9ef30612..e10842d34d21 100644
--- a/srcpkgs/elektroid/template
+++ b/srcpkgs/elektroid/template
@@ -1,13 +1,14 @@
 # Template file for 'elektroid'
 pkgname=elektroid
-version=1.4
+version=2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel-tools libtool pkg-config"
-makedepends="alsa-lib-devel gettext-devel gtk+3-devel libsamplerate-devel libsndfile-devel pulseaudio-devel zlib-devel"
+makedepends="alsa-lib-devel gettext-devel gtk+3-devel json-glib-devel
+ libsamplerate-devel libsndfile-devel libzip-devel pulseaudio-devel zlib-devel"
 short_desc="Data transfer application for Elektron music devices"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/dagargo/elektroid"
 distfiles="https://github.com/dagargo/elektroid/releases/download/${version}/elektroid-${version}.tar.gz"
-checksum=c4d1f484118d9600d727cda81caf4d10645c8ea92f78cfae6be13b0e3aec899a
+checksum=ee42637d68862d4e18982fa89e51dbb2cd4d6bf9c65449cabdc7b6d5dede04c4

From b29f17d276429c16311fc585db85e4c99d43fd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 15 Jan 2022 16:48:42 -0300
Subject: [PATCH 0320/1427] perl-Net-SSLeay: temporarily broken for cross.

The build system can't detect OpenSSL headers. Probably caused by [1].

[1] https://github.com/radiator-software/p5-net-ssleay/commit/3c13ad6b1a0604fa76a8ce4a39ce33ef82b8e619
---
 srcpkgs/perl-Net-SSLeay/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index a06ccc1d97b1..6f5fe4fa1649 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,3 +1,5 @@
+nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/37615/steps/shell_3/logs/stdio"
+
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.92

From 4520cf6cf7f8c42c01a844c5fb0875221b9bbb62 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sun, 2 Jan 2022 19:15:24 +0100
Subject: [PATCH 0321/1427] jupyterlab: update to 3.2.8

---
 srcpkgs/jupyterlab/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template
index 528dde7d643b..488fdbc2ff87 100644
--- a/srcpkgs/jupyterlab/template
+++ b/srcpkgs/jupyterlab/template
@@ -1,17 +1,17 @@
 # Template file for 'jupyterlab'
 pkgname=jupyterlab
-version=3.2.4
+version=3.2.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jupyterlab_server nodejs python3-nbclassic python3-requests-unixsocket
- python3-jupyter_ipywidgets"
+depends="python3-jupyterlab_server nodejs python3-nbclassic
+ python3-requests-unixsocket python3-jupyter_ipywidgets"
 short_desc="JupyterLab computational environment"
 maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="custom:jupyterlab"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyterlab/jupyterlab-${version}.tar.gz"
-checksum=f692e0d95338d60f72dde660f16f3955a087775c59ec541ddb25952e3f97e9b1
+checksum=5e4e99868c4f385372686767781408acbb9004b690b198b45597ba869802334b
 # Tests require unpackaged dependencies
 make_check=no
 

From 585bcf170aeb84d309d31de0f499837138c99a82 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 15 Jan 2022 16:53:40 +0100
Subject: [PATCH 0322/1427] python3-anyio: update to 3.5.0

---
 srcpkgs/python3-anyio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template
index 840c35b408de..1422b5a3077d 100644
--- a/srcpkgs/python3-anyio/template
+++ b/srcpkgs/python3-anyio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-anyio'
 pkgname=python3-anyio
-version=3.4.0
+version=3.5.0
 revision=1
 wrksrc=anyio-${version}
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/agronholm/anyio"
 distfiles="${PYPI_SITE}/a/anyio/anyio-${version}.tar.gz"
-checksum=24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d
+checksum=a0aeffe2fb1fdf374a8e4b471444f0f3ac4fb9f5a5b542b48824475e0042a5a6
 # Tests not supported
 make_check=no
 

From 05b01564e3dc1ce37aa53deb31bcc594b6621f2a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 15 Jan 2022 16:54:43 +0100
Subject: [PATCH 0323/1427] python3-jupyter_server: update to 1.13.3

---
 srcpkgs/python3-jupyter_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template
index 7b02e0f67065..9477e35947b0 100644
--- a/srcpkgs/python3-jupyter_server/template
+++ b/srcpkgs/python3-jupyter_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyter_server'
 pkgname=python3-jupyter_server
-version=1.13.0
+version=1.13.3
 revision=1
 wrksrc="jupyter_server-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz"
-checksum=05a96dfc5352adf70e88868b4ab3d1fc13e17bd84daf74d02cc6299098855fda
+checksum=4d622161f4d378ff28548b49cc180024ce102d25ba5805821fcc17ab1bc5c754
 # Tarball defines no tests
 make_check=no
 

From 758f5554b8b86b9398e1266bc4b3fc79809558c1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 15 Jan 2022 16:55:38 +0100
Subject: [PATCH 0324/1427] python3-jupyterlab_server: update to 2.9.0

---
 srcpkgs/python3-jupyterlab_server/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template
index f890070f11e5..fd1b35bc9290 100644
--- a/srcpkgs/python3-jupyterlab_server/template
+++ b/srcpkgs/python3-jupyterlab_server/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-jupyterlab_server'
 pkgname=python3-jupyterlab_server
-version=2.8.2
+version=2.9.0
 revision=1
 wrksrc="jupyterlab_server-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz"
-checksum=26d813c8162c83d466df7d155865987dabe70aa452f9187dfb79fd88afc8fa0b
+checksum=b850bbb59977c4e2c99806a892ddc56f24500b847fd3214b2922596ba81abca9
 # Tests require unpackaged dependencies
 make_check=no
 

From 03c1d2d6f193f704681fcc920ac2fafca869dbc7 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 15 Jan 2022 16:56:21 +0100
Subject: [PATCH 0325/1427] python3-nbclassic: update to 0.3.5

---
 srcpkgs/python3-nbclassic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-nbclassic/template b/srcpkgs/python3-nbclassic/template
index 9ecf44b0672c..066ce4adc96b 100644
--- a/srcpkgs/python3-nbclassic/template
+++ b/srcpkgs/python3-nbclassic/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-nbclassic'
 pkgname=python3-nbclassic
-version=0.3.4
+version=0.3.5
 revision=1
 wrksrc=nbclassic-${version}
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org"
 distfiles="${PYPI_SITE}/n/nbclassic/nbclassic-${version}.tar.gz"
-checksum=f00b07ef4908fc38fd332d2676ccd3ceea5076528feaf21bd27e809ef20f5578
+checksum=99444dd63103af23c788d9b5172992f12caf8c3098dd5a35c787f0df31490c29
 # Tarball includes no tests
 make_check=no
 

From e4f81319cb81552ab584f8b4bed4650fd3fca0d2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 15 Jan 2022 16:57:01 +0100
Subject: [PATCH 0326/1427] python3-nbclient: update to 0.5.10

---
 srcpkgs/python3-nbclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template
index 1e48610db900..24f9242016fb 100644
--- a/srcpkgs/python3-nbclient/template
+++ b/srcpkgs/python3-nbclient/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-nbclient'
 pkgname=python3-nbclient
-version=0.5.9
+version=0.5.10
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://nbclient.readthedocs.io/en/latest/"
 distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz"
-checksum=99e46ddafacd0b861293bf246fed8540a184adfa3aa7d641f89031ec070701e0
+checksum=b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088
 # Package might need to be installed for testing
 make_check=no
 

From 797126329ea618d8f65a07468eb284f5d17ba4b6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 15 Jan 2022 16:57:44 +0100
Subject: [PATCH 0327/1427] python3-pyrsistent: update to 0.18.1

---
 srcpkgs/python3-pyrsistent/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template
index 2378ede51c65..277db966eaf1 100644
--- a/srcpkgs/python3-pyrsistent/template
+++ b/srcpkgs/python3-pyrsistent/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pyrsistent'
 pkgname=python3-pyrsistent
-version=0.18.0
-revision=2
+version=0.18.1
+revision=1
 wrksrc="pyrsistent-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-devel"
@@ -12,7 +12,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="MIT"
 homepage="https://github.com/tobgu/pyrsistent/"
 distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz"
-checksum=773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b
+checksum=d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96
 
 post_install() {
 	vlicense LICENSE.mit LICENSE

From 7ce62ad30427f04f5bfd155840ca3c5355affacc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 15 Jan 2022 22:04:03 +0100
Subject: [PATCH 0328/1427] perl-Net-SSLeay: fix cross

---
 srcpkgs/perl-Net-SSLeay/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 6f5fe4fa1649..b5471368a8c0 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,12 +1,10 @@
-nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/37615/steps/shell_3/logs/stdio"
-
 # Template file for 'perl-Net-SSLeay'
 pkgname=perl-Net-SSLeay
 version=1.92
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
-hostmakedepends="perl openssl"
+hostmakedepends="perl openssl openssl-devel"
 makedepends="perl zlib-devel openssl-devel"
 depends="perl"
 checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"

From 805d2b1c960ba59b1d05c47d9fb938f952dc6dae Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 15 Jan 2022 16:35:24 +0100
Subject: [PATCH 0329/1427] x42-plugins: update to 20220107.

---
 srcpkgs/x42-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index 5bd9bec91cfe..8df0ec803309 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20211016
+version=20220107
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/x42-plugins/x42-plugins-${version}.tar.xz"
-checksum=676957689c1e38f07d8563aecb6731d4ff7f08027e20c73b26d3c32808366e85
+checksum=fa5ce09114077ba9a889dde1e9acff8aab765cbe6f6f2334063493c0c06f7772
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From e431a4fff1f404ce9f3371529a096a46b3028066 Mon Sep 17 00:00:00 2001
From: jts <jtsims@pm.me>
Date: Tue, 4 Jan 2022 21:18:42 +0000
Subject: [PATCH 0330/1427] racket: re-enable cross-compilation

* remove nocross
* expound precise arch support (based on Racket's Chez Scheme support)
* remove unneeded musl deps
* enable documentation
---
 srcpkgs/racket/template | 55 ++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index fa837398b7c9..7123be16bc97 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,10 +1,12 @@
 # Template file for 'racket'
 pkgname=racket
 version=8.3
-revision=1
+revision=2
+archs="aarch64* armv6* armv7* i686* x86_64*"
+wrksrc=${pkgname}-${version}
 build_wrksrc=src
 build_style=gnu-configure
-configure_args="--enable-useprefix --disable-docs"
+configure_args="--enable-useprefix"
 hostmakedepends="gsfonts"
 makedepends="sqlite-devel gtk+3-devel"
 depends="gtk+3 libssl1.1"
@@ -15,28 +17,40 @@ homepage="http://racket-lang.org/"
 distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
 checksum=33dd0c20846c7c5fdf84af2dc250f765104ed33b5091be152a9f68f1e2541457
 nostrip=yes
-nocross=yes
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --enable-racket=/usr/bin/racket"
+	_chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
+
+	configure_args+=" --enable-racket=/usr/bin/racket
+ --enable-scheme=${_chezscheme_path}"
 	hostmakedepends+=" racket sqlite-devel"
-fi
 
-case "$XBPS_TARGET_MACHINE" in
-ppc*)
-	broken="hangs or segfaults";;
-*-musl)
-	makedepends+=" libucontext-devel";;
-esac
+	# Build ChezScheme for the host so we can use it to build Racket
+	# Using "--enable-racket=auto" above selects the wrong compiler toolchain
+	pre_build() {
+		# Make sure we don't get lost
+		_correct_position=$(pwd)
+		cd ${_chezscheme_path}/ChezScheme
 
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		export CFLAGS+=" -D_GNU_SOURCE"
-		export LIBS+=" -lucontext"
-		;;
-	esac
-}
+		# If this builds the wrong arch, Racket's automatic
+		# arch detection for the ChezScheme build has failed.
+		# See <Racket sourcedir>/src/ChezScheme/IMPLEMENTATION.md "Build System"
+		# and <Racket sourcedir>/src/ChezScheme/s/cmacros.ss "define-machine-types"
+		# for the "machine-type" variable that needs to be passed to rktboot/main.rkt
+		racket rktboot/main.rkt
+		# Make sure Chez builds natively
+		env CC="gcc" \
+		    AR="ar" \
+		    ARFLAGS="rc" \
+		    RANLIB="ranlib" \
+		    CFLAGS="-m${XBPS_WORDSIZE} -O2 -D_REENTRANT -pthread" \
+		    -LDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,--as-needed -L/usr/lib -rdynamic" \
+		    ./configure --disable-curses --disable-x11
+		make
+
+		cd ${_correct_position}
+	}
+fi
 
 post_install() {
 	vlicense LICENSE-libscheme.txt
@@ -47,9 +61,6 @@ racket-doc_package() {
 	short_desc+=" - documentation"
 	depends="racket>=${version}_${revision}"
 	pkg_install() {
-		# Remove once --disable-doc can be removed
-		echo "Documentation currently not available." \
-			> ${DESTDIR}/usr/share/doc/racket/no-doc.txt
 		vmove usr/share/doc/racket
 	}
 }

From 3cdd2e3ddb52de1ec1f43f45dcfc7f02663dbe75 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Jan 2022 15:12:49 +0100
Subject: [PATCH 0331/1427] New package: scooper-1.3

---
 srcpkgs/scooper/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/scooper/template

diff --git a/srcpkgs/scooper/template b/srcpkgs/scooper/template
new file mode 100644
index 000000000000..79972f3806a4
--- /dev/null
+++ b/srcpkgs/scooper/template
@@ -0,0 +1,16 @@
+# Template file for 'scooper'
+pkgname=scooper
+version=1.3
+revision=1
+build_style=gnu-configure
+make_build_target=all
+make_check_target=test
+hostmakedepends="pkg-config"
+makedepends="kcgi zlib-devel"
+checkdepends="litterbox"
+short_desc="Web interface for litterbox"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://git.causal.agency/scooper/"
+distfiles="https://git.causal.agency/scooper/snapshot/scooper-$version.tar.gz"
+checksum=8fa5dd6047290fba319dcd69d14e70e5efbe70cb5024224772fd5888cb457bfb

From 662d2208677025b41feee21a177fcbee3b4b6849 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Jan 2022 15:40:12 +0100
Subject: [PATCH 0332/1427] bmake: update to 20220112.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 3691468271d4..49cddbcefec3 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20211221
+version=20220112
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=c48476c1c52493e61a5342d7d8541608f7852244f3c74ffd7676b6537c475bfb
+checksum=4fa46b2266e40950e5a4dfb3ae349281e4c40f44adffa3096b22d7985ea5c138
 python_version=3
 
 do_configure() {

From f727c290c7b9e8884bb32f52e416aa5b8c1512e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Jan 2022 15:44:30 +0100
Subject: [PATCH 0333/1427] byacc: update to 20220114.

---
 srcpkgs/byacc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 4a26370a6274..0cebd5096ce0 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
 # Template file for 'byacc'
 pkgname=byacc
-version=20220109
+version=20220114
 revision=1
 build_style=gnu-configure
 configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://invisible-island.net/byacc/"
 distfiles="ftp://ftp.invisible-island.net/${pkgname}/${pkgname}-${version}.tgz"
-checksum=98966bc5e6558f5ee50c7b33ee3e0a75efc15dd99cc96739d1ac1af9c1a43535
+checksum=d131475970018ab03531ce1bac21a8deba0eea23a4ecc051b54c850dad69e479
 
 alternatives="
  yacc:yacc:/usr/bin/byacc

From 989e63a2c66e88688d1f5cb297fdc9c74fbcd0e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Jan 2022 15:47:39 +0100
Subject: [PATCH 0334/1427] collectl: update to 4.3.2.

---
 srcpkgs/collectl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index 59af99c7a5da..9ade016be223 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,7 +1,8 @@
 # Template file for 'collectl'
 pkgname=collectl
-version=4.3.1
-revision=2
+version=4.3.2
+revision=1
+wrksrc="${pkgname}"
 conf_files="/etc/collectl.conf"
 depends="perl perl-Term-ReadKey"
 short_desc="Collects data that describes the current system status"
@@ -10,7 +11,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only"
 homepage="http://collectl.sourceforge.net/"
 changelog="http://collectl.sourceforge.net/Releases.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz"
-checksum=2187264d974b36a653c8a4b028ac6eeab23e1885f8b2563a33f06358f39889f1
+checksum=9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750
 
 do_install() {
 	export DESTDIR

From a8d749563dc31792981bd16be2493b0568c09167 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Jan 2022 15:49:13 +0100
Subject: [PATCH 0335/1427] xsnow: update to 3.4.3.

---
 srcpkgs/xsnow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index aa5ed301a29c..51243b7d2dcb 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,6 +1,6 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=3.4.2
+version=3.4.3
 revision=1
 build_style=gnu-configure
 build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
-checksum=c618d7a73cef7070755f38ddc3665487afa8c71a9c82ae9055723e594a62fd9e
+checksum=a0d5031c9a91303006cb9c8719b991302c02c36ec502c66e00b40b4a93aaddb0
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then

From 86d4f6dffc2c07cdf2518fc391aced789d275e98 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Jan 2022 17:16:56 +0100
Subject: [PATCH 0336/1427] expat: update to 2.4.3.

---
 srcpkgs/expat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 57731af8a6df..d2111d4e6244 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,6 +1,6 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-configure
 short_desc="XML parser library written in C"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://libexpat.github.io/"
 distfiles="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz"
-checksum=bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199
+checksum=b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a
 
 post_install() {
 	vlicense COPYING

From fa85d4b297208355e08c4bb1f382a69773f4bb3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:14:28 +0100
Subject: [PATCH 0337/1427] SoapySDR: add missing python3 dependency

---
 srcpkgs/SoapySDR/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template
index 94e76916ef10..5d20a91a7bc8 100644
--- a/srcpkgs/SoapySDR/template
+++ b/srcpkgs/SoapySDR/template
@@ -1,12 +1,13 @@
 # Template file for 'SoapySDR'
 pkgname=SoapySDR
 version=0.7.2
-revision=3
+revision=4
 wrksrc="${pkgname}-soapy-sdr-${version}"
 build_style=cmake
 configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3"
 hostmakedepends="doxygen swig python3"
 makedepends="python3-devel"
+depends="python3"
 short_desc="Vendor and platform neutral SDR support library"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="BSL-1.0"

From 7e1aa7092757572dab370b89cbbf5cb19f14cf38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:14:28 +0100
Subject: [PATCH 0338/1427] LabJackPython: add missing python3 dependency

---
 srcpkgs/LabJackPython/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LabJackPython/template b/srcpkgs/LabJackPython/template
index 5d550b465c26..50b91a21f3e0 100644
--- a/srcpkgs/LabJackPython/template
+++ b/srcpkgs/LabJackPython/template
@@ -1,10 +1,10 @@
 # Template file for 'LabJackPython'
 pkgname=LabJackPython
 version=2.0.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3"
-depends="exodriver"
+depends="python3 exodriver"
 short_desc="Python modules and examples for the LabJack U3, U6, UE9 and U12"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 38aa4bdfd05cf5a4dabc4f1fa6362558c8e7015d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:14:52 +0100
Subject: [PATCH 0339/1427] compizconfig-python: add missing python3 dependency

---
 srcpkgs/compizconfig-python/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
index aef631800dd5..7cc80a46acf0 100644
--- a/srcpkgs/compizconfig-python/template
+++ b/srcpkgs/compizconfig-python/template
@@ -1,13 +1,14 @@
 # Template file for 'compizconfig-python'
 pkgname=compizconfig-python
 version=0.8.18
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config glib-devel gettext-devel
  python3-Cython which"
 makedepends="libSM-devel libcompizconfig-devel libxml++-devel
  protobuf-devel python3-devel startup-notification-devel"
+depends="python3"
 short_desc="Compiz configuration system library for Compiz Reloaded"
 maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-2.0-or-later"

From b1b771f358eb2441a0f335069c1d20013c415de4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:14:52 +0100
Subject: [PATCH 0340/1427] distcc: add missing python3 dependency

---
 srcpkgs/distcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 4766512fa501..7a6c2483b575 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,7 +1,7 @@
 # Template file for 'distcc'
 pkgname=distcc
 version=3.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-Werror --with-gtk"
 conf_files="
@@ -66,7 +66,7 @@ distcc-gtk_package() {
 distcc-pump_package() {
 	depends="distcc-${version}_${revision}"
 	short_desc+=" - Pump mode support files"
-	pycompile_module="include_server"
+	depends="python3"
 	pkg_install() {
 		vmove usr/bin/pump
 		vmove usr/share/man/man1/pump.1.gz

From e1330863a7a674ec155ce83a758481387f928ca0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:15:09 +0100
Subject: [PATCH 0341/1427] geis: add missing python3 dependency

---
 srcpkgs/geis/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index 9f4fdba8dd38..b7f78fd42a2a 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,7 +1,7 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=9
+revision=10
 build_style="gnu-configure"
 configure_args="--disable-static"
 hostmakedepends="pkg-config python3-devel"
@@ -28,6 +28,7 @@ geis-devel_package() {
 }
 geis-python3_package() {
 	short_desc+=" - Python3 bindings"
+	depends="python3"
 	pkg_install() {
 		vmove usr/bin/pygeis
 		vmove usr/share/man/man1/pygeis.1

From 016626cf60671786874019001a437bca6f0d678f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:15:09 +0100
Subject: [PATCH 0342/1427] pyliblo: add missing python3 dependency

---
 srcpkgs/pyliblo/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template
index d83804d7c05c..de7f1bd20b24 100644
--- a/srcpkgs/pyliblo/template
+++ b/srcpkgs/pyliblo/template
@@ -1,11 +1,12 @@
 # Template file for 'pyliblo'
 pkgname=pyliblo
 version=0.10.0
-revision=1
+revision=2
 wrksrc="pyliblo-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel liblo-devel"
+depends="python3"
 short_desc="Python bindings for the liblo OSC library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From d600478146bd763543353fbe1124cad82e90cdc0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 10 Jan 2022 19:16:15 +0100
Subject: [PATCH 0343/1427] gnome-passbook: add missing dependencies

---
 srcpkgs/gnome-passbook/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7a53e1d218ad..7348a1944502 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -1,12 +1,13 @@
 # Template file for 'gnome-passbook'
 pkgname=gnome-passbook
 version=0.8
-revision=2
+revision=3
 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 wrksrc="passbook-${version}"
 build_style=meson
 hostmakedepends="glib-devel pkg-config"
 makedepends="gobject-introspection gtk+3-devel libglib-devel"
+depends="python3-pykeepass python3-gobject gtk+3"
 short_desc="Password manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later"

From 7a63195b4d09b872979f7a9db661e43d55286042 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Jan 2022 17:41:28 +0100
Subject: [PATCH 0344/1427] compizconfig-python: add missing libXdamage build
 dep

---
 srcpkgs/compizconfig-python/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template
index 7cc80a46acf0..ad5a646c077a 100644
--- a/srcpkgs/compizconfig-python/template
+++ b/srcpkgs/compizconfig-python/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config glib-devel gettext-devel
  python3-Cython which"
 makedepends="libSM-devel libcompizconfig-devel libxml++-devel
- protobuf-devel python3-devel startup-notification-devel"
+ protobuf-devel python3-devel startup-notification-devel libXdamage-devel"
 depends="python3"
 short_desc="Compiz configuration system library for Compiz Reloaded"
 maintainer="CoolOhm <micvlas@gmail.com>"

From 1abe37d987fd9e3afa8676a6d289cf0e578ab4e9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 16 Jan 2022 11:23:19 -0500
Subject: [PATCH 0345/1427] python3-pamqp: update to 3.1.0.

---
 srcpkgs/python3-pamqp/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pamqp/template b/srcpkgs/python3-pamqp/template
index 5e063c62f43f..1a22fec84fad 100644
--- a/srcpkgs/python3-pamqp/template
+++ b/srcpkgs/python3-pamqp/template
@@ -1,17 +1,18 @@
 # Template file for 'python3-pamqp'
 pkgname=python3-pamqp
-version=2.3.0
-revision=3
+version=3.1.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Low-level AMQP 0-9-1 frame encoding/decoding for Python"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/gmr/pamqp"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9c69844d2f587fcb8f086490ad5e4d629dc94ad3b25efd898dacb387aac453e0
+checksum=9fc37561f68bde122e2a86ddb8caf9c758d9780519ee2bdcc1d3ce3a34941e3f
 
 post_install() {
 	vlicense LICENSE

From 4cf0d8117dcba691045788dc8ecd1ca917981e11 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 16 Jan 2022 12:00:52 -0500
Subject: [PATCH 0346/1427] python3-aioamqp: patch for python3-pamqp-3.1.0

---
 .../patches/01-python-3.10.patch              | 345 +++++++++++++
 .../patches/02-pamqp-3.1.0.patch              | 469 ++++++++++++++++++
 srcpkgs/python3-aioamqp/template              |   4 +-
 3 files changed, 817 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
 create mode 100644 srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch

diff --git a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch b/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
new file mode 100644
index 000000000000..8d369bf7a6db
--- /dev/null
+++ b/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
@@ -0,0 +1,345 @@
+From a3ab4768a13540e8c8f566bca990a98f96cb3802 Mon Sep 17 00:00:00 2001
+From: dzen <benoit.calvez@polyconseil.fr>
+Date: Thu, 5 Mar 2020 14:40:50 +0100
+Subject: [PATCH 1/2] Support newer Python
+
+Combines upstream commits to suppress asyncio deprecations:
+- f004c52
+- 388d38f
+- 0cdfe91
+- b4f0120
+- 23d84ca
+---
+ .travis.yml                            |  6 ++---
+ Dockerfile                             |  2 +-
+ aioamqp/__init__.py                    |  4 ++--
+ aioamqp/channel.py                     |  4 ++--
+ aioamqp/protocol.py                    | 33 ++++++++++++++------------
+ aioamqp/tests/test_basic.py            |  2 +-
+ aioamqp/tests/test_connection_close.py |  2 +-
+ aioamqp/tests/test_connection_lost.py  |  2 +-
+ aioamqp/tests/test_protocol.py         |  4 ++--
+ docs/changelog.rst                     |  4 ++++
+ docs/introduction.rst                  |  2 +-
+ setup.cfg                              |  2 +-
+ setup.py                               |  2 +-
+ tox.ini                                |  2 +-
+ 14 files changed, 39 insertions(+), 32 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 1069e7c..9d6e4ef 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,10 +1,10 @@
+ language: python
+-dist: bionic
++dist: focal
+ python:
+-- 3.5
+ - 3.6
+-- 3.7-dev
++- 3.7
+ - 3.8
++- 3.9
+ services:
+ - rabbitmq
+ env:
+diff --git a/Dockerfile b/Dockerfile
+index 7ec4545..1ea92f1 100644
+--- a/Dockerfile
++++ b/Dockerfile
+@@ -1,4 +1,4 @@
+-FROM python:3.5
++FROM python:3.9
+ 
+ WORKDIR /usr/src/app
+ 
+diff --git a/aioamqp/__init__.py b/aioamqp/__init__.py
+index 3e67936..030e7db 100644
+--- a/aioamqp/__init__.py
++++ b/aioamqp/__init__.py
+@@ -10,7 +10,7 @@ from .version import __packagename__
+ 
+ 
+ async def connect(host='localhost', port=None, login='guest', password='guest',
+-            virtualhost='/', ssl=None, login_method='AMQPLAIN', insist=False,
++            virtualhost='/', ssl=None, login_method='PLAIN', insist=False,
+             protocol_factory=AmqpProtocol, *, loop=None, **kwargs):
+     """Convenient method to connect to an AMQP broker
+ 
+@@ -69,7 +69,7 @@ async def connect(host='localhost', port=None, login='guest', password='guest',
+ 
+ 
+ async def from_url(
+-        url, login_method='AMQPLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
++        url, login_method='PLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
+     """ Connect to the AMQP using a single url parameter and return the client.
+ 
+         For instance:
+diff --git a/aioamqp/channel.py b/aioamqp/channel.py
+index 7f0f402..b58bd5a 100644
+--- a/aioamqp/channel.py
++++ b/aioamqp/channel.py
+@@ -31,7 +31,7 @@ class Channel:
+         self.cancellation_callbacks = []
+         self.return_callback = return_callback
+         self.response_future = None
+-        self.close_event = asyncio.Event(loop=self._loop)
++        self.close_event = asyncio.Event()
+         self.cancelled_consumers = set()
+         self.last_consumer_tag = None
+         self.publisher_confirms = False
+@@ -518,7 +518,7 @@ class Channel:
+         }
+         future = self._get_waiter('basic_consume' + ctag)
+         future.set_result(results)
+-        self._ctag_events[ctag] = asyncio.Event(loop=self._loop)
++        self._ctag_events[ctag] = asyncio.Event()
+ 
+     async def basic_deliver(self, frame):
+         consumer_tag = frame.consumer_tag
+diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
+index ddf1285..4938833 100644
+--- a/aioamqp/protocol.py
++++ b/aioamqp/protocol.py
+@@ -79,8 +79,8 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+             self.connection_tunning['heartbeat'] = kwargs.get('heartbeat')
+ 
+         self.connecting = asyncio.Future(loop=self._loop)
+-        self.connection_closed = asyncio.Event(loop=self._loop)
+-        self.stop_now = asyncio.Future(loop=self._loop)
++        self.connection_closed = asyncio.Event()
++        self.stop_now = asyncio.Event()
+         self.state = CONNECTING
+         self.version_major = None
+         self.version_minor = None
+@@ -91,14 +91,14 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         self.server_heartbeat = None
+         self._heartbeat_timer_recv = None
+         self._heartbeat_timer_send = None
+-        self._heartbeat_trigger_send = asyncio.Event(loop=self._loop)
++        self._heartbeat_trigger_send = asyncio.Event()
+         self._heartbeat_worker = None
+         self.channels = {}
+         self.server_frame_max = None
+         self.server_channel_max = None
+         self.channels_ids_ceil = 0
+         self.channels_ids_free = set()
+-        self._drain_lock = asyncio.Lock(loop=self._loop)
++        self._drain_lock = asyncio.Lock()
+ 
+     def connection_made(self, transport):
+         super().connection_made(transport)
+@@ -171,16 +171,13 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+             await self.wait_closed(timeout=timeout)
+ 
+     async def wait_closed(self, timeout=None):
+-        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout, loop=self._loop)
++        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout)
+         if self._heartbeat_worker is not None:
+             try:
+-                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout, loop=self._loop)
++                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout)
+             except asyncio.CancelledError:
+                 pass
+ 
+-    async def close_ok(self, frame):
+-        self._stream_writer.close()
+-
+     async def start_connection(self, host, port, login, password, virtualhost, ssl=False,
+             login_method='PLAIN', insist=False):
+         """Initiate a connection at the protocol level
+@@ -188,7 +185,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         """
+ 
+         if login_method != 'PLAIN':
+-            logger.warning('only PLAIN login_method is supported, falling back to AMQPLAIN')
++            logger.warning('login_method %s is not supported, falling back to PLAIN', login_method)
+ 
+         self._stream_writer.write(amqp_constants.PROTOCOL_HEADER)
+ 
+@@ -311,12 +308,12 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+             channel.connection_closed(reply_code, reply_text, exception)
+ 
+     async def run(self):
+-        while not self.stop_now.done():
++        while not self.stop_now.is_set():
+             try:
+                 await self.dispatch_frame()
+             except exceptions.AmqpClosedConnection as exc:
+                 logger.info("Close connection")
+-                self.stop_now.set_result(None)
++                self.stop_now.set()
+ 
+                 self._close_channels(exception=exc)
+             except Exception:  # pylint: disable=broad-except
+@@ -329,7 +326,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         the rest of the AmqpProtocol class.  This is kept around for backwards
+         compatibility purposes only.
+         """
+-        await self.stop_now
++        await self.stop_now.wait()
+ 
+     async def send_heartbeat(self):
+         """Sends an heartbeat message.
+@@ -403,6 +400,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         )
+         await self._write_frame(0, request)
+ 
++    async def close_ok(self, frame):
++        """In response to server close confirmation"""
++        self.stop_now.set()
++        self._stream_writer.close()
++
+     async def server_close(self, frame):
+         """The server is closing the connection"""
+         self.state = CLOSING
+@@ -414,6 +416,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+             reply_text, reply_code, class_id, method_id)
+         self._close_channels(reply_code, reply_text)
+         await self._close_ok()
++        self.stop_now.set()
+         self._stream_writer.close()
+ 
+     async def _close_ok(self):
+@@ -456,11 +459,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         await self.ensure_open()
+         try:
+             channel_id = self.channels_ids_free.pop()
+-        except KeyError:
++        except KeyError as ex:
+             assert self.server_channel_max is not None, 'connection channel-max tuning not performed'
+             # channel-max = 0 means no limit
+             if self.server_channel_max and self.channels_ids_ceil > self.server_channel_max:
+-                raise exceptions.NoChannelAvailable()
++                raise exceptions.NoChannelAvailable() from ex
+             self.channels_ids_ceil += 1
+             channel_id = self.channels_ids_ceil
+         channel = self.CHANNEL_FACTORY(self, channel_id, **kwargs)
+diff --git a/aioamqp/tests/test_basic.py b/aioamqp/tests/test_basic.py
+index d59ce19..00ec880 100644
+--- a/aioamqp/tests/test_basic.py
++++ b/aioamqp/tests/test_basic.py
+@@ -58,7 +58,7 @@ class BasicCancelTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
+ 
+         result = await self.channel.publish("payload", exchange_name, routing_key='')
+ 
+-        await asyncio.sleep(5, loop=self.loop)
++        await asyncio.sleep(5)
+ 
+         result = await self.channel.queue_declare(queue_name, passive=True)
+         self.assertEqual(result['message_count'], 1)
+diff --git a/aioamqp/tests/test_connection_close.py b/aioamqp/tests/test_connection_close.py
+index 9491548..c5d4188 100644
+--- a/aioamqp/tests/test_connection_close.py
++++ b/aioamqp/tests/test_connection_close.py
+@@ -22,7 +22,7 @@ class CloseTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
+             # TODO: remove with python <3.4.4 support
+             self.assertTrue(transport._closing)
+         # make sure those 2 tasks/futures are properly set as finished
+-        await amqp.stop_now
++        await amqp.stop_now.wait()
+         await amqp.worker
+ 
+     async def test_multiple_close(self):
+diff --git a/aioamqp/tests/test_connection_lost.py b/aioamqp/tests/test_connection_lost.py
+index 21c7819..d16d51b 100644
+--- a/aioamqp/tests/test_connection_lost.py
++++ b/aioamqp/tests/test_connection_lost.py
+@@ -24,7 +24,7 @@ class ConnectionLostTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
+         self.assertEqual(amqp.state, OPEN)
+         self.assertTrue(channel.is_open)
+         amqp._stream_reader._transport.close()  # this should have the same effect as the tcp connection being lost
+-        await asyncio.wait_for(amqp.worker, 1, loop=self.loop)
++        await asyncio.wait_for(amqp.worker, 1)
+         self.assertEqual(amqp.state, CLOSED)
+         self.assertFalse(channel.is_open)
+         self.assertTrue(self.callback_called)
+diff --git a/aioamqp/tests/test_protocol.py b/aioamqp/tests/test_protocol.py
+index 766a5d9..80d4187 100644
+--- a/aioamqp/tests/test_protocol.py
++++ b/aioamqp/tests/test_protocol.py
+@@ -55,7 +55,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
+             connect.assert_called_once_with(
+                 insist=False,
+                 password='pass',
+-                login_method='AMQPLAIN',
++                login_method='PLAIN',
+                 login='tom',
+                 host='example.com',
+                 protocol_factory=AmqpProtocol,
+@@ -74,7 +74,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
+             connect.assert_called_once_with(
+                 insist=False,
+                 password='pass',
+-                login_method='AMQPLAIN',
++                login_method='PLAIN',
+                 ssl=ssl_context,
+                 login='tom',
+                 host='example.com',
+diff --git a/docs/changelog.rst b/docs/changelog.rst
+index 0939ca4..8ac4f7b 100644
+--- a/docs/changelog.rst
++++ b/docs/changelog.rst
+@@ -4,6 +4,10 @@ Changelog
+ Next release
+ ------------
+ 
++ * Add support for Python 3.9.
++ * Drop support for Python 3.5.
++ * Fix annoying auth method warning because of a wrong defined default argument (closes #214).
++
+ Aioamqp 0.14.0
+ --------------
+ 
+diff --git a/docs/introduction.rst b/docs/introduction.rst
+index ec86f61..d0e183a 100644
+--- a/docs/introduction.rst
++++ b/docs/introduction.rst
+@@ -7,7 +7,7 @@ Aioamqp library is a pure-Python implementation of the AMQP 0.9.1 protocol using
+ Prerequisites
+ -------------
+ 
+-Aioamqp works only with python >= 3.5 using asyncio library.
++Aioamqp works only with python >= 3.6 using asyncio library.
+ 
+ Installation
+ ------------
+diff --git a/setup.cfg b/setup.cfg
+index 0ab7d0b..9a9f5ab 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,2 +1,2 @@
+ [bdist_wheel]
+-python-tag = py35.py36.py37.py38
++python-tag = py36.py37.py38.py39
+diff --git a/setup.py b/setup.py
+index a740243..ea0e79f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,10 +34,10 @@ setuptools.setup(
+         "Operating System :: OS Independent",
+         "Programming Language :: Python",
+         "Programming Language :: Python :: 3",
+-        "Programming Language :: Python :: 3.5",
+         "Programming Language :: Python :: 3.6",
+         "Programming Language :: Python :: 3.7",
+         "Programming Language :: Python :: 3.8",
++        "Programming Language :: Python :: 3.9",
+     ],
+     platforms='all',
+     license='BSD'
+diff --git a/tox.ini b/tox.ini
+index 127cc7b..a1f5fcd 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = py35, py36, py37, py38
++envlist = py36, py37, py38, py39
+ skipsdist = true
+ skip_missing_interpreters = true
+ 
+-- 
+2.34.1
+
diff --git a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch b/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
new file mode 100644
index 000000000000..6f604f6746e4
--- /dev/null
+++ b/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
@@ -0,0 +1,469 @@
+From bb59736dc0127f3bd5b632d0531058f7d98384f1 Mon Sep 17 00:00:00 2001
+From: dzen <benoit.calvez@polyconseil.fr>
+Date: Thu, 12 Mar 2020 08:32:29 +0100
+Subject: [PATCH 2/2] Require pamqp 3.1.0
+
+Combines upstream commits:
+- 6de2e1a
+- 95cb160
+- 9f08434
+---
+ aioamqp/channel.py        | 114 +++++++++++++++++++-------------------
+ aioamqp/frame.py          |   1 -
+ aioamqp/properties.py     |   6 +-
+ aioamqp/protocol.py       |  22 ++++----
+ aioamqp/tests/testcase.py |   2 +-
+ setup.py                  |   3 +-
+ 6 files changed, 76 insertions(+), 72 deletions(-)
+
+diff --git a/aioamqp/channel.py b/aioamqp/channel.py
+index b58bd5a..b87392d 100644
+--- a/aioamqp/channel.py
++++ b/aioamqp/channel.py
+@@ -9,7 +9,7 @@ import io
+ from itertools import count
+ import warnings
+ 
+-import pamqp.specification
++import pamqp.commands
+ 
+ from . import frame as amqp_frame
+ from . import exceptions
+@@ -78,35 +78,35 @@ class Channel:
+ 
+     async def dispatch_frame(self, frame):
+         methods = {
+-            pamqp.specification.Channel.OpenOk.name: self.open_ok,
+-            pamqp.specification.Channel.FlowOk.name: self.flow_ok,
+-            pamqp.specification.Channel.CloseOk.name: self.close_ok,
+-            pamqp.specification.Channel.Close.name: self.server_channel_close,
+-
+-            pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok,
+-            pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok,
+-            pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok,
+-            pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok,
+-
+-            pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok,
+-            pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok,
+-            pamqp.specification.Queue.BindOk.name: self.queue_bind_ok,
+-            pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok,
+-            pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok,
+-
+-            pamqp.specification.Basic.QosOk.name: self.basic_qos_ok,
+-            pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok,
+-            pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok,
+-            pamqp.specification.Basic.GetOk.name: self.basic_get_ok,
+-            pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty,
+-            pamqp.specification.Basic.Deliver.name: self.basic_deliver,
+-            pamqp.specification.Basic.Cancel.name: self.server_basic_cancel,
+-            pamqp.specification.Basic.Ack.name: self.basic_server_ack,
+-            pamqp.specification.Basic.Nack.name: self.basic_server_nack,
+-            pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok,
+-            pamqp.specification.Basic.Return.name: self.basic_return,
+-
+-            pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok,
++            pamqp.commands.Channel.OpenOk.name: self.open_ok,
++            pamqp.commands.Channel.FlowOk.name: self.flow_ok,
++            pamqp.commands.Channel.CloseOk.name: self.close_ok,
++            pamqp.commands.Channel.Close.name: self.server_channel_close,
++
++            pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok,
++            pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok,
++            pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok,
++            pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok,
++
++            pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok,
++            pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok,
++            pamqp.commands.Queue.BindOk.name: self.queue_bind_ok,
++            pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok,
++            pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok,
++
++            pamqp.commands.Basic.QosOk.name: self.basic_qos_ok,
++            pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok,
++            pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok,
++            pamqp.commands.Basic.GetOk.name: self.basic_get_ok,
++            pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty,
++            pamqp.commands.Basic.Deliver.name: self.basic_deliver,
++            pamqp.commands.Basic.Cancel.name: self.server_basic_cancel,
++            pamqp.commands.Basic.Ack.name: self.basic_server_ack,
++            pamqp.commands.Basic.Nack.name: self.basic_server_nack,
++            pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok,
++            pamqp.commands.Basic.Return.name: self.basic_return,
++
++            pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok,
+         }
+ 
+         if frame.name not in methods:
+@@ -144,7 +144,7 @@ class Channel:
+ 
+     async def open(self):
+         """Open the channel on the server."""
+-        request = pamqp.specification.Channel.Open()
++        request = pamqp.commands.Channel.Open()
+         return (await self._write_frame_awaiting_response(
+             'open', self.channel_id, request, no_wait=False, check_open=False))
+ 
+@@ -159,7 +159,7 @@ class Channel:
+         if not self.is_open:
+             raise exceptions.ChannelClosed("channel already closed or closing")
+         self.close_event.set()
+-        request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
++        request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
+         return (await self._write_frame_awaiting_response(
+             'close', self.channel_id, request, no_wait=False, check_open=False))
+ 
+@@ -169,7 +169,7 @@ class Channel:
+         self.protocol.release_channel_id(self.channel_id)
+ 
+     async def _send_channel_close_ok(self):
+-        request = pamqp.specification.Channel.CloseOk()
++        request = pamqp.commands.Channel.CloseOk()
+         await self._write_frame(self.channel_id, request)
+ 
+     async def server_channel_close(self, frame):
+@@ -183,7 +183,7 @@ class Channel:
+         self.connection_closed(results['reply_code'], results['reply_text'])
+ 
+     async def flow(self, active):
+-        request = pamqp.specification.Channel.Flow(active)
++        request = pamqp.commands.Channel.Flow(active)
+         return (await self._write_frame_awaiting_response(
+             'flow', self.channel_id, request, no_wait=False,
+             check_open=False))
+@@ -201,7 +201,7 @@ class Channel:
+ 
+     async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False,
+                          auto_delete=False, no_wait=False, arguments=None):
+-        request = pamqp.specification.Exchange.Declare(
++        request = pamqp.commands.Exchange.Declare(
+             exchange=exchange_name,
+             exchange_type=type_name,
+             passive=passive,
+@@ -222,7 +222,7 @@ class Channel:
+         return future
+ 
+     async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False):
+-        request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
++        request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
+         return await self._write_frame_awaiting_response(
+             'exchange_delete', self.channel_id, request, no_wait)
+ 
+@@ -235,7 +235,7 @@ class Channel:
+                       no_wait=False, arguments=None):
+         if arguments is None:
+             arguments = {}
+-        request = pamqp.specification.Exchange.Bind(
++        request = pamqp.commands.Exchange.Bind(
+             destination=exchange_destination,
+             source=exchange_source,
+             routing_key=routing_key,
+@@ -255,7 +255,7 @@ class Channel:
+         if arguments is None:
+             arguments = {}
+ 
+-        request = pamqp.specification.Exchange.Unbind(
++        request = pamqp.commands.Exchange.Unbind(
+             destination=exchange_destination,
+             source=exchange_source,
+             routing_key=routing_key,
+@@ -297,7 +297,7 @@ class Channel:
+ 
+         if not queue_name:
+             queue_name = 'aioamqp.gen-' + str(uuid.uuid4())
+-        request = pamqp.specification.Queue.Declare(
++        request = pamqp.commands.Queue.Declare(
+             queue=queue_name,
+             passive=passive,
+             durable=durable,
+@@ -327,7 +327,7 @@ class Channel:
+                if_empty:       bool, the queue is deleted if it has no messages. Raise if not.
+                no_wait:        bool, if set, the server will not respond to the method
+         """
+-        request = pamqp.specification.Queue.Delete(
++        request = pamqp.commands.Queue.Delete(
+             queue=queue_name,
+             if_unused=if_unused,
+             if_empty=if_empty,
+@@ -346,7 +346,7 @@ class Channel:
+         if arguments is None:
+             arguments = {}
+ 
+-        request = pamqp.specification.Queue.Bind(
++        request = pamqp.commands.Queue.Bind(
+             queue=queue_name,
+             exchange=exchange_name,
+             routing_key=routing_key,
+@@ -367,7 +367,7 @@ class Channel:
+         if arguments is None:
+             arguments = {}
+ 
+-        request = pamqp.specification.Queue.Unbind(
++        request = pamqp.commands.Queue.Unbind(
+             queue=queue_name,
+             exchange=exchange_name,
+             routing_key=routing_key,
+@@ -383,7 +383,7 @@ class Channel:
+         logger.debug("Queue unbound")
+ 
+     async def queue_purge(self, queue_name, no_wait=False):
+-        request = pamqp.specification.Queue.Purge(
++        request = pamqp.commands.Queue.Purge(
+             queue=queue_name, nowait=no_wait
+         )
+         return (await self._write_frame_awaiting_response(
+@@ -406,7 +406,7 @@ class Channel:
+         if properties is None:
+             properties = {}
+ 
+-        method_request = pamqp.specification.Basic.Publish(
++        method_request = pamqp.commands.Basic.Publish(
+             exchange=exchange_name,
+             routing_key=routing_key,
+             mandatory=mandatory,
+@@ -417,7 +417,7 @@ class Channel:
+ 
+         header_request = pamqp.header.ContentHeader(
+             body_size=len(payload),
+-            properties=pamqp.specification.Basic.Properties(**properties)
++            properties=pamqp.commands.Basic.Properties(**properties)
+         )
+         await self._write_frame(self.channel_id, header_request, drain=False)
+ 
+@@ -446,7 +446,7 @@ class Channel:
+                                 settings should apply per-consumer channel; and global=true to mean
+                                 that the QoS settings should apply per-channel.
+         """
+-        request = pamqp.specification.Basic.Qos(
++        request = pamqp.commands.Basic.Qos(
+             prefetch_size, prefetch_count, connection_global
+         )
+         return (await self._write_frame_awaiting_response(
+@@ -490,7 +490,7 @@ class Channel:
+         if arguments is None:
+             arguments = {}
+ 
+-        request = pamqp.specification.Basic.Consume(
++        request = pamqp.commands.Basic.Consume(
+             queue=queue_name,
+             consumer_tag=consumer_tag,
+             no_local=no_local,
+@@ -561,7 +561,7 @@ class Channel:
+                              callback, error)
+ 
+     async def basic_cancel(self, consumer_tag, no_wait=False):
+-        request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait)
++        request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait)
+         return (await self._write_frame_awaiting_response(
+             'basic_cancel', self.channel_id, request, no_wait=no_wait)
+         )
+@@ -575,7 +575,7 @@ class Channel:
+         logger.debug("Cancel ok")
+ 
+     async def basic_get(self, queue_name='', no_ack=False):
+-        request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack)
++        request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack)
+         return (await self._write_frame_awaiting_response(
+             'basic_get', self.channel_id, request, no_wait=False)
+         )
+@@ -606,11 +606,11 @@ class Channel:
+         future.set_exception(exceptions.EmptyQueue)
+ 
+     async def basic_client_ack(self, delivery_tag, multiple=False):
+-        request = pamqp.specification.Basic.Ack(delivery_tag, multiple)
++        request = pamqp.commands.Basic.Ack(delivery_tag, multiple)
+         await self._write_frame(self.channel_id, request)
+ 
+     async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True):
+-        request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue)
++        request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue)
+         await self._write_frame(self.channel_id, request)
+ 
+     async def basic_server_ack(self, frame):
+@@ -620,15 +620,15 @@ class Channel:
+         fut.set_result(True)
+ 
+     async def basic_reject(self, delivery_tag, requeue=False):
+-        request = pamqp.specification.Basic.Reject(delivery_tag, requeue)
++        request = pamqp.commands.Basic.Reject(delivery_tag, requeue)
+         await self._write_frame(self.channel_id, request)
+ 
+     async def basic_recover_async(self, requeue=True):
+-        request = pamqp.specification.Basic.RecoverAsync(requeue)
++        request = pamqp.commands.Basic.RecoverAsync(requeue)
+         await self._write_frame(self.channel_id, request)
+ 
+     async def basic_recover(self, requeue=True):
+-        request = pamqp.specification.Basic.Recover(requeue)
++        request = pamqp.commands.Basic.Recover(requeue)
+         return (await self._write_frame_awaiting_response(
+             'basic_recover', self.channel_id, request, no_wait=False)
+         )
+@@ -681,7 +681,7 @@ class Channel:
+             delivery_tag = next(self.delivery_tag_iter)  # pylint: disable=stop-iteration-return
+             fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag))
+ 
+-        method_request = pamqp.specification.Basic.Publish(
++        method_request = pamqp.commands.Basic.Publish(
+             exchange=exchange_name,
+             routing_key=routing_key,
+             mandatory=mandatory,
+@@ -689,7 +689,7 @@ class Channel:
+         )
+         await self._write_frame(self.channel_id, method_request, drain=False)
+ 
+-        properties = pamqp.specification.Basic.Properties(**properties)
++        properties = pamqp.commands.Basic.Properties(**properties)
+         header_request = pamqp.header.ContentHeader(
+             body_size=len(payload), properties=properties
+         )
+@@ -710,7 +710,7 @@ class Channel:
+     async def confirm_select(self, *, no_wait=False):
+         if self.publisher_confirms:
+             raise ValueError('publisher confirms already enabled')
+-        request = pamqp.specification.Confirm.Select(nowait=no_wait)
++        request = pamqp.commands.Confirm.Select(nowait=no_wait)
+ 
+         return (await self._write_frame_awaiting_response(
+             'confirm_select', self.channel_id, request, no_wait)
+diff --git a/aioamqp/frame.py b/aioamqp/frame.py
+index d70cfd7..af27ab5 100644
+--- a/aioamqp/frame.py
++++ b/aioamqp/frame.py
+@@ -42,7 +42,6 @@ import asyncio
+ import socket
+ 
+ import pamqp.encode
+-import pamqp.specification
+ import pamqp.frame
+ 
+ from . import exceptions
+diff --git a/aioamqp/properties.py b/aioamqp/properties.py
+index 56a3484..4232040 100644
+--- a/aioamqp/properties.py
++++ b/aioamqp/properties.py
+@@ -1,4 +1,6 @@
+ # pylint: disable=redefined-builtin
++import datetime
++
+ from .constants import MESSAGE_PROPERTIES
+ 
+ 
+@@ -37,7 +39,9 @@ def from_pamqp(instance):
+     props.reply_to = instance.reply_to
+     props.expiration = instance.expiration
+     props.message_id = instance.message_id
+-    props.timestamp = instance.timestamp
++    if instance.timestamp is not None:
++        # pamqp uses naive datetimes representing UTC, let's use TZ-aware datetimes
++        props.timestamp = instance.timestamp.replace(tzinfo=datetime.timezone.utc)
+     props.message_type = instance.message_type
+     props.user_id = instance.user_id
+     props.app_id = instance.app_id
+diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
+index 4938833..6465400 100644
+--- a/aioamqp/protocol.py
++++ b/aioamqp/protocol.py
+@@ -5,9 +5,9 @@
+ import asyncio
+ import logging
+ 
++import pamqp.commands
+ import pamqp.frame
+ import pamqp.heartbeat
+-import pamqp.specification
+ 
+ from . import channel as amqp_channel
+ from . import constants as amqp_constants
+@@ -159,7 +159,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         """Close connection (and all channels)"""
+         await self.ensure_open()
+         self.state = CLOSING
+-        request = pamqp.specification.Connection.Close(
++        request = pamqp.commands.Connection.Close(
+             reply_code=0,
+             reply_text='',
+             class_id=0,
+@@ -251,11 +251,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         """Dispatch the received frame to the corresponding handler"""
+ 
+         method_dispatch = {
+-            pamqp.specification.Connection.Close.name: self.server_close,
+-            pamqp.specification.Connection.CloseOk.name: self.close_ok,
+-            pamqp.specification.Connection.Tune.name: self.tune,
+-            pamqp.specification.Connection.Start.name: self.start,
+-            pamqp.specification.Connection.OpenOk.name: self.open_ok,
++            pamqp.commands.Connection.Close.name: self.server_close,
++            pamqp.commands.Connection.CloseOk.name: self.close_ok,
++            pamqp.commands.Connection.Tune.name: self.tune,
++            pamqp.commands.Connection.Start.name: self.start,
++            pamqp.commands.Connection.OpenOk.name: self.open_ok,
+         }
+         if frame_channel is None and frame is None:
+             frame_channel, frame = await self.get_frame()
+@@ -392,7 +392,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         def credentials():
+             return '\0{LOGIN}\0{PASSWORD}'.format(**auth)
+ 
+-        request = pamqp.specification.Connection.StartOk(
++        request = pamqp.commands.Connection.StartOk(
+             client_properties=client_properties,
+             mechanism=mechanism,
+             locale=locale,
+@@ -420,7 +420,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         self._stream_writer.close()
+ 
+     async def _close_ok(self):
+-        request = pamqp.specification.Connection.CloseOk()
++        request = pamqp.commands.Connection.CloseOk()
+         await self._write_frame(0, request)
+ 
+     async def tune(self, frame):
+@@ -429,7 +429,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+         self.server_heartbeat = frame.heartbeat
+ 
+     async def tune_ok(self, channel_max, frame_max, heartbeat):
+-        request = pamqp.specification.Connection.TuneOk(
++        request = pamqp.commands.Connection.TuneOk(
+             channel_max, frame_max, heartbeat
+         )
+         await self._write_frame(0, request)
+@@ -439,7 +439,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
+ 
+     async def open(self, virtual_host, capabilities='', insist=False):
+         """Open connection to virtual host."""
+-        request = pamqp.specification.Connection.Open(
++        request = pamqp.commands.Connection.Open(
+             virtual_host, capabilities, insist
+         )
+         await self._write_frame(0, request)
+diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py
+index 120104b..d6d702b 100644
+--- a/aioamqp/tests/testcase.py
++++ b/aioamqp/tests/testcase.py
+@@ -147,7 +147,7 @@ class RabbitTestCaseMixin:
+         if amqp is None:
+             amqp = self.amqp
+ 
+-        server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.'))
++        server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.'))
+         return server_version
+ 
+     async def check_exchange_exists(self, exchange_name):
+diff --git a/setup.py b/setup.py
+index ea0e79f..1d0e923 100644
+--- a/setup.py
++++ b/setup.py
+@@ -25,8 +25,9 @@ setuptools.setup(
+         'aioamqp',
+     ],
+     install_requires=[
+-        'pamqp>=2.2.0,<3',
++        'pamqp>=3.1.0',
+     ],
++    python_requires=">=3.6",
+     classifiers=[
+         "Development Status :: 4 - Beta",
+         "Intended Audience :: Developers",
+-- 
+2.34.1
+
diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template
index f61a08208d2b..e85e1bcdf143 100644
--- a/srcpkgs/python3-aioamqp/template
+++ b/srcpkgs/python3-aioamqp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioamqp'
 pkgname=python3-aioamqp
 version=0.14.0
-revision=3
+revision=4
 wrksrc="aioamqp-aioamqp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,6 +12,8 @@ license="BSD-3-Clause"
 homepage="https://github.com/polyconseil/aioamqp"
 distfiles="${homepage}/archive/${pkgname#*-}-${version}.tar.gz"
 checksum=9fce69be1ed9bcc06b74683094f738556305215a1affd0fd7789c23a01c53ecd
+# Tests require unpackaged asynctest package
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 22aa23b4025d932298cab01229710c8a2d9b7ede Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 16 Jan 2022 11:59:15 -0500
Subject: [PATCH 0347/1427] python3-pytest-subtests: update to 0.6.0.

---
 srcpkgs/python3-pytest-subtests/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template
index ca33ba8b7d58..a743f0264f98 100644
--- a/srcpkgs/python3-pytest-subtests/template
+++ b/srcpkgs/python3-pytest-subtests/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytest-subtests'
 pkgname=python3-pytest-subtests
-version=0.5.0
-revision=2
+version=0.6.0
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pytest-subtests"
 distfiles="${PYPI_SITE}/p/pytest-subtests/pytest-subtests-${version}.tar.gz"
-checksum=5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120
+checksum=3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a
 
 post_install() {
 	vlicense LICENSE

From fdccbcaec244cbac0e06ebebb965918f8552d037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 16 Jan 2022 15:20:58 -0300
Subject: [PATCH 0348/1427] vips: update to 8.12.1.

---
 srcpkgs/vips/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vips/template b/srcpkgs/vips/template
index f690885252cd..956519e4c8f2 100644
--- a/srcpkgs/vips/template
+++ b/srcpkgs/vips/template
@@ -1,6 +1,6 @@
 # Template file for 'vips'
 pkgname=vips
-version=8.11.4
+version=8.12.1
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -41,9 +41,9 @@ makedepends="
 short_desc="Fast image processing with low memory needs"
 maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="LGPL-2.1-or-later"
-homepage="https://libvips.github.io/libvips/"
+homepage="https://www.libvips.org/"
 distfiles="https://github.com/libvips/libvips/releases/download/v${version}/vips-${version}.tar.gz"
-checksum=5043f38828a0ff9f2275f9252f69e14f701ef11f55786cda8aa6ce2c4fbed2f7
+checksum=474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c
 python_version=3
 
 build_options="gir hdf5"

From b780ae7bfe4142fbf8501a04f55039a9a8212687 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 15 Jan 2022 22:22:24 -0500
Subject: [PATCH 0349/1427] discord-ptb: update to 0.0.28.

---
 srcpkgs/discord-ptb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index c12cecaed945..180237fc29c5 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,6 +1,6 @@
 # Template file for 'discord-ptb'
 pkgname=discord-ptb
-version=0.0.27
+version=0.0.28
 revision=1
 archs="x86_64"
 wrksrc="DiscordPTB"
@@ -12,7 +12,7 @@ maintainer="0x5c <dev@0x5c.io>"
 license="custom:Proprietary"
 homepage="https://discord.com/"
 distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=0bef5643b57ec9ee42f5d107565e13a0ea83e1b26011e1cd5520fbcb8bd1f07a
+checksum=f81bad08ce25e1670a2412d9350d7462222ddfc35409fb4dedd2ab2bdb6283d2
 _license_checksum=03580ea1297c38f31c4437555f2dbf9dae25a91c9e61391d7141cf8cc036aeff
 nopie=yes
 restricted=yes

From 059818966bc373533bc03bfde8034ef9d4fb2d45 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 15 Jan 2022 18:12:44 +0100
Subject: [PATCH 0350/1427] swayidle: update to 1.7.1.

---
 srcpkgs/swayidle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swayidle/template b/srcpkgs/swayidle/template
index 2c7ee3ff8db6..4d657995d494 100644
--- a/srcpkgs/swayidle/template
+++ b/srcpkgs/swayidle/template
@@ -1,6 +1,6 @@
 # Template file for 'swayidle'
 pkgname=swayidle
-version=1.7
+version=1.7.1
 revision=1
 build_style=meson
 configure_args="-Dlogind-provider=elogind -Dwerror=false"
@@ -11,7 +11,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=06062dd07d4ef625bb2420ab5b4de395b0e12e71c631a516bfa972e1c3acb503
+checksum=6aa07093be553473726e1ef601dbc5e57a3ea2ac864ef2d7afce1f971ea760a6
 
 post_install() {
 	vlicense LICENSE

From 0b0f82f7406a6089c9eebd78c0efdafeeecdb641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 15 Jan 2022 01:36:03 +0100
Subject: [PATCH 0351/1427] kopia: update to 0.10.1.

---
 srcpkgs/kopia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1485940c09d6..36358b8ead7f 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,6 +1,6 @@
 # Template file for 'kopia'
 pkgname=kopia
-version=0.9.8
+version=0.10.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=855a785778442322c4ef5de7ba666879906dac7e3d6d04746f97bb4694f6c82b
+checksum=d7c3115862e8ff56d948eef45eff89bac7867c9ae68e39d4142158d72a039d91
 
 post_install() {
 	for shell in bash zsh; do

From aa4288f6554ecfb0d4bee26e83ef492ae55e0aea Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 Jan 2022 14:40:45 +0200
Subject: [PATCH 0352/1427] papirus-icon-theme: update to 20220101.

---
 srcpkgs/papirus-icon-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/papirus-icon-theme/template b/srcpkgs/papirus-icon-theme/template
index 508bb8ddc35c..5d4edb512f42 100644
--- a/srcpkgs/papirus-icon-theme/template
+++ b/srcpkgs/papirus-icon-theme/template
@@ -1,13 +1,13 @@
 # Template file for 'papirus-icon-theme'
 pkgname=papirus-icon-theme
-version=20211101
+version=20220101
 revision=1
 short_desc="SVG icon theme for Linux, based on Paper Icon Set"
 maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
 distfiles="https://github.com/PapirusDevelopmentTeam/${pkgname}/archive/${version}.tar.gz"
-checksum=dc0bf96fdc751684e7d8dc178b5194754082f89bc91ddc2952754d721266c50a
+checksum=98a2880a9f841c022c0db590456428a99ae93a4facc59da25f71e73e4d3f6479
 
 do_install() {
 	vmkdir usr/share/icons

From bfc97b8f61358438e644647399426a670502d1c3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 Jan 2022 12:26:13 +0200
Subject: [PATCH 0353/1427] poedit: update to 3.0.1.

---
 srcpkgs/poedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 717b8f6bc228..1654ad33553b 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,6 +1,6 @@
 # Template file for 'poedit'
 pkgname=poedit
-version=3.0
+version=3.0.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.poedit.net/"
 distfiles="https://github.com/vslavik/poedit/releases/download/v${version}-oss/poedit-${version}.tar.gz"
-checksum=dfbe5e8c5ea6e36fd472fc294f2cedf804656f52db372ea3fbbe4103136b2dc2
+checksum=61de1d99be51697a23dda0bbe04bd975a5a03b8390f13da9dbb6813c232efd39
 
 CPPFLAGS="-DUCHAR_TYPE=uint16_t -Wno-deprecated-copy"
 

From a8dc20c6741ae6f13df416985c041053c2cea47b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 15 Jan 2022 12:11:12 +0200
Subject: [PATCH 0354/1427] cinnamon-desktop: update to 5.2.1.

---
 srcpkgs/cinnamon-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index 98bf8b08e35d..605dba3f1f8a 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-desktop'
 pkgname=cinnamon-desktop
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-desktop"
 distfiles="https://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz"
-checksum=3af13e687821cfd5af1989070db1240f72fe4c12995780ea6935946eb153ca39
+checksum=3fd18225771444383d7942c93466e2f86b03f28d2b406ff90ee34567311a5c18
 
 cinnamon-desktop-devel_package() {
 	depends="gtk+3-devel libxkbfile-devel ${sourcepkg}>=${version}_${revision}"

From 5eeb1712853fad50db97996fa7ad26c9db253c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 15 Jan 2022 10:37:29 +0100
Subject: [PATCH 0355/1427] doctl: update to 1.69.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index c755b60fbcd8..eff503bd86b0 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.68.0
+version=1.69.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/digitalocean/doctl"
 distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=63bf2c754cc6da01eeacf43c139cab3dd04458d16be4047f5a1f238b9e0e5cb9
+checksum=4ffbfe07ba2ea7d830855eb302f605c006bc5721c8c3288ed9b974d8c44e4fc6

From 69ef424c16a13f1e7d997c43b0b066e7a7959d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 15 Jan 2022 10:23:28 +0100
Subject: [PATCH 0356/1427] postfix: update to 3.6.4.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ce938ad545f3..929897aa76f1 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.6.3
+version=3.6.4
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=0f1241d456a0158e0c418abf62c52c2ff83f8f1dcf2fbdd4c40765b67789b1bc
+checksum=8de0619dcf2fa7c215a80cf84b82ab71631d4d4722cba0949725ce3e18031d4e
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 026f25413cc460d66be830b374b660e4cb0582e3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 14 Jan 2022 20:37:11 +0200
Subject: [PATCH 0357/1427] opera: update to 82.0.4227.58.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index be519148685f..8d829b9aa9bd 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=82.0.4227.43
+version=82.0.4227.58
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=fdb9a7326b7bf5149f2793881c31172dc428e10e3a3aad6b16796992e8d7235c
+checksum=164cb54dc9f6835cc1c983bd9256fa6996dabd97f20880f0c58bfcd4bd4afd9e
 repository="nonfree"
 nostrip=yes
 

From b06ca9619ad77df8cb31506df59b653549a96fca Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 14 Jan 2022 16:24:01 -0600
Subject: [PATCH 0358/1427] zrepl: update to 0.5.0.

---
 srcpkgs/zrepl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index 102ae31a17c4..dd4b712b8e46 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,6 +1,6 @@
 # Template file for 'zrepl'
 pkgname=zrepl
-version=0.4.0
+version=0.5.0
 revision=1
 build_style=go
 go_import_path=github.com/zrepl/zrepl
@@ -12,7 +12,7 @@ maintainer="Frans Bergman <frans@tankernn.eu>"
 license="MIT"
 homepage="https://github.com/zrepl/zrepl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=e7035a8a40913614f4ab24d7caad2c26419fd2b0aaa3565c16439e59214ae590
+checksum=4acfde9e7a09eca2de3de5c7d2987907ae446b345b69133e4b3c58a99c294465
 
 conf_files="/etc/zrepl/*"
 

From 1fef9447c2ceb2119d26e1df09dee95732a20cbe Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Fri, 14 Jan 2022 17:31:42 +0100
Subject: [PATCH 0359/1427] nyxt: update to 2.2.4

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
---
 srcpkgs/nyxt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index dd46e0c2cbe8..8332e1286d2c 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,6 +1,6 @@
 # Template file for 'nyxt'
 pkgname=nyxt
-version=2.2.3
+version=2.2.4
 revision=1
 create_wrksrc=yes
 build_style=gnu-makefile
@@ -13,7 +13,7 @@ maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://nyxt.atlas.engineer/"
 distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz"
-checksum=f611a0cee412b64f4bf93228aa975621734ace797153580c58c61616c7db02d8
+checksum=04f740f8405044cc89920d41d340d6d137e1d4f7be098d4813d1523f73d725a9
 # Disable check because ASDF/USER::PROVE is not installed
 make_check=no
 nostrip=yes

From 33999bc60d8e6798c662a37b5d12d010993f7f5c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 14 Jan 2022 20:23:21 +0200
Subject: [PATCH 0360/1427] ristretto: update to 0.12.2.

Also add glib-devel to hostmakedepends (for gdbus-codegen).
---
 srcpkgs/ristretto/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index 52dd310881d8..80395b0e265d 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -1,10 +1,10 @@
 # Template file for 'ristretto'
 pkgname=ristretto
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
-hostmakedepends="intltool pkg-config"
+hostmakedepends="intltool pkg-config glib-devel"
 makedepends="exo-devel file-devel libexif-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Picture-viewer for the Xfce desktop environment"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/ristretto/start"
 changelog="https://gitlab.xfce.org/apps/ristretto/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=13853f9ca18466a8e4788e92c7bde3388a93e8340283568f5dee1a9396ffd7ee
+checksum=0eee869922ec00a253dafa446c2aad2a2f98e07e1db7262e8337ce9ec2dad969

From 635d0c21d38f6181199fc8bf5989a927dede2aa4 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 14 Jan 2022 18:54:37 +0100
Subject: [PATCH 0361/1427] syncthing-gtk: update to
 0.9.4.4+ds+git20220108+9023143f8b93.

---
 srcpkgs/syncthing-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index 39a9076bc82e..0acef5a8c94c 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing-gtk'
 pkgname=syncthing-gtk
 reverts="0.14.36_1"
-version=0.9.4.4+ds+git20201209+c46fbd8
+version=0.9.4.4+ds+git20220108+9023143f8b93
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://salsa.debian.org/debian/syncthing-gtk/"
 distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}.orig.tar.xz"
-checksum=850ac6fb937e71827b23011f5a7783110d982cd072a3e48810b266a904a853fb
+checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8

From b934dbaeb6c26f89c9ab744d2dda43a2a79c81d2 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 14 Jan 2022 12:50:05 +0100
Subject: [PATCH 0362/1427] wireplumber: update to 0.4.7.

---
 srcpkgs/wireplumber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 8a0c1c39b5c2..1a87ffbf0e25 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,6 +1,6 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.6
+version=0.4.7
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=3eb3ef519490b4c7b51712bc6e44bb4ba63f550c49654cfc8ad6c400eaa1aa2c
+checksum=86831102281daa11075d4e0eaebf078a601b1c63339511ec6220100d2b21f10a
 
 post_install() {
 	vlicense LICENSE

From be3a3d0cf8d9cd9e9975f0ab23e1375b2bbfd987 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 13 Jan 2022 19:32:14 +0200
Subject: [PATCH 0363/1427] doctest: update to 2.4.8.

---
 srcpkgs/doctest/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/doctest/template b/srcpkgs/doctest/template
index 3b1151980a2d..4dcf01e978fa 100644
--- a/srcpkgs/doctest/template
+++ b/srcpkgs/doctest/template
@@ -1,6 +1,6 @@
 # Template file for 'doctest'
 pkgname=doctest
-version=2.4.7
+version=2.4.8
 revision=1
 build_style=cmake
 short_desc="Doctest C++ testing framework"
@@ -8,8 +8,8 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="MIT"
 homepage="https://github.com/onqtam/doctest"
 changelog="https://raw.githubusercontent.com/onqtam/doctest/master/CHANGELOG.md"
-distfiles="https://github.com/onqtam/doctest/archive/${version}.tar.gz"
-checksum=551941e0b08fefdde39e394d484ed7ac6c867022c865e771f68a717cd3ce7d76
+distfiles="https://github.com/onqtam/doctest/archive/v${version}.tar.gz"
+checksum=f52763630aa17bd9772b54e14b6cdd632c87adf0169455a86a49bd94abf2cd83
 
 post_install() {
 	vlicense LICENSE.txt

From 91223d05d299811da79bbfc3d7c3d379ea984285 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 13 Jan 2022 13:06:28 -0500
Subject: [PATCH 0364/1427] borgmatic: update to 1.5.22.

---
 srcpkgs/borgmatic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template
index 047883dcc530..d9238c9c004b 100644
--- a/srcpkgs/borgmatic/template
+++ b/srcpkgs/borgmatic/template
@@ -1,6 +1,6 @@
 # Template file for 'borgmatic'
 pkgname=borgmatic
-version=1.5.21
+version=1.5.22
 revision=1
 build_style=python3-module
 # runs not yet installed self
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://torsion.org/borgmatic/"
 changelog="https://projects.torsion.org/borgmatic-collective/borgmatic/raw/branch/master/NEWS"
 distfiles="${PYPI_SITE}/b/borgmatic/borgmatic-${version}.tar.gz"
-checksum=b8aa9dbf250b95b829827310c9638a17cd52fee160a437283eed23bffcae83cf
+checksum=593865eb8c008647a0d66c9d2673a3497cdc958605e2aef48901dd7d82a4785f
 
 post_install() {
 	# remove tests directory polluting site-packages

From ccce4dabe4f7eb38167884ffa59e76a93ac99fa8 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 13 Jan 2022 21:01:43 +0100
Subject: [PATCH 0365/1427] chroma: update to 0.10.0.

---
 srcpkgs/chroma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index c4d778bf49a2..b549685882ce 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.9.4
+version=0.10.0
 revision=1
 build_wrksrc="cmd/chroma"
 build_style=go
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=c13f99b0ce34cecfaaea448ad134e6293b316128a6b0f67af5e70cc6525f1b6e
+checksum=98a517ae99f48e3b54d5c8cd7473d5c544f51bee7a4be17f5175736fce37da56
 
 do_check() {
 	go test -v

From f16eca9b76b225b72dfc2f5af5c20b7a0d754569 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 13 Jan 2022 21:39:46 +0700
Subject: [PATCH 0366/1427] vivaldi: update to 5.0.2497.38

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 5b19e70c2c95..14671173b275 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.0.2497.35
+version=5.0.2497.38
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=5c1e7d89d008b6ed6ae6b9ef911676c08d14312e31cc103e7db72f0005e06cbc
+checksum=06f59a2115ef616e6e31e658ac07cf9ee8462e68ff9ddac5cf26bb47988658ed
 repository=nonfree
 restricted=yes
 nostrip=yes

From db4766bb203f29c354e5f2eac42e73d47884c4d3 Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Wed, 5 Jan 2022 14:57:20 +0000
Subject: [PATCH 0367/1427] librdkafka: update to 1.8.2.

---
 srcpkgs/librdkafka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 4b6c741bf25d..a4bbf3abe391 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,7 +1,7 @@
 # Template file for 'librdkafka'
 pkgname=librdkafka
-version=1.4.4
-revision=3
+version=1.8.2
+revision=1
 build_style=configure
 configure_args="--prefix=/usr"
 makedepends="zlib-devel openssl-devel libsasl-devel"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/edenhill/librdkafka"
 distfiles="https://github.com/edenhill/librdkafka/archive/v${version}.tar.gz"
-checksum=0984ffbe17b9e04599fb9eceb16cfa189f525a042bef02474cd1bbfe1ea68416
+checksum=6a747d293a7a4613bd2897e28e8791476fbe1ae7361f2530a876e0fd483482a6
 
 librdkafka-devel_package() {
 	short_desc+=" - development files"

From 0fe5a10dc9d08c4567ec9d6a05b38b24f690d75c Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Mon, 10 Jan 2022 17:32:05 -0600
Subject: [PATCH 0368/1427] kafkacat: bump revision for librdkafka update

The checksum has changed, meaning this is a different build of 1.6.0 than
the previous revision.
---
 srcpkgs/kafkacat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kafkacat/template b/srcpkgs/kafkacat/template
index d71a02805a31..3cb937a860ac 100644
--- a/srcpkgs/kafkacat/template
+++ b/srcpkgs/kafkacat/template
@@ -1,7 +1,8 @@
 # Template file for 'kafkacat'
 pkgname=kafkacat
 version=1.6.0
-revision=1
+revision=2
+wrksrc="kcat-${version}"
 build_style=configure
 configure_args="--prefix=/usr"
 makedepends="librdkafka-devel"
@@ -10,7 +11,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="BSD-2-Clause"
 homepage="https://github.com/edenhill/kafkacat"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e67aecd153659d7ea0d561469a1e65038485fe9a3203fa8c9c59a9fe02164bf0
+checksum=300fd861d2d6b406ae8a9f5538055449e10da611076959993b8e2430101c4ea1
 
 post_install() {
 	vlicense LICENSE

From 57f72c369ab5a177992889e3c8a44a49208c8adc Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 15 Jan 2022 12:39:21 -0500
Subject: [PATCH 0369/1427] starship: update to 1.2.1

---
 srcpkgs/starship/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index ea9b416552d9..cca62c47a8e5 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,6 +1,6 @@
 # Template file for 'starship'
 pkgname=starship
-version=0.58.0
+version=1.2.1
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -13,7 +13,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="ISC"
 homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/refs/tags/v${version}.tar.gz"
-checksum=8bd4cfad4bcf9694633f228de0c7dc6cfab6bb6955e2a7299ed28dd8c4d6f5e4
+checksum=22ad1622fd30297cc0ba2de67316e7df07c44cabe716bcbda3a5cb0d12375c98
 
 post_build() {
 	STARSHIP="target/${RUST_TARGET}/release/starship"

From a3c591e99c27455b29380d4d13ca31a6dcda767a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 21:59:55 +0100
Subject: [PATCH 0370/1427] icu: update to 70.1.

---
 common/shlibs                                 | 12 +++---
 .../patches/icu-70.1-fix-ucptrietest.patch    | 38 +++++++++++++++++++
 srcpkgs/icu/template                          |  6 +--
 3 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch

diff --git a/common/shlibs b/common/shlibs
index d35944228287..b07e14379e28 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -521,12 +521,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
 libkColorPicker.so.0 kColorPicker-0.1.5_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.69 icu-libs-69.1_1
-libicui18n.so.69 icu-libs-69.1_1
-libicudata.so.69 icu-libs-69.1_1
-libicutu.so.69 icu-libs-69.1_1
-libicuuc.so.69 icu-libs-69.1_1
-libicutest.so.69 icu-libs-69.1_1
+libicuio.so.70 icu-libs-70.1_1
+libicui18n.so.70 icu-libs-70.1_1
+libicudata.so.70 icu-libs-70.1_1
+libicutu.so.70 icu-libs-70.1_1
+libicuuc.so.70 icu-libs-70.1_1
+libicutest.so.70 icu-libs-70.1_1
 libaspell.so.15 libaspell-0.60.8_2
 libpspell.so.15 libaspell-0.60.8_2
 libenchant-2.so.2 enchant2-2.2.3_1
diff --git a/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch b/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch
new file mode 100644
index 000000000000..5b281ea4603a
--- /dev/null
+++ b/srcpkgs/icu/patches/icu-70.1-fix-ucptrietest.patch
@@ -0,0 +1,38 @@
+Fixes test failure on arm.
+
+https://github.com/unicode-org/icu/pull/1925
+https://unicode-org.atlassian.net/browse/ICU-21793
+
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapouer@melix.org>
+Date: Wed, 3 Nov 2021 02:31:18 +0100
+Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff
+
+--- a/source/tools/toolutil/toolutil.cpp
++++ b/source/tools/toolutil/toolutil.cpp
+@@ -228,18 +228,19 @@ uprv_compareGoldenFiles(
+     std::ifstream ifs(goldenFilePath, std::ifstream::in);
+     int32_t pos = 0;
+     char c;
+-    while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) {
++    while (ifs.get(c) && pos < bufferLen) {
+         if (c != buffer[pos]) {
+             // Files differ at this position
+-            return pos;
++            break;
+         }
+         pos++;
+     }
+-    if (pos < bufferLen || c != std::char_traits<char>::eof()) {
+-        // Files are different lengths
+-        return pos;
++    if (pos == bufferLen && ifs.eof()) {
++        // Files are same lengths
++        pos = -1;
+     }
+-    return -1;
++    ifs.close();
++    return pos;
+ }
+
+ /*U_CAPI UDate U_EXPORT2
+
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2d5dea2ab028..3ff17a4dea5d 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,8 +2,8 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=69.1
-revision=2
+version=70.1
+revision=1
 wrksrc=icu
 build_wrksrc=source
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
 homepage="https://home.unicode.org/"
 distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+checksum=8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
 
 CFLAGS=-fPIC
 CXXFLAGS=-fPIC

From 7e6c4f6c3cd9c37fe67bb74cc9c3bcfa49bea597 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:49 +0100
Subject: [PATCH 0371/1427] 0ad: rebuild against icu-70.1_1

---
 srcpkgs/0ad/patches/fix-python3.10.patch | 78 ++++++++++++++++++++++++
 srcpkgs/0ad/template                     |  6 +-
 2 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/0ad/patches/fix-python3.10.patch

diff --git a/srcpkgs/0ad/patches/fix-python3.10.patch b/srcpkgs/0ad/patches/fix-python3.10.patch
new file mode 100644
index 000000000000..2935c6c6b3e7
--- /dev/null
+++ b/srcpkgs/0ad/patches/fix-python3.10.patch
@@ -0,0 +1,78 @@
+diff -ru --new-file 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/patch.sh 0ad-0.0.25b-alpha/libraries/source/spidermonkey/patch.sh
+--- 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/patch.sh	2021-12-17 08:53:59.543315034 +0100
++++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/patch.sh	2021-12-17 08:53:34.789777469 +0100
+@@ -43,6 +43,8 @@
+ # Note that this isn't quite the upstream patch to match our version.
+ patch -p1 < ../FixRust150.diff
+ 
++patch -p1 < ../python-3.10.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then
+diff -ru --new-file 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/python-3.10.diff 0ad-0.0.25b-alpha/libraries/source/spidermonkey/python-3.10.diff
+--- 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/python-3.10.diff	1970-01-01 01:00:00.000000000 +0100
++++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/python-3.10.diff	2021-12-17 09:05:09.713419684 +0100
+@@ -0,0 +1,62 @@
++diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/configenvironment.py mozjs-78.6.0/python/mozbuild/mozbuild/backend/configenvironment.py
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/configenvironment.py	2020-11-28 17:33:58.000000000 +0100
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/backend/configenvironment.py	2021-12-17 08:52:07.342371513 +0100
++@@ -9,7 +9,8 @@
++ import sys
++ import json
++ 
++-from collections import Iterable, OrderedDict
+++from collections.abc import Iterable
+++from collections import OrderedDict
++ from types import ModuleType
++ 
++ import mozpack.path as mozpath
++diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/makeutil.py mozjs-78.6.0/python/mozbuild/mozbuild/makeutil.py
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/makeutil.py	2020-11-28 17:33:58.000000000 +0100
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/makeutil.py	2021-12-17 09:05:02.820298351 +0100
++@@ -7,7 +7,7 @@
++ import os
++ import re
++ import six
++-from collections import Iterable
+++from collections.abc import Iterable
++ 
++ 
++ class Makefile(object):
++diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py mozjs-78.6.0/python/mozbuild/mozbuild/util.py
++--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py	2020-11-28 17:33:58.000000000 +0100
+++++ mozjs-78.6.0/python/mozbuild/mozbuild/util.py	2021-12-17 08:52:31.045908142 +0100
++@@ -782,7 +782,7 @@
++         self._strings = StrictOrderingOnAppendList()
++         self._children = {}
++ 
++-    class StringListAdaptor(collections.Sequence):
+++    class StringListAdaptor(collections.abc.Sequence):
++         def __init__(self, hsl):
++             self._hsl = hsl
++ 
++diff -ru mozjs-78.6.0.orig/testing/mozbase/manifestparser/manifestparser/filters.py mozjs-78.6.0/testing/mozbase/manifestparser/manifestparser/filters.py
++--- mozjs-78.6.0.orig/testing/mozbase/manifestparser/manifestparser/filters.py	2020-11-28 17:34:00.000000000 +0100
+++++ mozjs-78.6.0/testing/mozbase/manifestparser/manifestparser/filters.py	2021-12-17 09:02:44.801711871 +0100
++@@ -12,7 +12,8 @@
++ 
++ import itertools
++ import os
++-from collections import defaultdict, MutableSequence
+++from collections import defaultdict
+++from collections.abc import MutableSequence
++ 
++ import six
++ from six import string_types
++diff -ru mozjs-78.6.0.orig/third_party/python/virtualenv/virtualenv.py mozjs-78.6.0/third_party/python/virtualenv/virtualenv.py
++--- mozjs-78.6.0.orig/third_party/python/virtualenv/virtualenv.py	2020-11-28 17:34:05.000000000 +0100
+++++ mozjs-78.6.0/third_party/python/virtualenv/virtualenv.py	2021-12-17 08:58:55.798970530 +0100
++@@ -1804,7 +1804,7 @@
++         pass
++     else:
++         # noinspection PyProtectedMember
++-        if sysconfig._get_default_scheme() == "posix_local":
+++        if sysconfig.get_default_scheme() == "posix_local":
++             local_path = os.path.join(home_dir, "local")
++             if not os.path.exists(local_path):
++                 os.mkdir(local_path)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index eaf16ec09a5b..a18ae2dd0a81 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,13 +1,13 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.25b
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
 makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel
  libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel
- nspr-devel wxWidgets-gtk3-devel fmt-devel"
+ nspr-devel wxWidgets-gtk3-devel fmt-devel mozjs78-devel"
 depends="${pkgname}-data"
 short_desc="Historically-based real-time strategy game"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -36,6 +36,7 @@ post_patch() {
 }
 
 do_configure() {
+	export JOBS="${makejobs}"
 	cd ${wrksrc}/build/workspaces
 	./clean-workspaces.sh
 	./update-workspaces.sh --bindir=/usr/bin --libdir=/usr/lib/0ad \
@@ -43,6 +44,7 @@ do_configure() {
 }
 
 do_build() {
+	export JOBS="${makejobs}"
 	make config=release -C build/workspaces/gcc ${makejobs}
 }
 

From 77f2c4c9277f35e93db2937eb831337bce632d7c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:50 +0100
Subject: [PATCH 0372/1427] Aegisub: rebuild against icu-70.1_1

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 508ccaa2ab88..1583c4853b9b 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.3.2
-revision=2
+revision=3
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 cmake_builddir="BUILD"

From d417362cf7b49ba0eb0b7f2d19e986363835e5bc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:50 +0100
Subject: [PATCH 0373/1427] OpenRCT2: rebuild against icu-70.1_1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 7487ef8ad8d4..ececf0dfc68f 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -6,7 +6,7 @@ _objects_version=1.0.21
 _titles_version=0.1.2c
 _replays_version=0.0.43
 version=0.3.4.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}

From 57ddec1205f84a503dd6e77e60987f8d74c16de9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:50 +0100
Subject: [PATCH 0374/1427] R: rebuild against icu-70.1_1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 8a7db746af46..8190ac146535 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=4.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack

From c28dd6b2959ad36951a7adffcd1419490bb9c76f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:50 +0100
Subject: [PATCH 0375/1427] R-cran-stringi: rebuild against icu-70.1_1

---
 srcpkgs/R-cran-stringi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..cdbdc57ce1f9 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
 # Template file for 'R-cran-stringi'
 pkgname=R-cran-stringi
 version=1.7.3
-revision=1
+revision=2
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From 02a9526476d96c2113c491215e5eb6b158c3d360 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:50 +0100
Subject: [PATCH 0376/1427] an: rebuild against icu-70.1_1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index e05c3c129e64..8491e86713db 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=8
+revision=9
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From 6097bde4b83d388b6141f2d1c36f234c54e1b8c0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:51 +0100
Subject: [PATCH 0377/1427] boost: rebuild against icu-70.1_1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f5881e536bdd..126c50770b50 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=6
+revision=7
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"

From c2db7bacc73e2e160877305ab8a0e7d11d4559c1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:51 +0100
Subject: [PATCH 0378/1427] brltty: rebuild against icu-70.1_1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 0c0e56302459..350ecd96eb33 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From eea748c7b909fccc9ec16c26ae9d04d2ab0eaec4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:51 +0100
Subject: [PATCH 0379/1427] calibre: rebuild against icu-70.1_1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index eb10fb20d143..a38792a9d351 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=5.34.0
-revision=1
+revision=2
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg

From bfd200c5cdfbb9ec74e0d19fbe3d409d3e469c06 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:51 +0100
Subject: [PATCH 0380/1427] clamav: rebuild against icu-70.1_1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index d898bc215263..abd9f367430f 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.103.4
-revision=1
+revision=2
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6

From 8784b22bf3a5f3d2b79f6b1cb8f7e566d1681bef Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:51 +0100
Subject: [PATCH 0381/1427] darktable: rebuild against icu-70.1_1

---
 srcpkgs/darktable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 6ddade65ac18..ef44020cf2be 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
 # Template file for 'darktable'
 pkgname=darktable
 version=3.8.0
-revision=2
+revision=3
 # upstream only supports these archs:
 archs="x86_64* aarch64* ppc64le*"
 build_style=cmake

From 96147b8ef8c19ad4b5c9b751b2c1c0abb7aed638 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:52 +0100
Subject: [PATCH 0382/1427] dino: rebuild against icu-70.1_1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 3de80d3e799d..7e36f00ad73f 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.2.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja

From 37f6eec26657575feb7610640a77e9210cfa6b04 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:52 +0100
Subject: [PATCH 0383/1427] dwdiff: rebuild against icu-70.1_1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 2467ce056132..c02086f13c8a 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.4
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From b787651c1b57dabd4b2bbe8062f36f7257c7f95f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:52 +0100
Subject: [PATCH 0384/1427] enchant2: rebuild against icu-70.1_1

---
 srcpkgs/enchant2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 558f6f3a1a1d..8a48e4d61b8c 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
 version=2.2.15
-revision=4
+revision=5
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;

From b65b183a9f11c43ae45acdad5ff4cf4e7b87fa20 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:52 +0100
Subject: [PATCH 0385/1427] evolution-data-server: rebuild against icu-70.1_1

---
 srcpkgs/evolution-data-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 43a5f1cf8434..6501fe151ccb 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.40.2
-revision=2
+revision=3
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DENABLE_UOA=OFF

From f1204ac39fc9f6f71529c64af81aa5f3dac72cf2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:52 +0100
Subject: [PATCH 0386/1427] firefox: update to 96.0.1, rebuild against
 icu-70.1_1

---
 .../patches/fix-webrtc-glibcisms.patch        | 24 +++++++++----------
 srcpkgs/firefox/template                      |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
index 5d17021a99f4..4f9043b58e1e 100644
--- a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
@@ -1,20 +1,20 @@
---- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
-+++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
-@@ -14,7 +14,7 @@
- #ifndef __GLIBC_PREREQ
- #define __GLIBC_PREREQ(a, b) 0
+--- a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
++++ b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc
+@@ -18,7 +18,7 @@
+ #define WEBRTC_GLIBC_PREREQ(a, b) 0
  #endif
--#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
+ 
+-#if WEBRTC_GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16)
  #include <sys/auxv.h>
  #else
- #include <fcntl.h>
-@@ -32,7 +32,7 @@
+ #include <errno.h>
+@@ -40,7 +40,7 @@
    int architecture = 0;
-   unsigned long hwcap = 0;
+   uint64_t hwcap = 0;
    const char* platform = NULL;
--#if __GLIBC_PREREQ(2, 16)
-+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16)
+-#if WEBRTC_GLIBC_PREREQ(2, 16)
++#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16)
    hwcap = getauxval(AT_HWCAP);
    platform = (const char*)getauxval(AT_PLATFORM);
  #else
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 42257de92997..66f7c26a8f8a 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=95.0.1
+version=96.0.1
 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=552a2bd731921f40694a4db8ad31dce6f4e9f52035d04e7cd1f917613f803efa
+checksum=cb86f3cbd31960305dee7d7f3dc254c64fb0462e27ea624ee62f3682e99079ee
 
 lib32disabled=yes
 

From d8f0f52f5e12bc69c63669256c94be6ff84ffc3b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 12 Jan 2022 16:53:30 +0100
Subject: [PATCH 0387/1427] firefox-i18n: update to 96.0.1.

---
 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 bab0462bccb9..1cdb02affdea 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=95.0.1
+version=96.0.1
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="8abf936c310a8f61178aed10f0a3ba45da0ea1ad695a2927b9a78ec06e04ea65
- e01675b087f814f816499e0625e08f70ac4546a775f5f13a4572bedc88a31b54
- b0cd03518bea1c8dd19aa03485cbf49e39a02bc3b515d8298176d2edacf971c5
- 8f1b81c5f2caa4b0a3f89a5facbbccee63165db2ae1d54bdd7f8717b57fabfa8
- 6f4f0e306654257f9631b816c17023fc17bd834cf373a8d62a51277b111dca60
- bb0f9272e394156c78ed747d187af8986d3b1dc28b05d445bb2fa474cae40828
- 2984949a57e1c62d271521eeffd94b13f8f70ffa52c2ec4ddf5aed728db3e42f
- 8ebbb09e860dc935cac6c2acd0b84e5f481078705678497e24fbec403c28b901
- 07428c4033f866a083ae7df24814c2b217f7ac83f95846a671a3ffd1b318c5b7
- eb2487b259e6b83eda263a0aed8683553567c0f6da9e22c64aabab2988b3c0ac
- 6be6b63bcd1c379108b7d6471e3b6a50870073756ad600d8b701ff7ad7790e22
- 22c468f258d3c06fbda914620b460fd82ed6ac3c49ac26c73e1fa4dfda6c90cd
- e138297c9be5714767ec6e425b2a23e97cdd57dbd93730f026398120e14a92d8
- 08c938f56fcf7498fe05bd223c52a6c885f244ae2545c1603ee7e6b66bd458fb
- e7f36610e1bbbd3554d4d1feca8dca3fbe41080f0974933fb9434b55c5dcbd6a
- 14dd3fbd63a054e4dd2f49fb4b25e2e7ffa22ddcd5c6023c4c0fbea26982a040
- 3ba77383d390437abf2671f43d32c063bce6885dc2c43310a0e2f1b0dffdc19a
- 026e5a50c59c8e4f24f98ce24181fb5241b182e83ace6ce8265040de3c78f649
- a321447497aa4a2069af3abb2cac13a771a85fe5fa8b3d8a86a8598f7c45cefb
- 869ab861bae53b02b7da6ae90f865685815501ae68380d8c6dac254912ab2743
- 35ddcb3e0b616c2db9a58f258f24a0b6000be41344c93378c42a889654107519
- b28850bd73a261ceb3084ba2ebb1a19e64c28aeb3509a8bc5e6fcd1a498bbb1e
- b6344c735c22f8c4c26074cc7cd0e93b9e8c1f4a5d360216cb8d6da64a8d7cae
- 2a691626f4bb523fdc5f9d2255afafc513281f2ea50e0612b259c9e3a5e5dd4f
- a34ae46a380a38d9327239fda4ca1b295dba2b1c05fe02ba36676384e825a0ba
- e0ecbceb7f26374e3328e1cff789b639d713c819b7461408151533cc54d88b09
- c0e52e3b63393f30cc12ae121e44e94788ab36b4e2f1f5dbb6373cda4f4825e8
- 5c7bfa02dfa946eab9bdd3b92126455e3350f70467db242fd7b6e24525aa3cec
- c00179f26cf93c6c833d694f23e56bec5b9e1e6b0516a330af7b4b3f050d3a83
- 0d2119c0fe15e0ad0da2c15e3b0a9be83362cc542ee9f7e8671b34273c3be905
- 490477f865fb7739496246e3950bbed7f24f5d422e4742a8e582f4e4789fa118
- 171cf6441602466757d6141afdcf3cf0edacf66bad602e6484e0111e51dde65b
- 42bc70f2b0a5b6c06b0e183c7df00b42abe2cb5451e793b5b99a53779498d78e
- a815240c0f3f208484d7c3d32330dfd2ef081654ab8c58ae930c6be9698a0e23
- 71776ea18241a6041d2940e79da4fcf0c5cd40ca9ca7db6da3ad093a5a4bc7d2
- a4a5fc6d939a3b50938b6b5d59583c27d76fd21123312e6685c586eb5d2d77b9
- 9745ad1b1b9a92bd7735d2cc73b4679bdd50d64afa66a87610117c109c4dddbd
- fa770394330ae31cd9accf80dd7bf967868cb37d90515b811ea06d37a3abe896
- 45d39a7b3cc8a10c5fb815d57040d94beb7c2c9f99ed999da89eacdcc7c01dbe
- 3c8e08103452ec1c5b857ec6f6afb3b3eaec9eafa803b0834dec261579cbd4e1
- 2eeae60fcf730518e117091eb37fd5d5c7a92352bdb39ccaeb1f754aeed01b36
- e46742f379bc88e026281f8ca8a8c805b0d72f974e0a8a88e425009e824f6c6c
- 79fdfbd1497dce5395dd7062bdfa777b909b7bd1067249de9d015c8792f1b19c
- 2afe9917408b7454f5aa7fc6a969163e20aa0ba34e835f7fbf543cbd57616839
- dac6d13cbefba58fd4f5f6fb654dd4ca3f8388cfdbcd1ade75a73e416a4810bf
- 73de370a450fae1312f2c885ee1a86982c0f9950f9daaf22f4e4a9bb9cead840
- f997add646b5a6236f7fc779ea4ea21a3aca8f36a0b21adab90fc2014e167702
- b7bdd59b267f6dba801a055b032f061edc9c0011cfc6ee3fe8107f7a4a9dcac5
- bada4c9d66d42b24a4c4d1407229273440a3da4a5a92b3d1df6c889e48e7cff8
- b1b4cd6500badfce561633752c49a293225dbd286f9b1640c555b162aa250d77
- 363066b01f48aebcc3eb2810acbec59aa9e5a9780c3f0aa4dc6cd9627c321c2b
- 455f5d057b621d069f726db8ae5efb16481d990ab583417dc3860fd38381d822
- f96e1cd455dd5c07e52b85295a40f863c527c11bf98e7917845d45aa2587a531
- ee2f0e91c4c42df9444f9e4d5cb2e8894aaeb179085e140b687d4662a65322c7
- ea8bbbff597bb4e944b413f4f8753efbcaee0aa66fc5d1df1a18804375b52c7d
- aaadf2414d9e8d57a143e19b0c0445bf5272fba75ab64ecdd0232a84ca2559de
- 5bf1ad01bead7bc089a11638477d1ae37fa09c12a51566cf8b5e017041052ce9
- 574961b10acc73ce034d82134045d0ac9381f946b35865a85259f2427ae3bbd5
- 2e094a034319647bb8963f5e2ab91e0f5276028089c66d9aa4354ac7381cce14
- 094c937deb51e4ed40cee0f82dc14db5555fb01a1beab8cf84eea3f621f44b97
- ad35c5e3f31d8ae4bd92e57f31b795cdbf7fe12f6196b0d9d88f14054f4a4fd7
- 2e054d2753dc96eed77f277bc6362c0c315b8ab5611cc2776414cb26e86b92a1
- a36eb8245a8df52785b1f232b78ed02425f0096aef6194d4dcaf29a697de5f53
- 5f71e20d10c255951b15048253335db18dbf916b3bd6b77c38c4315a9b14b8ef
- aa52c5fbcd0536b0998b90a5fd9f3edacc0ff35175f929445f5880f64e6204de
- 81b556ba99e612d477a3512f633072b61dbaf516226e3f460d593d48d0e9fb95
- 9795f0b99733d0906f6eac49a86a6040bbcf6b0c37c04189c5b0766b90fda2be
- 554137fd110750eee3a7847f1d5d51a102f679efd296540aa5ecd4c2877f9917
- 82f851b9b77cc27f2dacac68187a959267a3658d9a59b368bca64008601d731d
- 1cec4c76d5aa3a60d2b40003b5606082ef0c1fe9d776597e5e119c75f775a80a
- 62b94ca0826ea2ebffb4e48f7acc32dac59ff04e324a3f4a7d47059a7b33df42
- aba7ad40a42a60ab341dc8717cb5a1d9558a0216163db01b6e0b172c5cee21aa
- 7d566c330766b705a7a50c0a309aa737f44090d5ab679314a1fc2f05b8b8ccf4
- c3ba3baabf0cc9abaa1b695584d6d5e56bc0c4c9bb14c1ee2bf25c6b860c8e9b
- 9d45dbdeb7ba1ac0523654ca7a5a2ebabfb3166e59112ce8d9331e6b4394c4b2
- e877da6bb1678fea5aa23f2622538603d2f93b2d7990a264f902db4adc57d41c
- 74086b002a581e05a4ba732e8069c04d80dacd7c2e01ab706262cdb6392ea836
- a9b86af907efff93e2af6556d37e990c1130c2da2244565d65b372516f94c6a3
- 770617f51acf643bdedef43e2fc1477529635c7b8ca0d23e3e49e9f9fed7f15b
- 086808376186c44c821c28ff838d28da1d6c267abe001329d010ad9a66050909
- 3220098f3201c685d250877059d972a4b4b4c3de2644a2d648ef3cb74577a2c3
- 2c4fff85c6c23d898db0349c764a9811540948376355b6ef0ac31f6184b5da75
- 0122d8ce30775a87d3bdf3ce93976b91440fc49090bd70344a5ab4caa7fbe732
- b97ad9de5ceee80d0eb9ac692610be14f78d1eed5a84db9f50a6e2f3963064b7
- 5bea358c6c42e02e8e65a06321618ab859d8c7f4fca4fa62b643f78ec955c558
- 4710369d6c533a26ccf7ebed2a4456fd5d5fdaf9e90ed6305367924bba05898b
- 9d740d9aa8cda295de7c33995d204440889dca4879d37aeacebb42f61bec5ddc
- 1581ddb3915a4714ddf0a8a4e96921d1c3908768a840347828f74f1d9ead9e50
- 9e2c76d00ecac9c5038bdd76b3b1094a6365241e3507414a9c1319453b61f3d1
- f8cfa516bb3d69677f5a2c9c53566ccd31cc016a2e30273e18132b4ac47c7583
- 372240ddeb3389073d649ec12e50c583ed49ef017d0207ab3df2fd85e3a249a6
- 1e82d9d75999304aa75e7f5939cc3c210bee77e3a9d532bcc6fef81371e7de2c
- 8098babf1adb466b50af9b6a57f79b0b8013ca27c95b1b29a02fd22b481a718b
- 4f668997e6867c87469615aebb3e8a7b70bb0ab889532196ba44a6d3397ef0df
- 4048806b35da1ce2eb7a57013bcab13d73adb4286555d5d9c031075fce49f8ca
- a9678c824f55e14119255447bcf69a3b484ae9933bca3a555b37daf058046360"
+checksum="28ff07a1891255bd9747ac212c27e7e900bc7602e857ca3da08ab9092a97fe3e
+ 048491631bf1bce83c09b307c1de26c2a012e856f626f72c9d1105d5f1f74968
+ f33121cfc6b3b5f4a7c78a8214112e23ab0ea99068daca490b7a559759b302c6
+ c6ec0542e11713792e89cab887c4b95b96ebbb912ed34b2c0534ff533d0e7358
+ 2b349f2f30029582ba30fe3e683480ad33edc180fb3b435d8c904b54b542e52d
+ b91fff3cfcb186367139bfe425ea2707dd5c4cc8c2827197a3b78f167a12b5c8
+ 01cb6c27f4290ec4b0bde87a6af0f286dcf19845a4b6deb91654f31e0fe17f9b
+ 3aff79f2d981b37245187d60eeaa190c2655765a225722b14249c87c2416e79c
+ 750eed5ac1cafbe6f344f142cd9e507e0037d82e017d721f40e454a97c1a4801
+ c99020e16ebee884be1daf5b5b91ca83689cc35958047c7f82dfac6c3cd1977a
+ 682a2984cd0c7a8cba8fb47dfdf6d2893645b05845023129a949dd871f1345c7
+ a8af9562bece54797e53464b3ccace30f9da0ab9b2ce19d339eae50ac46e334a
+ fc605644f7f6c3b11ef2d6f1b58d8622eea035c450283fa004a74340580fde33
+ 0c28dcc6f879bfd08b601adf462ed5f121b00e3cd85cab4260315b9764c95a1a
+ 2c110743e4e795408f7b74564ab61188486de2c96148d599d90bfecf4ca27d06
+ b5c798377aecd95987afe932d1f241a9a314ffae8a9f22a6a975f6daf9bf6e9d
+ f3b5319d8fe63d3af70fda1221995a09fe1caaf34180771f329003307734297e
+ 5b7057c6b41c10e9473b7450a2335bae65c75a7f3ffa285bedb417456d167846
+ 442628dac4382dba8167d6b327f1970af9b099dae2abb363f56747643cfb1af0
+ 1fc87459bb9ef0b9353b9ad6bc17760060622934379f061203b6a547f14f1762
+ 4926b3069e19cdf88a69c549910973b7a389d975611887945f75a7a4885d294d
+ 5a8c90f9a8eba149a12115842e0e9922d694cf8d7f32dd3d65029afe77cc81d6
+ e4c10e154f4c342859dedbdfb2e57c2ae7f332238d21b75d8a7552241fff8c41
+ 1e3c53adbdf14125609fb1312b23ef95c74697b7a12701e08ff91d86256315b2
+ ee0a3940360fa329e7c8c9801eb58cef07e5a62dc9ea7f25214159391f6a109b
+ 1535d388b2581f57cfa80fe4813fd9ebc4ae95515bdce746640a66c86316e2fd
+ 8ec73ffcbe90b23d8492e1df2299d8182095d2a82acc73115ec4812dcb8edb5c
+ 187b24e92d2ea45e9628a45fea102b6465a4cb1729e11c38111635936809b88c
+ 88147bfb8e165a2cb5c4a12eb4a10150b2f58a7f4a9ab082354e7cd7f381925b
+ f4329adb592881ddb50f3b6eec23147b86947624729da5cac6f6fa9d585902c2
+ 67bd75ce5fe04aa2d5f41cc20394bb8d80195370cf1a907ca404ffce6a911399
+ c85ef6a650b081441af101de5cbca29e73247cac1286608202384d5cb8a82d20
+ d0dbe3a621bfa1ada110f8102c6af50e3422067b6f959d1dd249e863b9f3a5ca
+ 5354565fe5b635e4d428b058101628f79b4a18ff495616cf5a6f78c96686a9ff
+ c29e88cacf30b92ac5f6badd9c4a4679386d3247ddfce1f65de452fdfa324ae8
+ bc13a5fba7d8d80e0a5d050b432c399d1255b9e4536743b08bd7b35a701ddb8c
+ 2c03e0fcd8fd8eb22378898d53e6c6a8265179bd8555a55112d79a15c41c4d70
+ d7efac9fe8d873883d894d4bd320c16700d35c3ee36923efa6b0a512cfbcece1
+ 5abe4c3fb6a11de0e191a063c2d38e4d1ee3fd91825884ea4913415ad417ec83
+ 50a26ba411dddc55203478dfc732bd1f26bccb37ea2472134987a1a4f889b99f
+ dfc64e2c30905aac2b43c1a1ed6b0e6e33e1dab0de8a84f392ee13065c133605
+ 41c680f29d878e3431b47b9e72e0a87b2c670725f944fe4722aeff2fa6a1d016
+ f38e1e9b39aa1aad7a294bdf422aaf50a086f0609a16b90026ea02676e2497cb
+ 85c63a6edc56b6a1116654993cfa67edf0e1f8990a472ff1bc701b86f9ef0996
+ 8c76aa0d195793458f5d65af84e14380bbe042412c549dae1c3c3bce0fc16125
+ 3316f223dc11c4124c5d42adfd59e939f0580c5851983906ac6559713552afa1
+ 36e4f63936b0dff533138f35971b4f7f112847132c512da794ac9aa60ccd2821
+ 46ff5240646c5b28e27c60b7d7a7d881959d8f431abb8a5b1c2e749eb5457440
+ f5ac3fbec600922863c81c8713e3bf5ffc05cb448b806246501008d4f122c3cd
+ 86496a5edec41e00524cd2bf79773ceb01facc4d546afe19ec84161418bd1761
+ b03cc775c37a10200006fbc9132d9a308671e36165e57a75ca2bc431110d5d94
+ 911bca28502677d74568c0ad3c3775e8e311863fe6fc9c423ede709a1a97d4c0
+ 1de8caa14358bed917dc404b92f7202c825fbce5deca6ec88c93b9fa249ba9c3
+ 0a3fa2aa19e0ceab36fc5ab51d83fd3fdd0c6475cbfacfab489cbe0a82b821e2
+ c4a98b7cc75c47f49f9c4c3d039fa4e977e119b623597bb186999bfa92cbd590
+ 68fd8321736190d59ca3fdffef597469b8dfae3991080534896dcd61350faaaa
+ c44a918f7170af42ea725e088453e9aedca7e7cb6cecb66b15aa92141bf5371a
+ 4ac23d6aaccb51b8346d7f0fdc4a0afb12e69c5549dd02c8d61830da17f22936
+ 7c3054ae4197becf5380b74965d7c678398b2ec8392c61b103b8f9819b35bc88
+ a3a839e28d42221e9e6e4c2b93dcb0813fa4cf4a48627f65170d5b86cc98c0fd
+ 0e5f6bf088cd7423780a23b6453675515276086a887f920091a18db1912d59c2
+ 254f444bf6dc1817000c225456be157e4cc45f5a0c31dc89e959e7500ac011dd
+ fe9f67d4af0e0262da93188de7282fff6a60984eaef69bbe4853af89a07edd3e
+ 2f1c0d48c53b0432b4d3f17a8d30c99bc03dc3f5198f0be033505a63005e29a6
+ b53c121bc1eb7b13b79686a544a7f3a0144188361bc21a0ab595bdbd1fd0fb34
+ cab4f3f48572c591e462331da181b249193d9f0840bc82465ed9f5669535eaf6
+ a3a89914777a54d68297e7143326549db8a3dd97a6978311f3a707bb05955e6c
+ 9a3bab03d5fbe945f2f15bec33c5ae2dcce04eb49b9d02664c128de310f82f3b
+ 9b6f4fbea07751dc0c14572e61ad9cf1d8d464952896b3019ca9759216432bc1
+ 2cd3f9f8c41a0e7cc376833d48360ce22ce16cd08c2af4408ea21d520cd71735
+ ff61f31e21fc2bd7ac2b684d524602345455715ffa9dda0857c7ece78f3279e7
+ 527759957999def1bd4c282df2142c3001dbf1f1cef9f2c30cc64fd32135106d
+ 2d79a06d61d2374ca3302475a40d4e0e247e5e60b17adb6a80e9aaefc624efd9
+ 175ee47c9718de89d5ed701a9ae56f5e9c2db95377b1458f36804cb3b47ae0b3
+ e95e0f28aaf7adc3b637f82a63b6426ee65a971c936ecf679ad2ff732a2c23ec
+ b0d9e29b48d32242b1673133a91639872fe0d562bed93af7c5a19b96cdc248bf
+ eea6657ab7654cdcd4fda579b93fe5f27fc3e8a0c9d311dd8df7e3f8e0301aa1
+ 58d1efbb031598d809f697b5bf67c6fa9fe0cd29ff874a0ddca4d91c17f7aaf1
+ e06db4f7bc126b94973c176ebcbc9a27c4fbf25dbd827950f4d0f9817b6bc61e
+ 4ed525b293a103e7b1c4eda35666fd170e31c00f8afa05d663c2650afcaa6c41
+ 3181881328a725be968a5f13aa13139bbcdeca172dada2ba98b7b5a4b96f9c1c
+ 905138038950c94af3349bfa62848ef46c9adcac45cebca5625647835f5c94ce
+ e63fe0b29c20ede95cbe5333280f8a458c0b5608c5c8f99754edfa090b4156ae
+ d80a364f6dd21438ded8ae0ce5ff03e3f412e30c9705f44847c5dcf2f65be40f
+ ccd0533e32b453b5022ca1a49738958b6243657e9e358bde7e80fdef04961d9c
+ 08c18f3e3725fbc18cb315d3a4197bee723d83e866f50e5d5cd4eceef3345b68
+ f5929d30d7d29b53fb92c5650deab4e721da8d4147f08e2b3e1dcc37874f3395
+ 8d6092a57777d8ad81473fb8a8f19f76b7f5d7f77683891ae012435f5ac388f7
+ 61420a94db14909eaed52deeadae290b04b4482af942f2212cc5343f9ce0ea87
+ 110589435cd77c7668d649f4fcf62f46df23f7ef3d31597adc4dbe8516598c82
+ f4d67c2e26fdfa4cdaabc61dadb0d71199e48061fc362fbbf215386e34080897
+ edbb32e7bc4e3833d5e2e0a3d3fae96255441205c308f90928cfff63052cd8ea
+ ab2d72315317947bd848fb38cea4fb44da4cf72995cf34ba0af665b2efd3caac
+ 3457b6d45fae34ef18ef3ce87048ec61207f8a7fb6410c85c5ecbb4b6091579b
+ af3f76ddce5a8b9470da757399e49b45d0b3443f6071e4fa95c173f2e552995b
+ e22cc44925b38dc8c8fdc0c951ab55568b596c5d92bdc0cd27c41d06426fbe2a"

From debbda3484b792383d0e8d3bd2299e88015d8960 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 12 Jan 2022 17:51:04 +0100
Subject: [PATCH 0388/1427] firefox-esr: update to 91.5.0, rebuild for
 icu-70.1_1.

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 5a8d21f794f2..c56c924b7c43 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=91.4.1
+version=91.5.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
@@ -13,7 +13,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz
  https://github.com/chmeeedalf/gecko-dev/files/7729086/esrppcjit.tar.gz"
-checksum="75e98daf53c5aea19d711a625d5d5e6dfdc8335965d3a19567c62f9d2961fc75
+checksum="f45cd9c96227e3e6eabe37962ce924b7a7ca86b6c191326c1bab18e082b4c813
  5e926a8be5d6d4949c3bc3eb98e2103692eaa26a98928db432b1d44b535f7241"
 
 lib32disabled=yes

From 61fa69a97202442000bcb3f2571b76a24b4b81ea Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 12 Jan 2022 17:53:26 +0100
Subject: [PATCH 0389/1427] firefox-esr-i18n: update to 91.5.0.

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 1b6b7b6c81ed..f4d9a5ba089e 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=91.4.1
+version=91.5.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="ae7e1bcf84430b21ebb560a7c6c7b298d74194461368e86ff20340cee3bfe013
- 46df240895607dee205d449075d70abad3a49600dfb7faa971aaf4e4d69c0e13
- d24b2ed77bc6a8d24fc18218def24c75e052f01b3832dc20a45eb856841bd8a7
- 4ec1b217b9017c2b0caa7baa8f817d1fa18c1cb7464fd95436b2e8c1cac644e9
- e5f107adc1a504203e358d489aea3d778e0b75be4cb5af365313438fad7626ed
- e7569067dc139ed22fb98582f7d347fe39cb04e60e22e66e2044850b231c2a62
- 2a1c89393fcc8a498885c34d467d2485dd7d6858da49650306a1e1e97c8caee2
- be8b2fc6aa6ed488f50c42f60c834d310845310402361287a7827b576691ff4a
- f7292a6ace60d9b15ff2fe7a93c492d29884d074f223d777e6ecef08bf32587d
- a7fadc7193513db4991d738ca14bd22c63fc4704f92f9dfd6dcfa3966c9f4cdb
- 38685ea5dd319f20f7bbc366bfb833956aff8083cc982a10c0df26f0cfbb02fc
- ead960cc7e98b463d52a780cd99e7d9c4ad82a1e0fa11c2e42ad4ec6d877069d
- c21ae2908db9946c4ee97a13fac7d1a12800923f9c1776e1aa366c854ee645a1
- 6e3d76182dfec9f58e364e4081ee27f5318273f0f06db065be4e51a38c059f4d
- 294341ec1f8b149459ce9e674b5777c627da80ab8d3a00bf8767ee2a1defa726
- 0716f49b99f8f6c2ddf79fadffca1a67bf2729a9122219e96b82dd8bfbab5257
- d218acff93fd1e8c3f8be4b93e1916cac829fea247641118696560db9ffc4f5b
- a58de7a6f69ba4c148b889e0d241a3dd9e70dc8ee36389f7914af4c2e0934064
- d4745a148d82e4b7f4216c046637bc34f8502f658663202c4a181a67d1bd532b
- 00006e9de7925538dc1cc81c5762eac01572796f4d4db6dcfa5feffb1ea47a66
- abf939b9ef36631ce8d1b58f4343b5e93a33c684acb0e3bbd5e614a8ceec3940
- 1c6bef188f754203dd22637bd34a9e5ef2fe65ff02ea33bfe51b7f73d5b7e144
- 72bddf5c2183ae7f4b218425a10862a892abf85361ba41dc303e5d1e50f7111f
- 52c0c42493ad40aa8f36328db39a75344deb3a0ceb9adb9c579dfa192d93cad8
- 490e592c2229d12b42c6a10455c74dcc532e028bf53ce7f340e0cafad08c5f49
- 0e9bf8bca2a313768bd6228330d3a43e50cca398a41e32c070cc462cf853b802
- f219e21b708bb02e10f0fc7fba666ce5bce17dde4663786169e9e8ed144abad8
- c49bffd9842574f938e61dbcef8aa4c4abb4f9dcd76e17fa347d636517e1ddbc
- 3c6f8646627a9250bb46d622a1f374375b0fc6e8a594960894f66b72bf35ac08
- 73e5b091b11187145f78fd69b5593c083d3ae1736ebef105a20f6d418f7632f1
- 0207f4729dfddc5562bc0e8843390e53f311679cb744418ac4633082aeb399b4
- cbc48354a943e553e50f97670092f357e77ed474911b66540a9a0e25e4e12fa3
- adc43b5e77fb254d31db461380b7fd2b68fa4b7d39bfb73d886d5780664d40c1
- 1917905a8bdedf366450cc5c7fc400526b0727affe73af9c1a42e2996075771d
- 7deb139083d1b6695e23c5dfcfb01116c1d3fb1fcb102a386a432ee8c4f33330
- 3087c587bc9ceb4294851f3ff48562f171b3e0580c840c80f922e96abe2a7eb4
- 858d1e9eebadef631fa82b796f8162b70f361b05f4ab69b6e9d466806fb6d5fc
- 12b00be159ea24fb4acfed34dc4bdb0399aae5c6efd3efbe8a0fb18cdc8f36c6
- 78b755d2cebfc7e3fdc2a78218d1717597a15ee0342899ce1ae3e913dcc4f704
- cdb0f1db343ac3efd26bdf95e9f2f75b4ef378d37661a7db80c8a855e03919ff
- eba844f5c1d85174db5a49ae2c4217e8f22b704bf58ba1170d409af4590bf33f
- 86e12a644a93b30f2c2c0e3a923616aeb4a073bb094edb5c41cef4e29dbdc692
- 046de32828428788bd45fa057d92f087b9cc400a3eeaf5c4dfc86e0438544b50
- 358e1e7345be62af20d4b5338def47adfd61a6674e4dbe954984faf517d2e630
- 53c019fd98abc52a4b213ee186eaae2c03e1a1046517e327be65d2c9371e4c59
- b8003a43bd1e5daff55b21c2abd45480896c789b2fa9a10751f5f309d0c53b9a
- 3a588661f52028d7917a2ba01ff4d64377cdd57d4f0b71d6d7a98a4d82ed4840
- 2ba0d00d96e6877fd36610e1f1b48145eaa22c252f0119977630fb1b7210e860
- 0c5c417f3e3c14877768a80170b73612ce22157266df6e6e92e1d5c315b28783
- 40634fdcc7530b7d1f9389a66f1676e58d0d52f7e1921bac82d56e77108fdbf7
- c6609ca00326ab59e5dd59fdf3dccccba9c1cae4b0128a7c52549fa3c937fded
- 4172f0b12ac506da4dd94dfe210139589490c760a392ea89d0fe81602eab76ee
- f7761afe146933d56beba66e3168b64c93d67af4ff52afcc270af9e24606af1b
- 27315b2300c0e566486063197e210a85c484e500abb6d91380267e02412a6c8b
- bda75980ab8517689c4f6a8fc80962c7120701a1d0b6b2f64a489adc22ad1cc7
- 81febad03cb871834d25b188c4213c5a5db5a0d97ca40ae5537094be62a3e5e2
- 6df7778314922be1e5c2e2bfed5eff17b84a62f1de66e31d754510fb65a43754
- 0e1055503cc53d2ae0b5324b5ec42d542a2bde4a64bf1cd98f5c452d06e48a2a
- cab696ed835149e215c3050d202dbfe53d4606dc9fe5ad148e3727fcf5752991
- a6eaff8aa3117ee61e394a2445a1a372a0491571e5e01a7498fa667cfef8f134
- aea6c771102730139fbdab672ae193cc6b84a2653953ff751af6010b7e8154fc
- 3adb14c9dec1d3d04d109ed3d839160225bd345ead593512885bdfc742152172
- e75b59f7b4114475b167aa30a684e7390276bf43d264f73585d5e03a613e9a21
- 247433336ac02898598707b1dcebe6576218c48be07ede762f7985fbb0c4f1f5
- dad023938efc516876beae61b5dc8f74d19040f883804c7ddfe3cfbeb0ba43a9
- 38f1153ec1516ecc4741d26098d042b37daa95b8cb677ecdba05069c768a5e7a
- 9ee9419947694201b64076839ba09da777cdc5f9ac44dd6a28e7e6ac2db013c0
- 2dda88bfd581af48230937069dd50b7dafcfcc7d61c04ad59e4b0d862b15b63d
- eee118fef8d3639fd079d6d92941dcae4e7cb5f02e0448393f290a024e97b437
- 473b97f47b9074967da70d076e62a924fc39b97fda8739ee21f54817b4469453
- 2cc9fa0be9c0f4cb945ae76db7f86ea9717c84b188ce8d2046870a42e3a70c64
- 706a616e32a2ec007024ebdf27a06f4fbab425100940079cf978bc56de8ac4c6
- a9a82023591f58a343d057fcd0c605b2ff893659f6564df34912721fe0cf5571
- 1f08601dfb91b6a3cd32c44c842b0523e4a0a82ac8468b2201264c1287489dc2
- 4d3339d4ad61e458fa39690e9004294ab190bc6786e253095789da480e5f16bd
- 33620ed8aea5271eb195a65cd64434a4ebaa9d38e0543ff75d905aee66fafc81
- 33cb5da4064f9edc11ca8a68387ca0c45987a4ac2fb89ad0d21e8aeb6e968f9a
- 889873998d8e5366ce8fc9c4fe0dfbe5116edbc2597759d663cd862c8fe291b8
- cd5840703f151ed1163e7493a5e9d373be8963727375f312ee831f9038f62e28
- 8103597355602bd44d035f3b6fbcf265ae5ff883c98c2f6f039e545e0bac6ddc
- 983e22d5b7c2187effb01541d6b547e1eef94842690faa711056be73c3f058cb
- f752847676d677e691a54e84c50147fea946c7f003c2e7e069085417fef15f40
- cf3ec2216de8dab10840339009b717f48138be96d18e247058e67865c7948213
- c91021a76d6cf0c04f4e21348d228e285860863af5c0a26bb790fb931648f260
- 693cc055785211f3e2c7cdac5d9ceeaecfe4f7bb294c18c85d70dedc8880dc68
- 9c924f5e186c2f9d0c3b9bbceb6982919438ff8bfa89ccf8897549a7553321c7
- d38ce941e3df2ef469cfad568963dde8b4efefad902f3964300d7db72c9dcd0e
- 9ae606eb921fb47af47b6698d164a30cf44d908889b42422edba4cd7eed68742
- eb83abee2830950cfbf5d5fe7b5895060e809218ab4235a918d776b30975fc1f
- 9acb5e2f1f8ca6a96b773fc83ba3167fb373742c778e6fb8ec8a5ac20b8a2954
- 982df0f1597211673da21d70301ad3babf4eb5cf9fe1e86647d5950482b98a5e
- 364fc31a358318851a09e449337f2ab61f91065116f97541ffc61664f7278de5
- 9d37baefa26f73bfe2fbeac00978c79a8f2d8e206184eb8fe0df2e3800cdfe26"
+checksum="3fb6c304199f1dea6bce7e920b470fe20c6007db80fe38de58947988f6005e5f
+ bf518e524711b65d8ca9e37f9ebba1ed49edf9468137ceff47d03193d759b5d6
+ f37ab1eeeee7e199cff260f3a49bb222084622f5280a5a161e9cc3ba125a961c
+ 3ad26ac371eccf50e6e27aa3299311ad3578ebf7591e71eb4556670ae73debe2
+ b9ff89ea8cbe046975f6fe525ac2e3390dfe8c09a8144cd5a1c4443c5ee78cd2
+ bf6c886d2d12dae1a318bef5797c4df08f9ca155fb4ad90b123ea6a2da36c60a
+ 4c7f8051f6c4816a27999f392b4ffc39d2ccbc104ddf58e43362ff86b0de92ad
+ 97f8b298df1c261ca3d3458bca839b52a5fbbae693477ef25e3ca09f98202b5a
+ b6e373ab94062c38998c2b13b5696b235740b20aeb6e067becab96890937020d
+ 269cb9a5af27b30c6be48cd633b17a7b0f7ac072841e13f33eb0f3d138aa9636
+ 99120e012de41bd6b0b558c94f7b325b4b1966a94b60a821683fabefe88429ce
+ 5de6ca52a426ca01d735b8e8d7e3d2827a83bcb47dd7f5becad4689fc48ecd14
+ 33a1d01306d499b763d7b1aa2d4240eaa4bc30ceb1f40dfa7a7a0bb743419991
+ 31a34292018829cfe315f134c85e4b4b534b583eb5ad340cd66e16f5e251b343
+ fc51e8f55629de9800752544916ca23d415d5e59d0eceeb8b8c0e5e03fa50058
+ c787662519e93c4b9bfb2b9850c7656a9fc50a419174bb7972307bb5c29220de
+ 7a380f1e680ffab8261770fee7f9213cad9794b3ac083cc8830be881d3695008
+ f45edb83c88567370439dc06ad1b479f25b0d3da4b5b7136ef214795263920e0
+ cb3ae85ccdb01adbf6624c6bd27e9223688de6fc0536766d0cfd9b08591a9c03
+ cc47f196cd481bdd3c22e352cd2305f1ba68bd881899c70962c290d56beda00f
+ 0e3b0c9cc26438148de8d1bf7d60f47a38833bd7da93b02900ccc6a76e4c779b
+ 9ddaeccc0f67b814197639756a04f4385df41a2a53a358d659e71b7641974054
+ ad9670c0aa9b5a000eca48e81f249fdb718f10c9e79fe596973fbb1889893f2c
+ 37212fc3c2beded92084155d313193c1c59a400c46a92c22cd50215e2d901b8e
+ 3d9667ffea293e654ae5602e588149b7104d31caad48a8fb615cd94466b4cc9c
+ 2e53cdd93ed6bb44b1e569797d8bbcb2d8aef7bea2dc25898feb4a5368f773ce
+ c407ca87a8736b51326d50177766649cc373817d666677dcbf67cad45b9e2da3
+ b9910bca85aa9aceb9afb6ec313c7b15971bb657665c49d63909428fc0f6680f
+ 026614f3e2bc96c525c5825f70a5b9902cf4644218d1d2dd43415a3e3febe697
+ 033eeba29cd2832d08289b478289a94bbc258edc3f91f26ed5b41f42b14da0e6
+ 215f6f4394e2d0bb2b9906475176ba517118927b8fcd011bf7eee2581943fcf7
+ 906eb0555b7a9d88507e9bc1e82f336589b6a304cd29fbf530f8b96675d336ad
+ 56e9da9c7b27a5ccf2a070162d7347bef26600516838e5015226fc4353629371
+ 60d559f619667a3ac7c980670f9bc09a0972c2c8de71831df52c2a9d00970fd6
+ bfc807fc92b951cfdd68a6f5834a66f5a3fdd34b6c714605aa1f8c998fe769aa
+ 59d27755871377d75a7018869f940144c7ea2942277eb431678e8b2c887ccd73
+ b7e0751b2ce970c6ea0ad3803fa004ccb7f577bf84fdfd38aa6e133489adc180
+ fc73347c8cfe793780cfb52d8bc1684e0c9759646a1884f1e87671b260534a23
+ a6a44c18bf07d6be4a28f086d08ac080326f5a090bcf54c82d12a21237b4be19
+ 2c360d705b5b5c6788f5b8091040a64bc5453f5d53c83b1512e33c8f96d318cc
+ 15317614f69f9437c46ca11a12beac4ba767d9468ae6a86fb746dde62caf4537
+ b00d5d51678c32ffa0c66632e695e979a72cbf037fac6e92128eb2e0f0ddb205
+ 8cfc71b3a4a4ae803fa3fedc7e1c94d2770c02c3d0bfda61006318da0129fcb9
+ 48d94adb40f8872ecec71e4585fb50d8d6ffbb1992c777d8963e5164c06e638a
+ 3f0a84c6c310fd8c11e902bc41225e79fa694f9f353938ba599634d729c96473
+ ef5fe1c34e596b2438bcefd707f8139ab64840868fb884214b8d63e497f21417
+ 4ee2a4cd3b86883e140c6b2cb98bb3efe7a008990d2896c9b1a765da68b7dbeb
+ 302f145b22ed543ab32e7c624857719c04def1276e8e67c428881fef99374118
+ 3afe843e3662e188076804fb05e142e5b9420e1e1ac3d01aa6e23250899b8679
+ 722f8a4caa3423c3c4f49d343f7cce7bbdd6423facb6b85c2f3d4280a93f0532
+ b96a9fd169bac9ab2b8a56523b5f501b048e1968b75c2dd1d83fce00307f167b
+ 79162db7539269c024c7bcc9ab62915ffb6f5cf49bf77fa462923cbe5b68e4f3
+ 5f84973a81e8557dad3d4ca49af5e80b8d259d78a1f85be0f3a078d7fec9b0f4
+ 077eb1ebb4d47303ca0f7bf4f1ddf98295de66bd143aec6f754d14cf61a35a1d
+ dbb03a70f98b4994d4d9c90ce5a78de844a76ef1143d3d4683b64760543d2817
+ 678f64b636ae4c3f25502f9e7063ae83973524c3001150078d0c0b0d55d8151a
+ d7989850358d98ccaca1c382b6e0f6cc6080bf2584bc52ff2b6d7df7e7d5d48d
+ 6431ec0d6be0fdf76f44478c31306963c462e67f79074d53ddb71fcd7882196b
+ c7eac0b031171673366e71e5f92cfa04fd2127207dd7dc5f5397d67be8e66c22
+ 4b1182df2c37df51d48db570ff4ae1632922e4d4f98089426222b92dc9f571f7
+ 90ea2686ce31007c1d4c2156256b270c7b66432465544812d511e7ca03908965
+ 293621db9f68fbacc545e47d4cc5cf504022c9dde1b2ed3065d8d0911f7614be
+ d5302f6545a5e4d508f66ba0b4726120522a7d2c2570a110a1ac459d13b63c0d
+ cec38b9199418a068c8fc2755c0ad236cd11d09c2dc79ea50148f7eed98bb72b
+ 3ce34927d40ffba0faf0571e745a2dac4a15df2c33e576ccffcbb615a58296e8
+ 335a54ebbb511d12a63439e30429055714e1f6915e0f8873f62910b8c9c373f6
+ df8109b12efa428b574236b99a235dc2a9fb04d27d6c11b910f234ec472d19ef
+ f59f317c6b21f87879c50e1a6a55e1c39de79a8ec83497eb6deb30587bafb48f
+ acffd4af4415d1b88183daeebc673c5309bafb321d9bf7c32d1b5c9c3941f501
+ dc23f4432cd93dd2f9b05766e69b3737e3ef7cecb57a8dfa7a43729e5ed56133
+ 069b1c4337b1e1782a80d706f1b26ccc8807e9fb45ae16f59a76985e442caa0d
+ 79856ce19dbb6d6a19f910d7301b56a281c6fe1d7c945d014ec7bfda3a6957ad
+ 7f2d6762631d08ebeb080109f96c58a45468dc60f898cd40e69761ab2bef1746
+ c59d94a5c6a2f0fe18397c7beb14ac6be43518f2e2fb56bb1eda1807b831efcf
+ bb0cf15dd7a584e679c8d795a2b963f176602eeeaf50a00d0c542f856bd304e0
+ 8d4556834918118c6ff4c6435941258c87e59186a388a18a2b2301b1867104e0
+ 30752fa5a6cc5f97f6729208b9f21c79516c167fb1e6771678debd039e426756
+ 0cc4f0a5fc2726a081284fdce0ae109f7e5fa0bca651882c3a488ee2d332ba40
+ 9eac2ab970b930e387719887ec52b0ed8524d49556abc3df4d34fee5fc4a7c09
+ 684639ea4b251fb40006fbc641990e3c1ddd2bd987c990bde2157c4524b85589
+ 929a3c17c49f73a6b701dba2ab3eee2a22a66223b4a82fb76cbddbd6ad121cba
+ 3753ff493fe664e443f28539bc40f82e6449b524fa3618ae302c1487cd3ac68b
+ 3d984c01d9a7c55718dd3650d23298a158771471c045c5828939d168d9efe2e7
+ 074fce3f6f19cd8701008c5d216111fc1396620cbe9b4babd727f796dfc7a2aa
+ e4a3cc22f589c220905902957ebdfcef7a5c648521311e179fe573419b3f128b
+ 48fcd8e218fb3875b30ca9b4d643e4e4be2c3461249584c592758c9b676e0140
+ e859468c87234b369c5539ab869932c21f63731044ea2d9950d7d6c01fbb807f
+ cdd9bd79ec053cafc3e3dcdf0a96002dab81b54761364ec1abc91c840b707f2f
+ afe69764908a07f5205c61ffe5736849f7ad46ac8982a910c4cffa25b1042207
+ 73e1848011af5d15760094694d24a23db22fd274353d9e9089317ff3c30bb1ad
+ be81674164f64ae1a6bf295dd40ddbeb09f524b09fcee102f10127be67037573
+ 5c4b6046060c869ef52c1f7c42f70ab2077c7f4ee25d460d4c53d5fd5806633a
+ b05cec25f4a85cee8f8596a911e65504361d4485c3dd59cf96bb9d6df8530951"

From 8c2037388450be19daa5a9d099fdc69ac95a2ae0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:53 +0100
Subject: [PATCH 0390/1427] freshplayerplugin: rebuild against icu-70.1_1

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index e7dbb2758861..f24272ef708f 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=8
+revision=9
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 76d3655503144541f1d321a658be2ac135349211 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:53 +0100
Subject: [PATCH 0391/1427] fsearch: rebuild against icu-70.1_1

---
 srcpkgs/fsearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fsearch/template b/srcpkgs/fsearch/template
index 9693a8e2777e..06c3a095c5ef 100644
--- a/srcpkgs/fsearch/template
+++ b/srcpkgs/fsearch/template
@@ -1,7 +1,7 @@
 # Template file for 'fsearch'
 pkgname=fsearch
 version=0.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="autogen automake libtool pkg-config autoconf-archive
  intltool gettext-devel glib-devel"

From 063971a789502534aa5d9dde95471e4ab66a2b53 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:53 +0100
Subject: [PATCH 0392/1427] geary: rebuild against icu-70.1_1

---
 srcpkgs/geary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index c863e4ebc5ea..12a466967db2 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
 # Template file for 'geary'
 pkgname=geary
 version=40.0
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"

From ea0e47fb03e7a5ba1284a656bc2c7a26a50278f5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:53 +0100
Subject: [PATCH 0393/1427] gnucash: rebuild against icu-70.1_1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 78ece5021ecc..34c575dddfd0 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=4.9
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check

From d49dfd45324efd75cba14b68e16b8ba0f1619141 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:53 +0100
Subject: [PATCH 0394/1427] gnustep-base: rebuild against icu-70.1_1

---
 srcpkgs/gnustep-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index bafd7370419d..841ee0738286 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-base'
 pkgname=gnustep-base
 version=1.28.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gnustep-make gcc-objc pkg-config which"
 makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel

From deacc57f541ca4e335c2849a173e74662a1126c8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:54 +0100
Subject: [PATCH 0395/1427] gnustep-gui: rebuild against icu-70.1_1

---
 srcpkgs/gnustep-gui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9371cb40d30d..f97871ce2ec8 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gnustep-gui'
 pkgname=gnustep-gui
 version=0.29.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gnustep-make pkg-config tar"
 makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel

From db5a75f91fc16aa3ce06402ea5550f1f6635ffdf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Jan 2022 16:08:47 +0100
Subject: [PATCH 0396/1427] harfbuzz: update to 3.2.0, rebuild for icu-70.1_1

---
 srcpkgs/harfbuzz/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 1764bc6ef8c5..0e9ee94fde6c 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,8 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-reverts="3.1.2_1"
-version=2.9.1
-revision=2
+version=3.2.0
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
@@ -15,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/main/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=0edcc980f526a338452180e701d6aba6323aef457b6686976a7d17ccbddc51cf
+checksum=0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd
 
 libharfbuzz_package() {
 	short_desc+=" - runtime library"

From ec27cde0747380a57db54fa4cb65ff3ef9024f1a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:54 +0100
Subject: [PATCH 0397/1427] icu4lua: rebuild against icu-70.1_1

---
 srcpkgs/icu4lua/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 665433492423..7eb90a542272 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=10
+revision=11
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From f21ef42c24950eb6dec96b5bb9295183fda2a98a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:54 +0100
Subject: [PATCH 0398/1427] imv: rebuild against icu-70.1_1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index f498eba05999..50d351c4ada6 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.3.1
-revision=1
+revision=2
 wrksrc="imv-v${version}"
 build_style=meson
 hostmakedepends="asciidoc pkg-config cmake"

From 93a0efe8d59e2b841aa9e762fcfd3c293b7a433c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:54 +0100
Subject: [PATCH 0399/1427] kdb: rebuild against icu-70.1_1

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 509915e3e6fa..d5c1eacc239a 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=6
+revision=7
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 36f1c82ecc69434bb8345e7d7a43d3e8c524db80 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:54 +0100
Subject: [PATCH 0400/1427] kiwix-lib: rebuild against icu-70.1_1

---
 srcpkgs/kiwix-lib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index a649948389f3..2daaa6fd404b 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
 # Template file for 'kiwix-lib'
 pkgname=kiwix-lib
 version=9.4.1
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel

From 48d6b5f625977d885a52c120f1373d182e6b1ec9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:55 +0100
Subject: [PATCH 0401/1427] libbitcoin-blockchain: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-blockchain/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 9f9b36815f49..cc3d53b8308a 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=4
+revision=5
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 39f0b759415c5a3b171c4d693a256edad407d771 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:55 +0100
Subject: [PATCH 0402/1427] libbitcoin-client: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 5b63efde5db8..13293fda2481 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=4
+revision=5
 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"

From 10215f2dbe69056bcbe42f136d43c4a37bac0654 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:55 +0100
Subject: [PATCH 0403/1427] libbitcoin-database: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-database/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 7f30b50739bb..d67dc084e2c3 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=4
+revision=5
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 5fa62f09b16d51a7e48530e0d6843fec66eed1e3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:55 +0100
Subject: [PATCH 0404/1427] libbitcoin-explorer: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-explorer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 8704c89d558f..49d83bfb3606 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=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 18ca9a6cf507bca909f49969ff87ca4d3efdd49d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:55 +0100
Subject: [PATCH 0405/1427] libbitcoin-network: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-network/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 0ffc3b9a6ab8..7edbe02b1062 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=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 7018bd286f9be4616fa996ae117d39da899bacfb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:56 +0100
Subject: [PATCH 0406/1427] libbitcoin-node: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-node/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 644f31f36a9a..c5fcd0094abd 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=4
+revision=5
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From d85ad765c96a5c342a6ba146abd5440fe722ab82 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:56 +0100
Subject: [PATCH 0407/1427] libbitcoin-protocol: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-protocol/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 7209be818c72..be5406d16baf 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=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 30af890ddfdca19a8571ebd7d2aef8a9cf54e572 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:56 +0100
Subject: [PATCH 0408/1427] libbitcoin-server: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 6e770407dda9..7c275248cdcd 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=4
+revision=5
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From f3992661c4a9b0b3cc43e2be25058222674cd6d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:56 +0100
Subject: [PATCH 0409/1427] libbitcoin-system: rebuild against icu-70.1_1

---
 srcpkgs/libbitcoin-system/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index fa17cbfc55e6..4c7f4c8d231d 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=4
+revision=5
 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

From 8f0d3c8646143876fbe8ba43c127efec9da9d3dc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:56 +0100
Subject: [PATCH 0410/1427] libcdr: rebuild against icu-70.1_1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index a73f577ba845..e32884e044ed 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.7
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From af2dab8b289173395b634aa8acdeeccdcb94d56a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:57 +0100
Subject: [PATCH 0411/1427] libe-book: rebuild against icu-70.1_1

---
 srcpkgs/libe-book/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index c45b15b98d54..95976854e5b3 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
 # Template file for 'libe-book'
 pkgname=libe-book
 version=0.1.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From e9e7c90c814c3a3262e5321fdf37a57bed32b09f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:57 +0100
Subject: [PATCH 0412/1427] libgdal: rebuild against icu-70.1_1

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index c34684b8115b..870ab22b4cba 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=10
+revision=11
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 5f3ce9688cbbdba0f87ebb4fbfc885ef6d6050b4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:57 +0100
Subject: [PATCH 0413/1427] libical: rebuild against icu-70.1_1

---
 srcpkgs/libical/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 73888d413a3e..1a247410c373 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
 version=3.0.10
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir qemu"
 configure_args="-DICAL_BUILD_DOCS=false

From 4d297e3a4b2aeaa7137a56c6a89c7d35d027d091 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:57 +0100
Subject: [PATCH 0414/1427] liblcf: rebuild against icu-70.1_1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 71684bd89e3e..6781688c22cc 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From 23117748f66fd29b00e9686ed8a629cc9c0e3082 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:57 +0100
Subject: [PATCH 0415/1427] libmspub: rebuild against icu-70.1_1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 2dea31ee46a1..2bc06bcfa1f1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From aeb575f3d19503e328a3a3f33cbe92122ab73d03 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:57 +0100
Subject: [PATCH 0416/1427] libphonenumber: rebuild against icu-70.1_1

---
 srcpkgs/libphonenumber/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 2e61f3f083df..4bdffa6a96a7 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
 version=8.12.39
-revision=1
+revision=2
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu

From 75f8b3d3f82d27dd96c43a0343a16bba45df8efa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:58 +0100
Subject: [PATCH 0417/1427] libpsl: rebuild against icu-70.1_1

---
 srcpkgs/libpsl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 9f1574767f47..1d81ccdd7749 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
 # Template file for 'libpsl'
 pkgname=libpsl
 version=0.21.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="icu-devel"

From 439f5b01338d8423dea7cdad262d5bf0fb8b0164 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:58 +0100
Subject: [PATCH 0418/1427] libqxp: rebuild against icu-70.1_1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index edca219c3606..7a25c1a1cca4 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From 4ae3ff8c7860ddfa29b2afcc271e671ed1d42775 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:58 +0100
Subject: [PATCH 0419/1427] libreoffice: rebuild against icu-70.1_1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 9e3208ccf364..46066a6c0bb9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=7.2.3.2
-revision=1
+revision=2
 build_style=meta
 make_build_target="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 0935d08725c80c96f97f37fe75394918c9c34c86 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:58 +0100
Subject: [PATCH 0420/1427] libvisio: rebuild against icu-70.1_1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 4585b7c55f92..71e155a2c52f 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From 1f702483b66afde91a36febcd4ce82c0b66ca5f7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:58 +0100
Subject: [PATCH 0421/1427] libxml2: rebuild against icu-70.1_1

---
 srcpkgs/libxml2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 22d533816ab0..229b60e79d96 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"

From 2a9dbc0746447415f4025eb8c03ace35fa9375cc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:59 +0100
Subject: [PATCH 0422/1427] libzim: rebuild against icu-70.1_1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 0121a8bffe45..910e099870b8 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.3.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From 331fd7cf33a7690a314b710725229afe5547ebb3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:59 +0100
Subject: [PATCH 0423/1427] maim: rebuild against icu-70.1_1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index ff2758d370fa..c9cfee875339 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 1f4741a5992c269c6f626edb319aa701ba0319e0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:59 +0100
Subject: [PATCH 0424/1427] modsecurity: rebuild against icu-70.1_1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index af66ed3d01a3..4b8810b071e3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=3
+revision=4
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"

From 58c6378acfb81fdd5cc0c303d4863598c89c5775 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:59 +0100
Subject: [PATCH 0425/1427] mozjs78: rebuild against icu-70.1_1

---
 srcpkgs/mozjs78/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index e3167e3a7588..a008151398f5 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=3
+revision=4
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 8d3600c14c33d9541f4f14fa14897132b5ecffa8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:01:59 +0100
Subject: [PATCH 0426/1427] mpd: rebuild against icu-70.1_1

---
 srcpkgs/mpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index fc9c4153e284..eeb298abfa1e 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.23.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled

From 4aeefae0fececd66a608433fe346734e5d6326fa Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:00 +0100
Subject: [PATCH 0427/1427] ncmpcpp: rebuild against icu-70.1_1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 482d2154c0f7..8daaab69f237 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.9.2
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From fee6c5a3d747519b4814c4ca4d1159943699870b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:00 +0100
Subject: [PATCH 0428/1427] nodejs-lts: rebuild against icu-70.1_1

---
 srcpkgs/nodejs-lts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d5120219cca4..0bf3803bbfd3 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
 version=12.22.9
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which

From 1a3647c3f1af7b7e4a23962b57352a37a6b7c700 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 14 Jan 2022 17:46:24 +0100
Subject: [PATCH 0429/1427] nodejs: rebuild against icu-70.1_1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index ed0b7158e688..30f6abee2a5b 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=16.13.2
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel

From aed97f96a8231b436f14797caadb95e4aed922d4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:00 +0100
Subject: [PATCH 0430/1427] nuspell: rebuild against icu-70.1_1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index d83bab0e2a18..4643db61e380 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=5.0.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="icu-devel"

From b7461cb7a44f373ef57ff20ef6518af9795f7fe9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:00 +0100
Subject: [PATCH 0431/1427] openttd: rebuild against icu-70.1_1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index d6aedccab9ee..f19e683080dd 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.3
-revision=3
+revision=4
 _gfxver=0.6.0
 _sfxver=0.2.3
 create_wrksrc=yes

From 86f5fcf20e89546b2a020afe951324fddaa06b51 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:00 +0100
Subject: [PATCH 0432/1427] peaclock: rebuild against icu-70.1_1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 1263dd4df2fe..cba799b3a4ee 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.3
-revision=2
+revision=3
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From c991ac5bb132ee576fd811eddb999e2d5c958897 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:01 +0100
Subject: [PATCH 0433/1427] perl-XML-LibXML: rebuild against icu-70.1_1

---
 srcpkgs/perl-XML-LibXML/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 4c6af2d344c9..8b4ced43cabb 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-XML-LibXML'
 pkgname=perl-XML-LibXML
 version=2.0134
-revision=7
+revision=8
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From ca37d50978c28c62ff168a866648f052605ceb8d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 13 Jan 2022 21:46:51 +0100
Subject: [PATCH 0434/1427] php: update to 7.4.27, rebuild for icu-70.1_1.

---
 srcpkgs/php/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 141f7fee310d..700226b020b4 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
-version=7.4.14
-revision=7
+version=7.4.27
+revision=1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -13,7 +13,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886
+checksum=3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c
 
 conf_files="/etc/php/php.ini"
 

From 7f1959cd061ab9cb9ca7c8718714733a8e7a9e4a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Jan 2022 21:13:00 +0100
Subject: [PATCH 0435/1427] poedit: rebuild against icu-70.1_1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 1654ad33553b..5031863acf00 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=3.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From a031d403e7ba7d6b9a520359a7aa89b937407f99 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:01 +0100
Subject: [PATCH 0436/1427] postfix: rebuild against icu-70.1_1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 929897aa76f1..81a9d596164f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.6.4
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 89bc19fd965b2d3f1b5d19b43045ceb5b52103bc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:01 +0100
Subject: [PATCH 0437/1427] python3-PyICU: rebuild against icu-70.1_1

---
 srcpkgs/python3-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index ef2e00e027b1..4920d3c2b7a3 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
 version=2.8
-revision=1
+revision=2
 wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 5118e69f4f12b60f97863a8f3541e64a79370ed2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:02 +0100
Subject: [PATCH 0438/1427] qalculate: rebuild against icu-70.1_1

---
 srcpkgs/qalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index bad1adfcf64e..d24fcba07f06 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -3,7 +3,7 @@
 # and "srcpkgs/qalculate-qt"
 pkgname=qalculate
 version=3.20.1
-revision=2
+revision=3
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"

From 70d22ff2c25aebd318eaf1b4fb096f236213bd92 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:02 +0100
Subject: [PATCH 0439/1427] qt5: rebuild against icu-70.1_1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index c1d822ef021d..8bae9e94287a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20211001
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From eae8e78ea28f5977edd6d1bce88d166b388c5b66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 8 Jan 2022 14:14:00 +0100
Subject: [PATCH 0440/1427] qt5-webengine: update to 5.15.8, rebuild against
 icu-70.1_1

---
 .../patches/0091-chromium-ppc64le-musl.patch     | 16 ----------------
 srcpkgs/qt5-webengine/template                   |  8 ++++----
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
index 4cd12a7fb419..961f782e04a6 100644
--- a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
+++ b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch
@@ -133,22 +133,6 @@ index 901cd68fb..561958c44 100644
  namespace google_breakpad {
  
  namespace {
-diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 8e335a09..b2a0f155 100644
---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -469,7 +469,11 @@ struct MContext64 {
-   SignalThreadContext64 gp_regs;
-   SignalFloatContext64  fp_regs;
-   SignalVectorContext64 *v_regs;
-+#ifdef __GLIBC__
-  int64_t vmx_reserve[69];
-+#else
-+  int64_t vmx_reserve[101];
-+#endif
- };
- 
- struct ContextTraits64 : public Traits64 {
 diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
 index dea0d1f39..b203e5b2f 100644
 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index b65131b26d27..213672ab215c 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.7
+version=5.15.8
 revision=1
 _version="${version}-lts"
 _chromium_commit=8c0a9b4459f5200a24ab9e687a3fb32e975382e5
@@ -24,7 +24,7 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
  libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
- libxkbfile-devel
+ libxkbfile-devel libXdamage-devel
  $(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
@@ -32,7 +32,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
  https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="ef71f5bd741c917787a9431a2c359842de15a14126ef5f34ac28c8b0c07304ae
+checksum="2f92476a1b635f441370836ca57855efdbb2cab0983f2d526b80cfb413631480
  75c79b886cf9c10778c5880754e1cf021e9a5e4fc372e8e6ab252d4ada263062"
 
 no_generic_pkgconfig_link=yes
@@ -121,7 +121,7 @@ _cleanup_wrksrc_leak() {
 }
 
 post_extract() {
-	rmdir ${wrksrc}/src/3rdparty
+	rm -r ${wrksrc}/src/3rdparty
 	mv -v ${wrksrc}/../qtwebengine-chromium-${_chromium_commit} ${wrksrc}/src/3rdparty
 	# ¯\_(ツ)_/¯
 	mkdir -p ${wrksrc}/.git ${wrksrc}/src/3rdparty/chromium/.git

From f10abf06b561df4f46f7d0e4e2604a38d8c79069 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:02 +0100
Subject: [PATCH 0441/1427] qt5-webkit: rebuild against icu-70.1_1

---
 srcpkgs/qt5-webkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 26a32a55fffa..f55f8b0e3e1a 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=12
+revision=13
 _snap=1586819898
 _v=${version%.*}
 wrksrc="qtwebkit-opensource-src-${_v}"

From d95ddf33edd46da448d20f5937b222be6c4130f0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:02 +0100
Subject: [PATCH 0442/1427] qt6-base: rebuild against icu-70.1_1

---
 srcpkgs/qt6-base/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 58a82ac0c352..3f840bf17c09 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
 version=6.2.2
-revision=1
+revision=2
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6

From ff86ea906a67af34f27ddd95274cea471528a04f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:03 +0100
Subject: [PATCH 0443/1427] qt6-qt5compat: rebuild against icu-70.1_1

---
 srcpkgs/qt6-qt5compat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 27b4ebb6c494..5900458ab145 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
 version=6.2.2
-revision=1
+revision=2
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"

From 32fb8ffa036d39ada7b60df86bab6cd28e1f2771 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:03 +0100
Subject: [PATCH 0444/1427] rspamd: rebuild against icu-70.1_1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index f4b3da5d40a9..e8df21abe54d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=6
+revision=7
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From df26ea9cdc0dd3abcd4014df860171596e476ae3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:03 +0100
Subject: [PATCH 0445/1427] scribus: rebuild against icu-70.1_1

---
 srcpkgs/scribus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 62234c7f5223..cba287176947 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
 # Template file for 'scribus'
 pkgname=scribus
 version=1.5.7
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
  -DWANT_GRAPHICSMAGICK=1"

From 05cd35b23ebdc9c507802efd5cb2568034603d1f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:03 +0100
Subject: [PATCH 0446/1427] sile: rebuild against icu-70.1_1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index fae71dee89b1..850802987968 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
 # Template file for 'sile'
 pkgname=sile
 version=0.9.5.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat

From ca9b6123d3e3b93e1bf72652d57cefda27049135 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:03 +0100
Subject: [PATCH 0447/1427] slop: rebuild against icu-70.1_1

---
 .../patches/bugfix-add-missed-header.patch    | 22 +++++++++++++++++++
 srcpkgs/slop/template                         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/slop/patches/bugfix-add-missed-header.patch

diff --git a/srcpkgs/slop/patches/bugfix-add-missed-header.patch b/srcpkgs/slop/patches/bugfix-add-missed-header.patch
new file mode 100644
index 000000000000..612eb4d8d713
--- /dev/null
+++ b/srcpkgs/slop/patches/bugfix-add-missed-header.patch
@@ -0,0 +1,22 @@
+From 5cbcb9e389a02d6288f90a790c6b547d9f9dcac7 Mon Sep 17 00:00:00 2001
+From: Drunkard Zhang <gongfan193@gmail.com>
+Date: Tue, 28 Sep 2021 12:20:25 +0800
+Subject: [PATCH] bugfix: add missed header
+
+XDestroyImage is included in <X11/Xutil.h> which belongs to libX11.
+Build fails without include this header on Gentoo.
+
+Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
+---
+ src/framebuffer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/framebuffer.cpp b/src/framebuffer.cpp
+index 20909b3..da85a25 100644
+--- a/src/framebuffer.cpp
++++ b/src/framebuffer.cpp
+@@ -1,3 +1,4 @@
++#include <X11/Xutil.h>
+ #include "framebuffer.hpp"
+ 
+ slop::Framebuffer::Framebuffer( int w, int h ) {
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 4bfe13d08896..bae6088a418a 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From 726c26ea33ffc26a6721861ee6b74b7a5c3710ad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:04 +0100
Subject: [PATCH 0448/1427] sword: rebuild against icu-70.1_1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 25daf413eb1f..4b396dc13a8f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"

From e63106a1453ef32a91552be79d16814160c08142 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:04 +0100
Subject: [PATCH 0449/1427] tectonic: rebuild against icu-70.1_1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index aa800bb97a09..b7339bd4e304 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.8.0
-revision=1
+revision=2
 wrksrc="tectonic-tectonic-${version}"
 build_style=cargo
 configure_args="--features=external-harfbuzz"

From e93499f7a87d7257f7842a42a98c30f2a79a2a7c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:04 +0100
Subject: [PATCH 0450/1427] tepl: rebuild against icu-70.1_1

---
 srcpkgs/tepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 948c624a71fa..556e4b81a2b0 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
 # Template file for 'tepl'
 pkgname=tepl
 version=6.00.0
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 configure_args="$(vopt_bool gir gir)"

From 94e32e5f557c2c07ade380c3f53ccb473e4b8405 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:04 +0100
Subject: [PATCH 0451/1427] tesseract-ocr: rebuild against icu-70.1_1

---
 srcpkgs/tesseract-ocr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index a654d5d0746f..a1a41dabcb6d 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
 # Template file for 'tesseract-ocr'
 pkgname=tesseract-ocr
 version=4.1.1
-revision=5
+revision=6
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure

From eeca609716a3dfb1103fd8e2eb157f5a9a86027b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:04 +0100
Subject: [PATCH 0452/1427] texlive: rebuild against icu-70.1_1

---
 srcpkgs/texlive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 7c1a5079c774..cf3fa5c8044e 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20210325
-revision=1
+revision=2
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure

From a88f4109dfa10b44d578f7b8dabccc2a56589c69 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 12 Jan 2022 16:50:30 +0100
Subject: [PATCH 0453/1427] thunderbird: update to 91.5.0, rebuild for
 icu-70.1_1.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 6d9904fb07c8..6ce073f6f0f9 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=91.3.2
+version=91.5.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=37bedce79458531ce55806b194669f6e270e4bc3b0fa0949577af1822e57b11d
+checksum=b89a8e1b57d5be828a7346e817120d7c763a258a2397a23393b7ceb3ce810ab2
 
 lib32disabled=yes
 

From 0f6825781f3fdfdbf542d5e8fcb5728a537900bf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 12 Jan 2022 16:51:59 +0100
Subject: [PATCH 0454/1427] thunderbird-i18n: update to 91.5.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 96f34ec0d055..f95f0e304a80 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.3.2
+version=91.5.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="f72b2cf826f0a967b31c47fdb4bcc2a5eea0d165874af84edd4d33486780cb7b
- 19ce342190192162c909298b056a610ecda256bb1e832b42898c749e33c7d220
- b8ac36cb77e87b7b6d52071e565f771a16fd65b34eb478daa1452fc92b32cb40
- 67154b4bd5a88d1d8fc058d0c92a8f04e54ec87eb4af5bdaa2fe9f6e037eec51
- e4048b367e8cf49de7c109a8ff82677301fa98cd17cab9c59177fe9b5b4d2d9e
- 472ee617e3e1291e5fdf4653bfca0675ca86c40c44162b95f570e34a139149b3
- e125faf19636d5af7c8479f698c4965925106fefd917e5cb5dafc8f3dc250982
- 06fd3c895dd9ae9103d92642792dc528ef9b67b6fd0963fada447f22ecf4b936
- c5cad7e51e8a63368201d2c5a80c670d25dd30d6cecd99a684d054154af2c865
- 4f8679430f6c64bd5839d8d3385baf74b537a3ce8e614709f5b61f89655ed74b
- 287b05e501c21adc88b2e46fd5739f69a129482ebf9f9b92646fbf588b5ada1b
- e581f6bfa9c4b0c7b77a2c9d08398988917b64ea5bc5064a3a1dca207da7052a
- 8b827a804c4b251c28b13ba9a2864084ef00163d3dcdf38e7c3364154220a22e
- 7a74601f9d0f167b9f732ba8fc04f6eb4929c41bb5a3ad25d9430deb84a89cc9
- f8320aa4ee834cc5361c0e3d3148159facecd160e78002c4eaf9ac3c4d134d7f
- fb21923d5a6b1ac6bdf4792320ec3261e29129bef82605769982b4ad14d01949
- d0eb71c6b33c7d37ea9a1e66ca20c3acbed33367594383d4d2a83b29d68b9f85
- 480a7aed03ba0ceeb386ac2d574190f282cd940be08b51b4912841ae405a9f0f
- b808fd195f81e69261160d2b724b6f69639a62fa3860fec578575c3452b4f4b3
- 0d860b60ddc9647cc9f00a7f11d73f74a9feecc7e0184e6204181d2805db2ced
- 585ccaf8dfbfa9048734e7694631048b0a43e8124089ef1cbc3f2b2919799327
- 5386104da3018a084142a03ce4e9dbadf8f28e30e8e9c20fd8e97397ffededd0
- 0bffc4394f857ac42bf821427e1d4ac32f4d329689b26868a08ed6915a42ae08
- ea233c0ed77fd6600b6fe547d30755fa46fcbea66645eaaf06ff9863b83fc66b
- 8480a4cd2f903e54d3501d5f7e7f8d240ef6b35abb98ea96456e7cc4f6afd6a1
- 50cb72d28edcaaa312b26362e9b2d6d8733b88d3332b6412299b61ea7eeedc24
- ee1d3beee11513db4ff505f7c00d2e61940272e7d2c5b287ad3ddb0f19dbd0d3
- eb1f18de4c798f441ef8bec51adcf02c329a10be49cc1acc5e5c365638588130
- 58305d62ac521030cc75f6222ed068760f607c3d842a6f3be9db697137e8a5f5
- 0ed7c4e09c6c34efb57f2ce08617f96804bafa1e4b85f1b4117060e08e7cd7ee
- 3e7dcd6244da31d248f2e1b54cd7832ba57edd03c585e0955a2e281585e9a841
- a0fe4ad890c2bdacc00afeb3f631ccab633a1d36c8e9f1e39776bd9e7a4a90c4
- 1b7c7226621ddcd167c142968d8fbef3028e66ab4aaf4467b4f689304a39e04c
- 24128e98fd48b72efc8f5331b3c714599e969b897d119a652c373941f2eb4cee
- 0fd6146ea2dc8642c37b4e82279ce0eb1b9122c118fdd96e42525bf779ae88bd
- 6cf39864701147e3af958e50c702841c90af1cc0c64f29c32b718c5bddff254c
- 63616c4796921761b649aaceeecbf05aeaf41f69b74cb1337cfd9ecebfcc7eca
- 712c7fc70a77cc89919a98086453f0c830847a6f2f82ca3ab2f98f4587be37c8
- f6712c2d8a22b4fa24e713f3c974663675a2dfb296a0c9b087f7d9717e6c7cef
- adaa4557ebf12eac88c9b9015f1dfb3f5205b6498d3161f4b840e9935af15a5c
- 3c25c1357821ab4187485873e6546b150890149df335bdb4a3861651e8a0edd8
- 0edc7c5af9648dc2d89b6e452285ca15f6a4ab3e716067187a533ce51e26cb4c
- 9a0eaf7136032749add03c6a602cffbb373d5014e07d81403560acf08b6ad1f8
- e52a81d859f88fbbc88ad162813af1ea3f6a08ca578bd2c6edf3598a88312951
- d232778e67a36dd66f14b93abe12e6e867fc1e124ad04f572bff180d342ae2da
- 0f3294bfb576a7be717014a4b48f8027ac79a1877c59a3cd4a9feb543a87bfb0
- 26fd38cdde3ae447b08af5ac500699382be573e370a34fa0dcd451501b644bd4
- 44ddaee30b1ccf4995293eb47c2fb345e688de765c4eb5b86ff0f3514b78bcb6
- 6f7dc251e6a1acb349f90184751d585dfc9b95c232e6387988f44616547b6ea1
- f98805c2cd0ab105fa91a8b89aefd30e1321ea1d794ad4371acbc88ed3812f02
- 2c4d3990ea6dac49d704719e8430f437db1f4f539e9365ec00a937484b1559d7
- 3a81e4fb7bd53ebd439efe35714df57dde3125cd75a7366a9c9be8bcb8496b2a
- 7340e84cee9775726bf83de8371815be21c67f5138ad7ea29e64c9922f9991c4
- b4094e63f09d87f7675bd90034f1df14efff5cad74d53bfbe991ecb0716c3b29"
+checksum="153b74896853e462e9ae9cf9098f0b6f34116559975861e6c9f04e8010c0842a
+ fd018fcbeceace184dc1f4b1e1623511eb0a8ecc1ae1b956ffa170842fefcc73
+ 550f2310775beb5ce913b6bfa593fa04776c1927c87cf8079eaaf10f6d8b0537
+ 99c61014976faafeb2e813ad74b1678e2128ddc0a76bfcbba7cf6c602c11a223
+ 7aeb9c9c9aaaacb2a84a5491aff9588c8b426ea08e0a43d2c63c091b47cfc5d0
+ a30026739c7e130ad1d9196c19da72eea6c16c7571f6073aea4c0f80f10d8f3c
+ 7941933c4c80d4f1109db2a3f584518c6995aa8746b0f4ab4a6f70706becb0de
+ 1840fbf5e814853fdd976e20bb4a432c210321bdf8cdc5b5c26a593afea41d94
+ d04205f28a0ffed85aa1b11de42d46063db482392a71e0ad8f5074b142c6deb8
+ 1dc362d91c8699a81ec4070af6422f97bd275ef01acda4dd41634c1af6415609
+ 9207a8c1a98ca2fa51efb54f12a79d9cae0e03faf5941bfc6cd66b0f02bddd40
+ fac6239a5e043b75ff595fa670b23f0520e93bd3c8e4aabce0340db72dab1909
+ 4642127f3e521d130d246acbe8df7f2f8b2b461cd357839773bc0f73b76ddf82
+ adce6a6c77997f9e9fe08a20012ce8ed88116963599c348763d36a0c196af1a1
+ 6608e4c2bb3c396cb35794d5b90eec5c3403b319e3d220088331b7b3fb5f45e6
+ d6cbd9e7089f05928202cb95340d94322714036cdf2bd50777e09300d60b35e2
+ 965b43d20a9abaabe8f7d07dd5bf2c522d73754e52dc9eb4e917568e14f03ef4
+ 17a78d93de483a0097504683b29752449ea1cdd0578313428b39c9d6959b4fc2
+ 75238449104d85368cfbefb2d06fe92113f4ba719fbfa1d4da5fe46a3be63d0f
+ f8765c44569a1eead7f96c30cae8e34557597c03ae0778859135e637370f6769
+ 1675ad25f3d7372fe8e004f1a5df4eeb4d11042574d67546d99c696f76bb416b
+ 17d1c9c752a31c0d123de4fa84b5c0a06bdadb7ecfb3fedab4cad22289ac2cba
+ eaeedd14c00ffb253b6d6ccf66f131940a44e190c77e232ded88a13b6b7e3b59
+ 5ab29c16330c3951236839af54081d282cf0de17f18e1421b7e6d812cafefff4
+ d6a9ab1ca1a3f9613a00f1f6296568d3da6ce850a7e797ce377e9516c8b78837
+ 38bba476644a2f0ccc636ac176e501b85f3ef8c912c7ff9b9cc4ebac74d83cdd
+ 4338ff7ef6adfaf0308616128bf00d190372b8818d421527dc5742d8f3ed4918
+ 38d88509c005ad62601a368a284b745570e33a9724da1a1ff41e6feaaa4273fc
+ 031b23573ec355d23ebe18615a86216ab30a95e04525ace23f7f4d7ba8245c41
+ cc95bfa23f1468ca5a670dea7d67b579d18166332fc17942c4733ce249a882ce
+ b21a892bd65dbd12e6f047079bfa8e6175c58167e7c8defc3ee285eefd738d41
+ 494796c4657fa6283400b9cd9ff54bed947068222f9e94d0131033d953d37176
+ 44e135062450c53044b412447b6d0a722fc5a99658ed7ec3c741dbbe91ecd736
+ ea62afd388cc7c30c0a1a2e161e1154742e535b1177c718ca0620de7e296fe61
+ 67d954bd71dc1a21d28bd410a0c633c4c3d93bcb53095d349c470a270c242d39
+ 6a63ff0bbf96411935ba101baa7286315e70ccbc0bbc1e8f5ede822c901a23b2
+ 18d6578ffebd4867b01918f7a154a317b054d5fd55418f61657cac05a995ee1a
+ 22bdf3404e59627ab73ee64394efb0275741b7b9c1d31d134d5612242e1858e6
+ 9eb94a5b380f084625e605f20a388a9b75455c07e49bc73ab4bc94e2d52baee8
+ 60ed67eb52c673b168b42f385ac05e4f0cec906002f46dd0dabbf807777c3302
+ 6711681f44fd41ee493c7ccd618d98ecce24354073d72ca59ca60df1a3b53f2b
+ f0fe96cec503d05033651489aa6251f8279fa0f0323818df9f17fce56cdeebb6
+ b012c406274bb8a4131546cf363d4828a7e55f1e6221559d5313137de886bf7f
+ bce8e92d31183afb48fba2b78339d9404cf87b67a9d2f13db09672fc8539dacf
+ 6a3c56c782219a0f3951d90700f3c63cc69266f8d4546f19281194cc3101588b
+ a8bfaa012718716c45727f207fadfebdf1dc06a66628d284bc60d8d37087caa6
+ cfecad5b1cf8c233ad01af7489959d5d680028851fb676356ace00cb737b7eae
+ 8a0aea8d91a3978378166219f5aaebe7aca91b199fcfe3227752ed3f443d3612
+ 6ff82ddcf1974b8bc7a44789e1d4238e92a8d5cea2c14daf1a4f57f6ae98c983
+ 9483d7dca9c450483c9be9c21ff77e191f62e41120fdc186fe766bfedec805af
+ 14eccd3edf9c4be0ece562c4bda88bb0512d846c79e5480478569493268a6a6f
+ 3be16dd793abe690471bdfc633c41bad85172603aeb78145ca5290332ece9ff6
+ f886871be3055d85d9bfdff63b5d24209af97a04d8504f5afb631ef0a1372088
+ abd7ff3fae4d2d3459bff96bdde26cc62f045edbaf9eba8b457ade3c17f7a57e"

From d68d3a7affaa8e37b59af41c3b1da9da3ad03c0c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:05 +0100
Subject: [PATCH 0455/1427] tracker: rebuild against icu-70.1_1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8c4a66773097..ce41975c713d 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.6
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false

From 6915b1e84de3a0b20da1b91ab80a5809bcb12c6a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:05 +0100
Subject: [PATCH 0456/1427] tracker-miners: rebuild against icu-70.1_1

---
 srcpkgs/tracker-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 9c4762cf56ca..1d31d2f3882a 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker-miners'
 pkgname=tracker-miners
 version=2.3.5
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From e6aa0eb9feaf3218eba23abd35171fe3e12b331b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:05 +0100
Subject: [PATCH 0457/1427] tracker3: rebuild against icu-70.1_1

---
 srcpkgs/tracker3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index a6f8135b77d6..36ebdf90d22a 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3'
 pkgname=tracker3
 version=3.0.2
-revision=3
+revision=4
 wrksrc=tracker-${version}
 build_style=meson
 build_helper="gir"

From 1a613a9dfec5691985c0327adf7bfbe888b5abd4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:05 +0100
Subject: [PATCH 0458/1427] tracker3-miners: rebuild against icu-70.1_1

---
 srcpkgs/tracker3-miners/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 4c752fe55add..96b9dafd7e7d 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker3-miners'
 pkgname=tracker3-miners
 version=3.0.5
-revision=2
+revision=3
 wrksrc=tracker-miners-${version}
 build_style=meson
 # missing libgrss for miner_rss

From ceba5b455f5981aa4a0229351c7da5c24f76f4ee Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:05 +0100
Subject: [PATCH 0459/1427] unar: rebuild against icu-70.1_1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index e7a689216655..b94c7369fd0e 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=7
+revision=8
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From 8a53f79f49e8257b41bf0d58678bc509be17d594 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:06 +0100
Subject: [PATCH 0460/1427] vte3: rebuild against icu-70.1_1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 4ecc45b1d07a..c758b20a05c2 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.66.0
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"

From b5ae9bad6f553cb451c65da65ebb2c209fa0844c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 12 Jan 2022 19:03:54 +0100
Subject: [PATCH 0461/1427] webkit2gtk: update to 2.34.3, rebuild for
 icu-70.1_1.

---
 srcpkgs/webkit2gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index f4e30d5f5ab2..a652a4b209b6 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 # ping q66 before touching this
 pkgname=webkit2gtk
-version=2.34.2
+version=2.34.3
 revision=1
 wrksrc="webkitgtk-${version}"
 build_style=cmake
@@ -37,7 +37,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://webkitgtk.org/"
 distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
-checksum=584677d6e7cae12e27cdcc8e05b4cf73b54849a24afc3d7a40cec91016deff00
+checksum=0d2f37aa32e21a36e4dd5a5ce7ae5ce27435c29d6803b962b8c90cb0cc49c52d
 make_check=no
 
 build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser

From be8cb6ac6101028ead09d9c7ce75c4d8732e5b6d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:06 +0100
Subject: [PATCH 0462/1427] widelands: rebuild against icu-70.1_1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index 8d208f682992..ecda7cbea232 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -4,7 +4,7 @@ pkgname=widelands
 reverts="21_5 21_4 21_3 21_2 21_1 20_4 20_3 20_2 20_1 19_10 19_9 19_8 19_7 19_6
  19_5 19_4 19_3 19_2 19_1 18_5 18_4 18_3 18_2 18_1"
 version=1.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
  -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DWL_INSTALL_BASEDIR=/usr/share/widelands

From 6263550b2a681c32024bfc655d6aab92ed97013d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:06 +0100
Subject: [PATCH 0463/1427] xerces-c: rebuild against icu-70.1_1

---
 srcpkgs/xerces-c/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index e29e7798d647..8c90f2dded12 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.2.3
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From f85292fe0b816533013a844c46d25e267291dfc2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:06 +0100
Subject: [PATCH 0464/1427] yaz: rebuild against icu-70.1_1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 35492d2f6ec6..d8f67566509f 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.30.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From fff12ae0ef04e509d47d1174cd9a5ea25b7272b9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 11 Jan 2022 22:02:07 +0100
Subject: [PATCH 0465/1427] znc: rebuild against icu-70.1_1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index 1e60d3683eb6..e24567f4eb7a 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.2
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="
  --enable-python

From 7b13e66c18bbc957558643b6d13952dd4e296a46 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Jan 2022 16:08:56 +0100
Subject: [PATCH 0466/1427] electron10: rebuild for harfbuzz-3.2.0_1

---
 .../patches/chromium-harfbuzz-3.0.0.patch     |  20 ++++
 .../chromium-skia-harfbuzz-3.0.0.patch        | 100 ++++++++++++++++++
 srcpkgs/electron10/template                   |   2 +-
 3 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
 create mode 100644 srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch

diff --git a/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch b/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
new file mode 100644
index 000000000000..c7724336bfba
--- /dev/null
+++ b/srcpkgs/electron10/files/patches/chromium-harfbuzz-3.0.0.patch
@@ -0,0 +1,20 @@
+# https://github.com/chromium/chromium/commit/b289f6f3fcbc
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index 8ff0540d9a..20a7d37474 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
+   hb_set_t* glyphs =
+       hb_subset_input_glyph_set(input.get());  // Owned by |input|.
+   usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
+-  hb_subset_input_set_retain_gids(input.get(), true);
++  hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
+ 
+-  HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
++  HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
++  if (!subset_face)
++    return nullptr;
+   HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
+   if (!subset_blob)
+     return nullptr;
diff --git a/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch b/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
new file mode 100644
index 000000000000..f47af201b6e4
--- /dev/null
+++ b/srcpkgs/electron10/files/patches/chromium-skia-harfbuzz-3.0.0.patch
@@ -0,0 +1,100 @@
+# Minimal diff for harfbuzz 3.0.0 support; based on:
+# https://github.com/google/skia/commit/66684b17b382
+# https://github.com/google/skia/commit/51d83abcd24a
+
+diff --git a/gn/skia.gni b/gn/skia.gni
+index d98fdc19ee..199335d5c4 100644
+--- a/third_party/skia/gn/skia.gni
++++ b/third_party/skia/gn/skia.gni
+@@ -34,8 +34,6 @@ declare_args() {
+   skia_include_multiframe_procs = false
+   skia_lex = false
+   skia_libgifcodec_path = "third_party/externals/libgifcodec"
+-  skia_pdf_subset_harfbuzz =
+-      false  # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz.
+   skia_qt_path = getenv("QT_PATH")
+   skia_skqp_global_error_tolerance = 0
+   skia_tools_require_resources = false
+@@ -99,6 +97,10 @@ declare_args() {
+   skia_use_libfuzzer_defaults = true
+ }
+ 
++declare_args() {
++  skia_pdf_subset_harfbuzz = skia_use_harfbuzz
++}
++
+ declare_args() {
+   skia_compile_sksl_tests = skia_compile_processors
+   skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
+diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp
+index 81c37eef3a..2340a7937b 100644
+--- a/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
++++ b/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) {
+                                 blob.release());
+ }
+ 
++template<typename...> using void_t = void;
++template<typename T, typename = void>
++struct SkPDFHarfBuzzSubset {
++    // This is the HarfBuzz 3.0 interface.
++    // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of
++    // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported.
++    static HBFace Make(T input, hb_face_t* face) {
++        // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
++        // If it isn't known if a font is 'tricky', retain the hints.
++        hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/);
++        return HBFace(hb_subset_or_fail(face, input));
++    }
++};
++template<typename T>
++struct SkPDFHarfBuzzSubset<T, void_t<
++    decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())),
++    decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())),
++    decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>()))
++    >>
++{
++    // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
++    // This code should be removed as soon as all users are migrated to the newer API.
++    static HBFace Make(T input, hb_face_t* face) {
++        hb_subset_input_set_retain_gids(input, true);
++        // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
++        // If it isn't known if a font is 'tricky', retain the hints.
++        hb_subset_input_set_drop_hints(input, false);
++        return HBFace(hb_subset(face, input));
++    }
++};
++
+ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
+                                      const SkPDFGlyphUse& glyphUsage,
+                                      int ttcIndex) {
+@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
+     hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
+     glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
+ 
+-    hb_subset_input_set_retain_gids(input.get(), true);
+-    // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
+-    // If it isn't known if a font is 'tricky', retain the hints.
+-    hb_subset_input_set_drop_hints(input.get(), false);
+-    HBFace subset(hb_subset(face.get(), input.get()));
++    HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get());
++    if (!subset) {
++        return nullptr;
++    }
+     HBBlob result(hb_face_reference_blob(subset.get()));
+     return to_data(std::move(result));
+ }
+diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn
+index 173830de62..4156607ef9 100644
+--- a/third_party/skia/third_party/harfbuzz/BUILD.gn
++++ b/third_party/skia/third_party/harfbuzz/BUILD.gn
+@@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) {
+       "harfbuzz",
+       "harfbuzz-icu",
+     ]
++    if (skia_pdf_subset_harfbuzz) {
++      libs += [ "harfbuzz-subset" ]
++    }
+   }
+ } else {
+   third_party("harfbuzz") {
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index 0f2c83f6f483..e8dd38d442de 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -3,7 +3,7 @@ pkgname=electron10
 version=10.4.7
 _nodever=12.16.3
 _chromiumver=85.0.4183.121
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* ppc64le*"
 build_wrksrc="src"
 create_wrksrc=yes

From dd1b870a66c3a2936ce57a3e8e434b9ed9a98404 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Jan 2022 16:50:38 +0100
Subject: [PATCH 0467/1427] electron13: rebuild for harfbuzz-3.2.0_1

---
 .../patches/chromium-harfbuzz-3.0.0.patch     |  20 ++++
 .../chromium-skia-harfbuzz-3.0.0.patch        | 100 ++++++++++++++++++
 srcpkgs/electron13/template                   |   4 +-
 3 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/electron13/files/patches/chromium-harfbuzz-3.0.0.patch
 create mode 100644 srcpkgs/electron13/files/patches/chromium-skia-harfbuzz-3.0.0.patch

diff --git a/srcpkgs/electron13/files/patches/chromium-harfbuzz-3.0.0.patch b/srcpkgs/electron13/files/patches/chromium-harfbuzz-3.0.0.patch
new file mode 100644
index 000000000000..c7724336bfba
--- /dev/null
+++ b/srcpkgs/electron13/files/patches/chromium-harfbuzz-3.0.0.patch
@@ -0,0 +1,20 @@
+# https://github.com/chromium/chromium/commit/b289f6f3fcbc
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index 8ff0540d9a..20a7d37474 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -72,9 +72,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
+   hb_set_t* glyphs =
+       hb_subset_input_glyph_set(input.get());  // Owned by |input|.
+   usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
+-  hb_subset_input_set_retain_gids(input.get(), true);
++  hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
+ 
+-  HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
++  HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
++  if (!subset_face)
++    return nullptr;
+   HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
+   if (!subset_blob)
+     return nullptr;
diff --git a/srcpkgs/electron13/files/patches/chromium-skia-harfbuzz-3.0.0.patch b/srcpkgs/electron13/files/patches/chromium-skia-harfbuzz-3.0.0.patch
new file mode 100644
index 000000000000..f47af201b6e4
--- /dev/null
+++ b/srcpkgs/electron13/files/patches/chromium-skia-harfbuzz-3.0.0.patch
@@ -0,0 +1,100 @@
+# Minimal diff for harfbuzz 3.0.0 support; based on:
+# https://github.com/google/skia/commit/66684b17b382
+# https://github.com/google/skia/commit/51d83abcd24a
+
+diff --git a/gn/skia.gni b/gn/skia.gni
+index d98fdc19ee..199335d5c4 100644
+--- a/third_party/skia/gn/skia.gni
++++ b/third_party/skia/gn/skia.gni
+@@ -34,8 +34,6 @@ declare_args() {
+   skia_include_multiframe_procs = false
+   skia_lex = false
+   skia_libgifcodec_path = "third_party/externals/libgifcodec"
+-  skia_pdf_subset_harfbuzz =
+-      false  # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz.
+   skia_qt_path = getenv("QT_PATH")
+   skia_skqp_global_error_tolerance = 0
+   skia_tools_require_resources = false
+@@ -99,6 +97,10 @@ declare_args() {
+   skia_use_libfuzzer_defaults = true
+ }
+ 
++declare_args() {
++  skia_pdf_subset_harfbuzz = skia_use_harfbuzz
++}
++
+ declare_args() {
+   skia_compile_sksl_tests = skia_compile_processors
+   skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
+diff --git a/src/pdf/SkPDFSubsetFont.cpp b/src/pdf/SkPDFSubsetFont.cpp
+index 81c37eef3a..2340a7937b 100644
+--- a/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
++++ b/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) {
+                                 blob.release());
+ }
+ 
++template<typename...> using void_t = void;
++template<typename T, typename = void>
++struct SkPDFHarfBuzzSubset {
++    // This is the HarfBuzz 3.0 interface.
++    // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of
++    // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported.
++    static HBFace Make(T input, hb_face_t* face) {
++        // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
++        // If it isn't known if a font is 'tricky', retain the hints.
++        hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/);
++        return HBFace(hb_subset_or_fail(face, input));
++    }
++};
++template<typename T>
++struct SkPDFHarfBuzzSubset<T, void_t<
++    decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())),
++    decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())),
++    decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>()))
++    >>
++{
++    // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
++    // This code should be removed as soon as all users are migrated to the newer API.
++    static HBFace Make(T input, hb_face_t* face) {
++        hb_subset_input_set_retain_gids(input, true);
++        // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
++        // If it isn't known if a font is 'tricky', retain the hints.
++        hb_subset_input_set_drop_hints(input, false);
++        return HBFace(hb_subset(face, input));
++    }
++};
++
+ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
+                                      const SkPDFGlyphUse& glyphUsage,
+                                      int ttcIndex) {
+@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
+     hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
+     glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
+ 
+-    hb_subset_input_set_retain_gids(input.get(), true);
+-    // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
+-    // If it isn't known if a font is 'tricky', retain the hints.
+-    hb_subset_input_set_drop_hints(input.get(), false);
+-    HBFace subset(hb_subset(face.get(), input.get()));
++    HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get());
++    if (!subset) {
++        return nullptr;
++    }
+     HBBlob result(hb_face_reference_blob(subset.get()));
+     return to_data(std::move(result));
+ }
+diff --git a/third_party/harfbuzz/BUILD.gn b/third_party/harfbuzz/BUILD.gn
+index 173830de62..4156607ef9 100644
+--- a/third_party/skia/third_party/harfbuzz/BUILD.gn
++++ b/third_party/skia/third_party/harfbuzz/BUILD.gn
+@@ -14,6 +14,9 @@ if (skia_use_system_harfbuzz) {
+       "harfbuzz",
+       "harfbuzz-icu",
+     ]
++    if (skia_pdf_subset_harfbuzz) {
++      libs += [ "harfbuzz-subset" ]
++    }
+   }
+ } else {
+   third_party("harfbuzz") {
diff --git a/srcpkgs/electron13/template b/srcpkgs/electron13/template
index 8b1ce1e96eb8..1ceb6f788a62 100644
--- a/srcpkgs/electron13/template
+++ b/srcpkgs/electron13/template
@@ -1,6 +1,6 @@
 # Template file for 'electron13'
 pkgname=electron13
-version=13.6.1
+version=13.6.7
 revision=1
 _nodever=14.16.0
 _chromiumver=91.0.4472.164
@@ -31,7 +31,7 @@ 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="288b4d437982701117d3d8ed9324be4df8d82467e171e502af8f382bd5305e70
+checksum="2931e0adc95ad93a6f163c69c4588b032ab68c45dedb2937bf0d0533ec4d44dc
  84e56fa2ad96d910cab429c513eeaca7bfa94096fef057bd024be826ce8426bd
  bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
 

From a6513f8270366024640df9779928508d5da2876c Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 17:52:40 +1100
Subject: [PATCH 0468/1427] broadcom-wl-dkms: fix whitespace in patches

---
 .../broadcom-wl-dkms/patches/linux-4.15.patch | 46 +++++++++----------
 .../broadcom-wl-dkms/patches/linux-5.10.patch |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch
index 38f82e0deaa0..9fcd7176b50a 100644
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch
@@ -1,44 +1,44 @@
 --- a/src/wl/sys/wl_linux.c     2018-01-31 11:33:26.000000000 +0100 
 +++ b/src/wl/sys/wl_linux.c     2018-01-31 15:27:18.000000000 +0100 
 @@ -93,7 +93,11 @@ 
-  
- #include <wlc_wowl.h> 
-  
+ 
+ #include <wlc_wowl.h>
+ 
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) 
- static void wl_timer(ulong data); 
+ static void wl_timer(ulong data);
 +#else 
 +static void wl_timer(struct timer_list *tl); 
 +#endif 
- static void _wl_timer(wl_timer_t *t); 
- static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); 
-  
+ static void _wl_timer(wl_timer_t *t);
+ static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
+ 
 @@ -2301,9 +2305,17 @@ 
- } 
-  
- static void 
+ }
+ 
+ static void
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) 
- wl_timer(ulong data) 
+ wl_timer(ulong data)
 +#else 
 +wl_timer(struct timer_list *tl) 
 +#endif 
- { 
+ {
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) 
-        wl_timer_t *t = (wl_timer_t *)data; 
+ 	wl_timer_t *t = (wl_timer_t *)data;
 +#else 
 +    wl_timer_t *t = from_timer(t, tl, timer); 
 +#endif 
-  
-        if (!WL_ALL_PASSIVE_ENAB(t->wl)) 
-                _wl_timer(t); 
+ 
+ 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
+ 		_wl_timer(t);
 @@ -2355,7 +2367,11 @@ 
-  
-        bzero(t, sizeof(wl_timer_t)); 
-  
+ 
+ 	bzero(t, sizeof(wl_timer_t));
+ 
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) 
-        init_timer(&t->timer); 
-        t->timer.data = (ulong) t; 
-        t->timer.function = wl_timer; 
+ 	init_timer(&t->timer);
+ 	t->timer.data = (ulong) t;
+ 	t->timer.function = wl_timer;
 +#else 
 +    timer_setup(&t->timer, wl_timer, 0); 
 +#endif 
-        t->wl = wl;
+ 	t->wl = wl;
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
index c52e0c36ccab..53514bf020a1 100644
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
@@ -117,7 +117,7 @@ diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
  		goto done2;
  	}
  
-- if (segment_eq(get_fs(), KERNEL_DS))
+-	if (segment_eq(get_fs(), KERNEL_DS))
 -		buf = ioc.buf;
 -
 -	else if (ioc.buf) {

From 2707b2c844aeaed4b8bc2ba11c989ec31a8c1243 Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Wed, 5 Jan 2022 19:54:19 +0000
Subject: [PATCH 0469/1427] pgbouncer: update to 1.16.1.

---
 srcpkgs/pgbouncer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index f20a2957eaaf..650e3340f07c 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,6 +1,6 @@
 # Template file for 'pgbouncer'
 pkgname=pgbouncer
-version=1.16.0
+version=1.16.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://pgbouncer.github.io/"
 changelog="https://raw.githubusercontent.com/pgbouncer/pgbouncer/master/NEWS.md"
 distfiles="https://pgbouncer.github.io/downloads/files/${version}/pgbouncer-${version}.tar.gz"
-checksum=a4a391618bb83caaee2a8cd9653974f4c1b98b95987d5cabbbeb801da6342652
+checksum=087477e9e4766d032b04b7b006c0c8d64160a54141a7bfc2c6e5ae7ae11bf7fc
 make_check=ci-skip # Postgres server can't be run as root
 
 pre_check() {

From 44e04310f69334cab841ce78f4dc33f111a6d311 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 04:19:10 +1100
Subject: [PATCH 0470/1427] bluez: update to 5.63.

---
 .../0009-include-limits.h-for-musl-build.patch        | 11 +++++++++++
 srcpkgs/bluez/template                                |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch

diff --git a/srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch b/srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch
new file mode 100644
index 000000000000..c6627b90ac8d
--- /dev/null
+++ b/srcpkgs/bluez/patches/0009-include-limits.h-for-musl-build.patch
@@ -0,0 +1,11 @@
+--- a/tools/mesh-cfgtest.c
++++ b/tools/mesh-cfgtest.c
+@@ -34,6 +34,8 @@
+ #include "mesh/mesh-defs.h"
+ #include "mesh/mesh.h"
+ 
++#include <limits.h>
++
+ #define MAX_CRPL_SIZE	0x7fff
+ #define CFG_SRV_MODEL	0x0000
+ #define CFG_CLI_MODEL	0x0001
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index f6788a81ec46..e0a96039b6fb 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.62
-revision=2
+version=5.63
+revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2
+checksum=9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From 21ac8fc602e743d7a3004ccd9333b3014675be8e Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Thu, 13 Jan 2022 05:03:55 +1100
Subject: [PATCH 0471/1427] iwd: update to 1.21.

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index f56edb63cbf9..3c057ce417a7 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.20
+version=1.21
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f
+checksum=bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From c27ccee79ff8c278dd288abcf44693a5b85cd176 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 17 Jan 2022 13:15:07 +0100
Subject: [PATCH 0472/1427] scribus: add harfbuzz-3.0.0 patch

---
 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch | 68 ++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 srcpkgs/scribus/patches/harfbuzz-3.0.0.patch

diff --git a/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch b/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
new file mode 100644
index 000000000000..4dc4f0db4a36
--- /dev/null
+++ b/srcpkgs/scribus/patches/harfbuzz-3.0.0.patch
@@ -0,0 +1,68 @@
+From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sat, 21 Aug 2021 20:05:43 +0000
+Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
+ prepeare for removal of legacy API in 3.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/fonts/sfnt.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
+index 50777f66e3..fca8b39158 100644
+--- a/scribus/fonts/sfnt.cpp
++++ b/scribus/fonts/sfnt.cpp
+@@ -1256,11 +1256,19 @@ namespace sfnt {
+ 
+ 		for (int i = 0; i < cids.count(); ++i)
+ 			hb_set_add(glyphSet, cids.at(i));
+-	
++
++#if HB_VERSION_ATLEAST(2, 9, 0)
++		uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
++		subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
++		subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
++		subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
++		hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
++#else
+ 		hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
+ 		hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
+ #if HB_VERSION_ATLEAST(2, 6, 5)
+ 		hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
++#endif
+ #endif
+ 
+ 		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
+
+From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 19 Sep 2021 11:59:50 +0000
+Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
+ hb_subset_or_fail
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/fonts/sfnt.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
+index fca8b39158..b3dfa50dc6 100644
+--- a/scribus/fonts/sfnt.cpp
++++ b/scribus/fonts/sfnt.cpp
+@@ -1271,9 +1271,15 @@ namespace sfnt {
+ #endif
+ #endif
+ 
++#if HB_VERSION_ATLEAST(2, 9, 0)
++		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
++		if (hbSubsetFace.isNull())
++			return QByteArray();
++#else
+ 		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
+ 		if (hbSubsetFace.isNull())
+ 			return QByteArray();
++#endif
+ 
+ 		QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
+ 		if (hbSubsetBlob.isNull())

From 7d8250bc53a73c9ef494385fb56564de31b24854 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 17 Jan 2022 15:44:42 +0100
Subject: [PATCH 0473/1427] firefox: fix armv7l* corss builds...

---
 .../firefox-96-fix-arm-linux-cross.patch      | 15468 ++++++++++++++++
 1 file changed, 15468 insertions(+)
 create mode 100644 srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch

diff --git a/srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch b/srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch
new file mode 100644
index 000000000000..f33f23516ff9
--- /dev/null
+++ b/srcpkgs/firefox/patches/firefox-96-fix-arm-linux-cross.patch
@@ -0,0 +1,15468 @@
+--- a/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
++++ b/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -178,6 +180,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/array_view_gn/moz.build
++++ b/third_party/libwebrtc/api/array_view_gn/moz.build
+@@ -118,11 +119,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -152,6 +148,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -162,6 +165,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
++++ b/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+@@ -130,11 +132,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +161,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -178,6 +182,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
++++ b/third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+@@ -138,11 +138,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -171,6 +166,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -185,6 +187,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
++++ b/third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+@@ -131,11 +131,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -178,6 +180,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
++++ b/third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+@@ -122,11 +122,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -155,6 +150,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -165,6 +167,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/audio/echo_control_gn/moz.build
++++ b/third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+@@ -118,11 +118,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -151,6 +146,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -161,6 +163,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+@@ -133,11 +133,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -166,6 +161,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -180,6 +182,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+@@ -82,8 +82,6 @@
+     DEFINES["USE_X11"] = "1"
+     DEFINES["WEBRTC_LINUX"] = True
+     DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_FILE_OFFSET_BITS"] = "64"
+     DEFINES["_GNU_SOURCE"] = True
+     DEFINES["_LARGEFILE64_SOURCE"] = True
+@@ -92,7 +90,6 @@
+     DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+     OS_LIBS += [
+-        "m",
+         "rt"
+     ]
+ 
+@@ -148,11 +145,6 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -175,8 +167,14 @@
+ 
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+ 
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_DEBUG"] = True
+ 
++    OS_LIBS += [
++        "m"
++    ]
++
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+@@ -186,6 +184,13 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -208,6 +213,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+@@ -220,4 +229,31 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
+ 
++if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
+ Library("builtin_audio_decoder_factory_gn")
+--- a/third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+@@ -82,8 +82,6 @@
+     DEFINES["USE_X11"] = "1"
+     DEFINES["WEBRTC_LINUX"] = True
+     DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_FILE_OFFSET_BITS"] = "64"
+     DEFINES["_GNU_SOURCE"] = True
+     DEFINES["_LARGEFILE64_SOURCE"] = True
+@@ -92,7 +90,6 @@
+     DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+     OS_LIBS += [
+-        "m",
+         "rt"
+     ]
+ 
+@@ -148,11 +145,6 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -175,8 +167,14 @@
+ 
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+ 
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_DEBUG"] = True
+ 
++    OS_LIBS += [
++        "m"
++    ]
++
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+@@ -186,6 +184,13 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -208,6 +213,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+@@ -220,4 +229,31 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
+ 
++if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
+ Library("builtin_audio_encoder_factory_gn")
+--- a/third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
+@@ -137,11 +137,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -170,6 +165,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -184,6 +186,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
+@@ -137,11 +137,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -170,6 +165,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -184,6 +186,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
+@@ -14,12 +14,7 @@
+ ]
+ 
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["ANDROID"] = True
+-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-DEFINES["HAVE_SYS_UIO_H"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ANDROID"] = True
+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+ DEFINES["WEBRTC_ARCH_ARM"] = True
+ DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+@@ -45,12 +40,6 @@
+     "/tools/profiler/public"
+ ]
+ 
+-OS_LIBS += [
+-    "android_support",
+-    "log",
+-    "unwind"
+-]
+-
+ UNIFIED_SOURCES += [
+     "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix.cc"
+ ]
+@@ -64,7 +53,49 @@
+ 
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
++    DEFINES["ANDROID"] = True
++    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
++    DEFINES["HAVE_SYS_UIO_H"] = True
++    DEFINES["WEBRTC_ANDROID"] = True
++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+     DEFINES["_DEBUG"] = True
+ 
++    OS_LIBS += [
++        "android_support",
++        "log",
++        "unwind"
++    ]
++
++if CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++    DEFINES["USE_AURA"] = "1"
++    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_NSS_CERTS"] = "1"
++    DEFINES["USE_OZONE"] = "1"
++    DEFINES["USE_UDEV"] = True
++    DEFINES["USE_X11"] = "1"
++    DEFINES["_FILE_OFFSET_BITS"] = "64"
++    DEFINES["_LARGEFILE64_SOURCE"] = True
++    DEFINES["_LARGEFILE_SOURCE"] = True
++
++    OS_LIBS += [
++        "rt"
++    ]
++
++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
++
++    DEFINES["ANDROID"] = True
++    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
++    DEFINES["HAVE_SYS_UIO_H"] = True
++    DEFINES["WEBRTC_ANDROID"] = True
++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
++
++    OS_LIBS += [
++        "android_support",
++        "log",
++        "unwind"
++    ]
++
+ Library("audio_decoder_isac_fix_gn")
+--- a/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_gn/moz.build
+@@ -76,8 +76,6 @@
+     DEFINES["USE_X11"] = "1"
+     DEFINES["WEBRTC_LINUX"] = True
+     DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_FILE_OFFSET_BITS"] = "64"
+     DEFINES["_GNU_SOURCE"] = True
+     DEFINES["_LARGEFILE64_SOURCE"] = True
+@@ -86,7 +84,6 @@
+     DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+     OS_LIBS += [
+-        "m",
+         "rt"
+     ]
+ 
+@@ -138,11 +135,6 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -165,8 +157,14 @@
+ 
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+ 
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_DEBUG"] = True
+ 
++    OS_LIBS += [
++        "m"
++    ]
++
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+@@ -176,6 +174,13 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+@@ -194,6 +199,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+@@ -202,4 +211,31 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
+ 
++if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
+ Library("audio_decoder_isac_gn")
+--- a/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix_gn/moz.build
+@@ -14,12 +14,7 @@
+ ]
+ 
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["ANDROID"] = True
+-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+-DEFINES["HAVE_SYS_UIO_H"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
+-DEFINES["WEBRTC_ANDROID"] = True
+-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+ DEFINES["WEBRTC_ARCH_ARM"] = True
+ DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+@@ -45,12 +40,6 @@
+     "/tools/profiler/public"
+ ]
+ 
+-OS_LIBS += [
+-    "android_support",
+-    "log",
+-    "unwind"
+-]
+-
+ UNIFIED_SOURCES += [
+     "/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_fix.cc"
+ ]
+@@ -64,7 +53,49 @@
+ 
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
++    DEFINES["ANDROID"] = True
++    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
++    DEFINES["HAVE_SYS_UIO_H"] = True
++    DEFINES["WEBRTC_ANDROID"] = True
++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+     DEFINES["_DEBUG"] = True
+ 
++    OS_LIBS += [
++        "android_support",
++        "log",
++        "unwind"
++    ]
++
++if CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++    DEFINES["USE_AURA"] = "1"
++    DEFINES["USE_GLIB"] = "1"
++    DEFINES["USE_NSS_CERTS"] = "1"
++    DEFINES["USE_OZONE"] = "1"
++    DEFINES["USE_UDEV"] = True
++    DEFINES["USE_X11"] = "1"
++    DEFINES["_FILE_OFFSET_BITS"] = "64"
++    DEFINES["_LARGEFILE64_SOURCE"] = True
++    DEFINES["_LARGEFILE_SOURCE"] = True
++
++    OS_LIBS += [
++        "rt"
++    ]
++
++if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
++
++    DEFINES["ANDROID"] = True
++    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_1"
++    DEFINES["HAVE_SYS_UIO_H"] = True
++    DEFINES["WEBRTC_ANDROID"] = True
++    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
++
++    OS_LIBS += [
++        "android_support",
++        "log",
++        "unwind"
++    ]
++
+ Library("audio_encoder_isac_fix_gn")
+--- a/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_gn/moz.build
+@@ -76,8 +76,6 @@
+     DEFINES["USE_X11"] = "1"
+     DEFINES["WEBRTC_LINUX"] = True
+     DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+-    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_FILE_OFFSET_BITS"] = "64"
+     DEFINES["_GNU_SOURCE"] = True
+     DEFINES["_LARGEFILE64_SOURCE"] = True
+@@ -86,7 +84,6 @@
+     DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+     OS_LIBS += [
+-        "m",
+         "rt"
+     ]
+ 
+@@ -138,11 +135,6 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -165,8 +157,14 @@
+ 
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+ 
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+     DEFINES["_DEBUG"] = True
+ 
++    OS_LIBS += [
++        "m"
++    ]
++
+ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+@@ -176,6 +174,13 @@
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
+@@ -194,6 +199,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+@@ -202,4 +211,31 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "5f64b417e1018dcf8fcc81dc2714e0f264b9b911"
+ 
++if CONFIG["CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
++if CONFIG["CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
++    DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
++
++    OS_LIBS += [
++        "m"
++    ]
++
+ Library("audio_encoder_isac_gn")
+--- a/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+@@ -131,11 +131,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -178,6 +180,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+@@ -138,11 +138,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -171,6 +166,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -185,6 +187,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+@@ -131,11 +131,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -178,6 +180,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+@@ -135,11 +135,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -168,6 +163,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -182,6 +184,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+@@ -138,11 +138,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -171,6 +166,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -185,6 +187,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/audio_options_api_gn/moz.build
++++ b/third_party/libwebrtc/api/audio_options_api_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
++++ b/third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+@@ -118,11 +118,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -151,6 +146,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -161,6 +163,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/call_api_gn/moz.build
++++ b/third_party/libwebrtc/api/call_api_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/callfactory_api_gn/moz.build
++++ b/third_party/libwebrtc/api/callfactory_api_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
++++ b/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+@@ -118,11 +118,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -151,6 +146,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -161,6 +163,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
++++ b/third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+@@ -118,11 +118,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -151,6 +146,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -161,6 +163,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/crypto/options_gn/moz.build
++++ b/third_party/libwebrtc/api/crypto/options_gn/moz.build
+@@ -139,11 +139,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -172,6 +167,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -186,6 +188,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/fec_controller_api_gn/moz.build
++++ b/third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
++++ b/third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+@@ -131,11 +131,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -174,6 +176,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/function_view_gn/moz.build
++++ b/third_party/libwebrtc/api/function_view_gn/moz.build
+@@ -118,11 +118,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -151,6 +146,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -161,6 +163,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
++++ b/third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/media_stream_interface_gn/moz.build
++++ b/third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
++++ b/third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
+@@ -137,11 +137,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -170,6 +165,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -184,6 +186,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
++++ b/third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+@@ -137,11 +137,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -170,6 +165,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -184,6 +186,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
++++ b/third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+@@ -129,11 +129,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -162,6 +157,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -172,6 +174,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
++++ b/third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
++++ b/third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/numerics/numerics_gn/moz.build
++++ b/third_party/libwebrtc/api/numerics/numerics_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/priority_gn/moz.build
++++ b/third_party/libwebrtc/api/priority_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/refcountedbase_gn/moz.build
++++ b/third_party/libwebrtc/api/refcountedbase_gn/moz.build
+@@ -122,11 +122,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -155,6 +150,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -165,6 +167,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/rtc_error_gn/moz.build
++++ b/third_party/libwebrtc/api/rtc_error_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
++++ b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
+@@ -131,11 +131,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -178,6 +180,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/rtp_headers_gn/moz.build
++++ b/third_party/libwebrtc/api/rtp_headers_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
++++ b/third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/rtp_parameters_gn/moz.build
++++ b/third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+@@ -127,11 +127,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -160,6 +155,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -174,6 +176,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
++++ b/third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/scoped_refptr_gn/moz.build
++++ b/third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/simulated_network_api_gn/moz.build
++++ b/third_party/libwebrtc/api/simulated_network_api_gn/moz.build
+@@ -131,11 +131,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -164,6 +159,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -174,6 +176,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
++++ b/third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+@@ -122,11 +122,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -155,6 +150,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -169,6 +171,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+@@ -139,11 +139,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -172,6 +167,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -186,6 +188,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/transport/network_control_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/network_control_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+@@ -122,11 +122,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -155,6 +150,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -165,6 +167,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build
++++ b/third_party/libwebrtc/api/transport/webrtc_key_value_config_gn/moz.build
+@@ -114,11 +114,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -147,6 +142,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -157,6 +159,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/transport_api_gn/moz.build
++++ b/third_party/libwebrtc/api/transport_api_gn/moz.build
+@@ -122,11 +122,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -155,6 +150,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -169,6 +171,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/units/data_rate_gn/moz.build
++++ b/third_party/libwebrtc/api/units/data_rate_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/units/data_size_gn/moz.build
++++ b/third_party/libwebrtc/api/units/data_size_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/units/frequency_gn/moz.build
++++ b/third_party/libwebrtc/api/units/frequency_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/units/time_delta_gn/moz.build
++++ b/third_party/libwebrtc/api/units/time_delta_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/units/timestamp_gn/moz.build
++++ b/third_party/libwebrtc/api/units/timestamp_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
++++ b/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+@@ -139,11 +139,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -172,6 +167,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -186,6 +188,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
++++ b/third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+@@ -139,11 +139,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -172,6 +167,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -186,6 +188,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/video/encoded_image_gn/moz.build
++++ b/third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+@@ -130,11 +130,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -163,6 +158,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -177,6 +179,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
++++ b/third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+@@ -122,11 +122,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -155,6 +150,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     OS_LIBS += [
+@@ -165,6 +167,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "d967bcef40477dbc39acef141ff22bf73f3e7cdb"
+--- a/third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
++++ b/third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,10 @@
+ 
+     DEFINES["CR_SYSROOT_HASH"] = "ef67b6ca8fd6e2e51515a243d043d1ea4caf45e6"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
++
++    DEFINES["CR_SYSROOT_HASH"] = "c2e54f675b83a61301dcdb22e8e7a2b85c01d58c"
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+ 
+     CXXFLAGS += [
+--- a/third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
++++ b/third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+@@ -126,11 +126,6 @@
+     DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-    OS_LIBS += [
+-        "android_support",
+-        "unwind"
+-    ]
+-
+ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
+ 
+     DEFINES["_FORTIFY_SOURCE"] = "2"
+@@ -159,6 +154,13 @@
+ 
+     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+ 
++if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
++
++    OS_LIBS += [
++        "android_support",
++        "unwind"
++    ]
++
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
+ 
+     CXXFLAGS += [
+@@ -173,6 +175,