Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Update template
@ 2021-12-14  1:28 zen0bit
  2021-12-14 13:19 ` Duncaen
                   ` (22 more replies)
  0 siblings, 23 replies; 27+ messages in thread
From: zen0bit @ 2021-12-14  1:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
@ 2021-12-14 13:19 ` Duncaen
  2022-01-12 17:55 ` [PR PATCH] [Updated] " zen0bit
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: Duncaen @ 2021-12-14 13:19 UTC (permalink / raw)
  To: ml

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-993531766

Comment:
1. You don't have to reopen PRs, force push to the branch instead of spamming new PRs.
2. Switching maintainer and upstream to your own without any reason/input/comment seems weird.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
  2021-12-14 13:19 ` Duncaen
@ 2022-01-12 17:55 ` zen0bit
  2022-01-12 17:59 ` zen0bit
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-12 17:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/2] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/2] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
  2021-12-14 13:19 ` Duncaen
  2022-01-12 17:55 ` [PR PATCH] [Updated] " zen0bit
@ 2022-01-12 17:59 ` zen0bit
  2022-01-12 19:03 ` [PR REVIEW] " paper42
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-12 17:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/2] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/2] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (2 preceding siblings ...)
  2022-01-12 17:59 ` zen0bit
@ 2022-01-12 19:03 ` paper42
  2022-01-12 19:05 ` [PR PATCH] [Updated] " zen0bit
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-01-12 19:03 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#discussion_r783360478

Comment:
That's not how this works, rebase on top of our master, remove these CI changes and make sure to have only one commit with proper description.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (3 preceding siblings ...)
  2022-01-12 19:03 ` [PR REVIEW] " paper42
@ 2022-01-12 19:05 ` zen0bit
  2022-01-13  6:42 ` zen0bit
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-12 19:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/3] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/3] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/3] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (4 preceding siblings ...)
  2022-01-12 19:05 ` [PR PATCH] [Updated] " zen0bit
@ 2022-01-13  6:42 ` zen0bit
  2022-01-13  6:45 ` zen0bit
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  6:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/4] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/4] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/4] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

From 25790c683c447d39979208ff1132d7efae08f200 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:42:44 +0100
Subject: [PATCH 4/4] Restore fetch_upstream.sh

---
 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 16ae2b379206..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 https://github.com/oSoWoSo/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (5 preceding siblings ...)
  2022-01-13  6:42 ` zen0bit
@ 2022-01-13  6:45 ` zen0bit
  2022-01-13  7:06 ` zen0bit
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  6:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/4] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/4] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/4] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

From 25790c683c447d39979208ff1132d7efae08f200 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:42:44 +0100
Subject: [PATCH 4/4] Restore fetch_upstream.sh

---
 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 16ae2b379206..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 https://github.com/oSoWoSo/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (6 preceding siblings ...)
  2022-01-13  6:45 ` zen0bit
@ 2022-01-13  7:06 ` zen0bit
  2022-01-13  7:16 ` zen0bit
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  7:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/5] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/5] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/5] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

From 25790c683c447d39979208ff1132d7efae08f200 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:42:44 +0100
Subject: [PATCH 4/5] Restore fetch_upstream.sh

---
 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 16ae2b379206..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 https://github.com/oSoWoSo/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From d916bf7985c6f33f5cf43e7d7237bd4a005edca3 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:06:52 +0100
Subject: [PATCH 5/5] Update template

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

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 349d1f924136..02349b03345c 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,16 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7.2
+version=0.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="oSoWoSo <pm@osowoso.xyz>"
+maintainer="zenobit from oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
 homepage="https://github.com/oSoWoSo/clearine"
 distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
-checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
+checksum=dd8665d70a490a6de1545c74daff1dc442dd5ffce575e2b61ca502bf376faf95
 conf_files="/etc/clearine.conf"
 
 pre_build() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (7 preceding siblings ...)
  2022-01-13  7:06 ` zen0bit
@ 2022-01-13  7:16 ` zen0bit
  2022-01-13  7:20 ` zen0bit
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  7:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/5] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/5] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/5] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

From 25790c683c447d39979208ff1132d7efae08f200 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:42:44 +0100
Subject: [PATCH 4/5] Restore fetch_upstream.sh

---
 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 16ae2b379206..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 https://github.com/oSoWoSo/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From d916bf7985c6f33f5cf43e7d7237bd4a005edca3 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:06:52 +0100
Subject: [PATCH 5/5] Update template

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

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 349d1f924136..02349b03345c 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,16 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7.2
+version=0.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="oSoWoSo <pm@osowoso.xyz>"
+maintainer="zenobit from oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
 homepage="https://github.com/oSoWoSo/clearine"
 distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
-checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
+checksum=dd8665d70a490a6de1545c74daff1dc442dd5ffce575e2b61ca502bf376faf95
 conf_files="/etc/clearine.conf"
 
 pre_build() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (8 preceding siblings ...)
  2022-01-13  7:16 ` zen0bit
@ 2022-01-13  7:20 ` zen0bit
  2022-01-13  7:43 ` zen0bit
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  7:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/7] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/7] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/7] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

From 25790c683c447d39979208ff1132d7efae08f200 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:42:44 +0100
Subject: [PATCH 4/7] Restore fetch_upstream.sh

---
 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 16ae2b379206..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 https://github.com/oSoWoSo/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From d916bf7985c6f33f5cf43e7d7237bd4a005edca3 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:06:52 +0100
Subject: [PATCH 5/7] Update template

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

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 349d1f924136..02349b03345c 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,16 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7.2
+version=0.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="oSoWoSo <pm@osowoso.xyz>"
+maintainer="zenobit from oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
 homepage="https://github.com/oSoWoSo/clearine"
 distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
-checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
+checksum=dd8665d70a490a6de1545c74daff1dc442dd5ffce575e2b61ca502bf376faf95
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 3c153fbb7453fb03949e044c36267189e85af3f1 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:20:15 +0100
Subject: [PATCH 7/7] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd664ac8c8d7..8ecd4d0e658a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (9 preceding siblings ...)
  2022-01-13  7:20 ` zen0bit
@ 2022-01-13  7:43 ` zen0bit
  2022-01-13  7:44 ` [PR REVIEW] " zen0bit
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  7:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 18009ef2e43779d951983a3a2544e30f88d858fa Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:26:19 +0100
Subject: [PATCH 1/7] Update template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..349d1f924136 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.7.2
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 07c06437d8127c838469631e7c518b6f94d7ecea Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:55:14 +0100
Subject: [PATCH 2/7] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..fd664ac8c8d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

From 98e19df280faf27422854eeaa401194849442525 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:59:04 +0100
Subject: [PATCH 3/7] Update fetch_upstream.sh

---
 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..09d6da7fef03 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 git://github.com/oSoWoSo/void-packages.git master

From 25790c683c447d39979208ff1132d7efae08f200 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:42:44 +0100
Subject: [PATCH 4/7] Restore fetch_upstream.sh

---
 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 16ae2b379206..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 https://github.com/oSoWoSo/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From d916bf7985c6f33f5cf43e7d7237bd4a005edca3 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:06:52 +0100
Subject: [PATCH 5/7] Update template

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

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 349d1f924136..02349b03345c 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,16 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7.2
+version=0.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="oSoWoSo <pm@osowoso.xyz>"
+maintainer="zenobit from oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
 homepage="https://github.com/oSoWoSo/clearine"
 distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
-checksum=732f22a0d4b60a2affc2f16eb37fe75a7ce283021d4ceaaade590bd2e341c8c7
+checksum=dd8665d70a490a6de1545c74daff1dc442dd5ffce575e2b61ca502bf376faf95
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 3c153fbb7453fb03949e044c36267189e85af3f1 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Thu, 13 Jan 2022 08:20:15 +0100
Subject: [PATCH 7/7] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd664ac8c8d7..8ecd4d0e658a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,7 +30,7 @@ jobs:
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
-      image: 'ghcr.io/void-linux/xbps-src-masterdir:v20211105RC01-${{ matrix.config.bootstrap }}'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:20210313rc01-${{ matrix.config.bootstrap }}'
       env:
         PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (10 preceding siblings ...)
  2022-01-13  7:43 ` zen0bit
@ 2022-01-13  7:44 ` zen0bit
  2022-01-13  8:13 ` [PR PATCH] [Closed]: " zen0bit
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  7:44 UTC (permalink / raw)
  To: ml

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

New review comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#discussion_r783701953

Comment:
reverted

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Closed]: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (11 preceding siblings ...)
  2022-01-13  7:44 ` [PR REVIEW] " zen0bit
@ 2022-01-13  8:13 ` zen0bit
  2022-01-14 12:19 ` paper42
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-13  8:13 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

Update template
https://github.com/void-linux/void-packages/pull/34519

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (12 preceding siblings ...)
  2022-01-13  8:13 ` [PR PATCH] [Closed]: " zen0bit
@ 2022-01-14 12:19 ` paper42
  2022-01-14 18:48 ` zen0bit
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-01-14 12:19 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1013071032

Comment:
I looked at your fork and it is only one commit ahead of the archived upstream - https://github.com/oSoWoSo/clearine/commit/a59184e0e7c9ed49437c255e37944457bf531690. The commit description is useless, is this fixing a bug? Could you describe it? If it is, I think we should just include patch in this repository and not change the upstream.

cc @steinex - the package maintainer

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (13 preceding siblings ...)
  2022-01-14 12:19 ` paper42
@ 2022-01-14 18:48 ` zen0bit
  2022-01-14 18:59 ` [PR PATCH] [Updated] " zen0bit
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-14 18:48 UTC (permalink / raw)
  To: ml

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

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1013371882

Comment:
I am already trying...
First try here
https://github.com/oSoWoSo/void-packages/tree/clearine-patch

Not tested yet

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (14 preceding siblings ...)
  2022-01-14 18:48 ` zen0bit
@ 2022-01-14 18:59 ` zen0bit
  2022-01-14 22:05 ` paper42
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-14 18:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 467e0aa10012eba5b722afbd02cebd52dd8fe13b Mon Sep 17 00:00:00 2001
From: zenobit <pm@osowoso.xyz>
Date: Thu, 13 Jan 2022 08:41:33 +0100
Subject: [PATCH 1/2] updated clearine template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..02349b03345c 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.8
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="zenobit from oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=dd8665d70a490a6de1545c74daff1dc442dd5ffce575e2b61ca502bf376faf95
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 6fa3d8db0f13e21eb6830f653586dbf9d38292b5 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Fri, 14 Jan 2022 19:59:25 +0100
Subject: [PATCH 2/2] Clearine patch (#6)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* sauerbraten: update to 2020.12.29

* cJSON: update to 1.7.15.

* 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.

* flatpak: update 1.12.3.

* Carla: fix plugin execution with python 3.10.

Adds a patch that fixes unexpected type errors when executing plugins.
Patch is already upstream.

* mda-lv2: update to 1.2.6, adopt

* FeatherPad: update to 1.1.1.

* bitcoin: update to 22.0.

* parted: update to 3.4.

* Manual.md: fix typo

* python3-rich: update to 11.0.0.

* python3-rfc3986: update to 2.0.0.

* New package: xfce4-docklike-plugin-0.4.0

Closes: #35022 [via git-merge-pr]

* kcm-wacomtablet: add update file

* netpbm: update to 10.97.02.

* ugrep: update to 3.6.0.

* nodejs: update to 16.13.2.

* nodejs-lts: update to 12.22.9.

* openssh: disable KbdInteractiveAuthentication.

The name of this flag changed in OpenSSH 8.7.

* imlib2: fix build on big endian

* ca-certificates: update to 20211016+3.74.

* nss: update to 3.74.

Tests failed because PayPalEE.cert expires at Jan 12 12:00:00 2022 GMT

* 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

* vscode: update to 1.63.2.

* Create clearine.py

* canto-next: update to 0.9.8.

* doomretro: update to 4.4.2.

* exiftool: update to 12.39.

* New package: gap-4.11.1

* New package: python3-tasklib-2.4.3

* New package: vit-2.1.0

* singular: update to 4.3.0

* nodejs: mark broken on aarch64.

* gnuplot: enable cairo for all builds.

* gallery-dl: update to 1.20.1.

Co-authored-by: ologantr <mrphyber@protonmail.com>
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Co-authored-by: Frank Steinborn <steinex@nognu.de>
Co-authored-by: mobinmob <mobinmob@disroot.org>
Co-authored-by: Daniel A. Maierhofer <git@damadmai.at>
Co-authored-by: Andrew Benson <abenson+void@gmail.com>
Co-authored-by: tibequadorian <tibequadorian@posteo.de>
Co-authored-by: Piraty <piraty1@inbox.ru>
Co-authored-by: Leah Neukirchen <leah@vuxu.org>
Co-authored-by: q66 <daniel@octaforge.org>
Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Co-authored-by: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Co-authored-by: Toby Merz <realtiaz@gmail.com>
Co-authored-by: Karel Balej <balejk@matfyz.cz>
Co-authored-by: Benjamín Albiñana <benalb@gmail.com>
Co-authored-by: Gonzalo Tornaría <tornaria@cmat.edu.uy>
Co-authored-by: Cullen Ross <cullenrss@gmail.com>
Co-authored-by: dkwo <nicolopiazzalunga@gmail.com>
Co-authored-by: Andreas Kempe <kempe@lysator.liu.se>
---
 Manual.md                                     |   2 +-
 common/shlibs                                 |  11 +-
 .../patches/unexpected_type_errors.patch      | 161 ++++++++++++++++++
 srcpkgs/Carla/template                        |   2 +-
 srcpkgs/FeatherPad/template                   |   4 +-
 srcpkgs/bitcoin/template                      |   8 +-
 srcpkgs/cJSON/patches/fix-memory-leak.patch   |  21 +++
 srcpkgs/cJSON/template                        |   4 +-
 srcpkgs/ca-certificates/template              |   4 +-
 srcpkgs/canto-next/template                   |   6 +-
 srcpkgs/clearine/patches/clearine.py          |  23 +++
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/flatpak/template                      |   4 +-
 srcpkgs/gallery-dl/template                   |   8 +-
 srcpkgs/gap-devel                             |   1 +
 srcpkgs/gap/template                          |  47 +++++
 srcpkgs/gnuplot/template                      |   4 +-
 srcpkgs/imlib2/patches/big-endian.patch       |  37 ++++
 srcpkgs/j4-dmenu-desktop/template             |   3 +-
 srcpkgs/kcm-wacomtablet/update                |   1 +
 srcpkgs/mda-lv2/template                      |   8 +-
 srcpkgs/netpbm/template                       |   6 +-
 srcpkgs/nodejs-lts/template                   |   9 +-
 srcpkgs/nodejs/template                       |   5 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/openssh/template                      |   4 +-
 .../parted/patches/disable-failed-tests.patch |  20 +++
 srcpkgs/parted/template                       |   5 +-
 srcpkgs/python3-rfc3986/template              |   4 +-
 srcpkgs/python3-rich/template                 |   4 +-
 srcpkgs/python3-tasklib/template              |  19 +++
 srcpkgs/sauerbraten/patches/flags.patch       |  41 ++---
 srcpkgs/sauerbraten/template                  |  12 +-
 .../patches/upstream_omalloc_new_musl.patch   |  40 -----
 .../patches/upstream_polys_test_musl.patch    |  22 ---
 srcpkgs/singular/template                     |   6 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/vit/template                          |  22 +++
 srcpkgs/vscode/template                       |   6 +-
 ...ame-called-but-libgen.h-not-included.patch |  56 ++++++
 srcpkgs/xfce4-docklike-plugin/template        |  14 ++
 srcpkgs/xfce4-panel/template                  |   5 +-
 43 files changed, 513 insertions(+), 162 deletions(-)
 create mode 100644 srcpkgs/Carla/patches/unexpected_type_errors.patch
 create mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
 create mode 100644 srcpkgs/clearine/patches/clearine.py
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template
 create mode 100644 srcpkgs/imlib2/patches/big-endian.patch
 create mode 100644 srcpkgs/kcm-wacomtablet/update
 create mode 100644 srcpkgs/parted/patches/disable-failed-tests.patch
 create mode 100644 srcpkgs/python3-tasklib/template
 delete mode 100644 srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
 delete mode 100644 srcpkgs/singular/patches/upstream_polys_test_musl.patch
 create mode 100644 srcpkgs/vit/template
 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/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
diff --git a/common/shlibs b/common/shlibs
index ebbd48a3d84c..d35944228287 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
@@ -4065,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/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"
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
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
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
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
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
diff --git a/srcpkgs/clearine/patches/clearine.py b/srcpkgs/clearine/patches/clearine.py
new file mode 100644
index 000000000000..ffca01cac407
--- /dev/null
+++ b/srcpkgs/clearine/patches/clearine.py
@@ -0,0 +1,23 @@
+--- a/src/clearine.py
++++ b/src/clearine.py
+@@ -107,15 +107,15 @@ def setcontent(self):
+         def find_key(data, section, key, default):
+             helper = Helper()
+             try:
+-                if data is "arr":
++                if data=="arr":
+                     return dotcat.get(section, key).split(",")
+-                if data is "str":
++                if data=="str":
+                     return dotcat.get(section, key, raw=True)
+-                if data is "int":
++                if data=="int":
+                     return dotcat.getint(section, key)
+-                if data is "flo":
++                if data=="flo":
+                     return dotcat.getfloat(section, key)
+-                if data is "clr":
++                if data=="clr":
+                     data = dotcat.get(section, key, raw=True)
+                     if data.startswith("#") or data.startswith("rgba("):
+                         return data
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
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
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"
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
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"
+	}
+}
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
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
+
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>"
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
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
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() {
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
 
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 4055f65beb58..ed0b7158e688 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"
@@ -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"
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=
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
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"
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
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
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
+}
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*"
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"
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
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
+}
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() {
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
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"

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (15 preceding siblings ...)
  2022-01-14 18:59 ` [PR PATCH] [Updated] " zen0bit
@ 2022-01-14 22:05 ` paper42
  2022-01-30 15:24 ` [PR PATCH] [Updated] " zen0bit
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-01-14 22:05 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1013505004

Comment:
Please test the changes on your computer first, verify that git log shows what you expect and then force push here.

> The commit description is useless, is this fixing a bug? Could you describe it?

Could you describe what are you trying to achieve?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (16 preceding siblings ...)
  2022-01-14 22:05 ` paper42
@ 2022-01-30 15:24 ` zen0bit
  2022-01-30 15:26 ` zen0bit
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-30 15:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oSoWoSo/void-packages clearine
https://github.com/void-linux/void-packages/pull/34519

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

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

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

From 467e0aa10012eba5b722afbd02cebd52dd8fe13b Mon Sep 17 00:00:00 2001
From: zenobit <pm@osowoso.xyz>
Date: Thu, 13 Jan 2022 08:41:33 +0100
Subject: [PATCH 1/2] updated clearine template

---
 srcpkgs/clearine/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template
index 9ab51e8d1d87..02349b03345c 100644
--- a/srcpkgs/clearine/template
+++ b/srcpkgs/clearine/template
@@ -1,17 +1,16 @@
 # Template file for 'clearine'
 pkgname=clearine
-version=0.7
-revision=4
+version=0.8
+revision=1
 build_style=python3-module
-pycompile_module="Clearine"
 hostmakedepends="python3-setuptools"
 depends="python3-gobject python3-cairo"
 short_desc="GTK3-based logout-window overlay for independent windowmanager"
-maintainer="Frank Steinborn <steinex@nognu.de>"
+maintainer="zenobit from oSoWoSo <pm@osowoso.xyz>"
 license="MIT"
-homepage="https://github.com/yuune/clearine"
-distfiles="https://github.com/yuune/clearine/archive/${version}.tar.gz"
-checksum=18a1a6b8b726c430e848a6688c97cd095fc01d7b15907fac28a267155b69588d
+homepage="https://github.com/oSoWoSo/clearine"
+distfiles="https://github.com/oSoWoSo/${pkgname}/archive/${version}.tar.gz"
+checksum=dd8665d70a490a6de1545c74daff1dc442dd5ffce575e2b61ca502bf376faf95
 conf_files="/etc/clearine.conf"
 
 pre_build() {

From 6fa3d8db0f13e21eb6830f653586dbf9d38292b5 Mon Sep 17 00:00:00 2001
From: zenobit <6384793+zen0bit@users.noreply.github.com>
Date: Fri, 14 Jan 2022 19:59:25 +0100
Subject: [PATCH 2/2] Clearine patch (#6)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* sauerbraten: update to 2020.12.29

* cJSON: update to 1.7.15.

* 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.

* flatpak: update 1.12.3.

* Carla: fix plugin execution with python 3.10.

Adds a patch that fixes unexpected type errors when executing plugins.
Patch is already upstream.

* mda-lv2: update to 1.2.6, adopt

* FeatherPad: update to 1.1.1.

* bitcoin: update to 22.0.

* parted: update to 3.4.

* Manual.md: fix typo

* python3-rich: update to 11.0.0.

* python3-rfc3986: update to 2.0.0.

* New package: xfce4-docklike-plugin-0.4.0

Closes: #35022 [via git-merge-pr]

* kcm-wacomtablet: add update file

* netpbm: update to 10.97.02.

* ugrep: update to 3.6.0.

* nodejs: update to 16.13.2.

* nodejs-lts: update to 12.22.9.

* openssh: disable KbdInteractiveAuthentication.

The name of this flag changed in OpenSSH 8.7.

* imlib2: fix build on big endian

* ca-certificates: update to 20211016+3.74.

* nss: update to 3.74.

Tests failed because PayPalEE.cert expires at Jan 12 12:00:00 2022 GMT

* 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

* vscode: update to 1.63.2.

* Create clearine.py

* canto-next: update to 0.9.8.

* doomretro: update to 4.4.2.

* exiftool: update to 12.39.

* New package: gap-4.11.1

* New package: python3-tasklib-2.4.3

* New package: vit-2.1.0

* singular: update to 4.3.0

* nodejs: mark broken on aarch64.

* gnuplot: enable cairo for all builds.

* gallery-dl: update to 1.20.1.

Co-authored-by: ologantr <mrphyber@protonmail.com>
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Co-authored-by: Frank Steinborn <steinex@nognu.de>
Co-authored-by: mobinmob <mobinmob@disroot.org>
Co-authored-by: Daniel A. Maierhofer <git@damadmai.at>
Co-authored-by: Andrew Benson <abenson+void@gmail.com>
Co-authored-by: tibequadorian <tibequadorian@posteo.de>
Co-authored-by: Piraty <piraty1@inbox.ru>
Co-authored-by: Leah Neukirchen <leah@vuxu.org>
Co-authored-by: q66 <daniel@octaforge.org>
Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Co-authored-by: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Co-authored-by: Toby Merz <realtiaz@gmail.com>
Co-authored-by: Karel Balej <balejk@matfyz.cz>
Co-authored-by: Benjamín Albiñana <benalb@gmail.com>
Co-authored-by: Gonzalo Tornaría <tornaria@cmat.edu.uy>
Co-authored-by: Cullen Ross <cullenrss@gmail.com>
Co-authored-by: dkwo <nicolopiazzalunga@gmail.com>
Co-authored-by: Andreas Kempe <kempe@lysator.liu.se>
---
 Manual.md                                     |   2 +-
 common/shlibs                                 |  11 +-
 .../patches/unexpected_type_errors.patch      | 161 ++++++++++++++++++
 srcpkgs/Carla/template                        |   2 +-
 srcpkgs/FeatherPad/template                   |   4 +-
 srcpkgs/bitcoin/template                      |   8 +-
 srcpkgs/cJSON/patches/fix-memory-leak.patch   |  21 +++
 srcpkgs/cJSON/template                        |   4 +-
 srcpkgs/ca-certificates/template              |   4 +-
 srcpkgs/canto-next/template                   |   6 +-
 srcpkgs/clearine/patches/clearine.py          |  23 +++
 srcpkgs/doomretro/template                    |   4 +-
 srcpkgs/exiftool/template                     |   4 +-
 srcpkgs/flatpak/template                      |   4 +-
 srcpkgs/gallery-dl/template                   |   8 +-
 srcpkgs/gap-devel                             |   1 +
 srcpkgs/gap/template                          |  47 +++++
 srcpkgs/gnuplot/template                      |   4 +-
 srcpkgs/imlib2/patches/big-endian.patch       |  37 ++++
 srcpkgs/j4-dmenu-desktop/template             |   3 +-
 srcpkgs/kcm-wacomtablet/update                |   1 +
 srcpkgs/mda-lv2/template                      |   8 +-
 srcpkgs/netpbm/template                       |   6 +-
 srcpkgs/nodejs-lts/template                   |   9 +-
 srcpkgs/nodejs/template                       |   5 +-
 srcpkgs/nss/template                          |   4 +-
 srcpkgs/openssh/template                      |   4 +-
 .../parted/patches/disable-failed-tests.patch |  20 +++
 srcpkgs/parted/template                       |   5 +-
 srcpkgs/python3-rfc3986/template              |   4 +-
 srcpkgs/python3-rich/template                 |   4 +-
 srcpkgs/python3-tasklib/template              |  19 +++
 srcpkgs/sauerbraten/patches/flags.patch       |  41 ++---
 srcpkgs/sauerbraten/template                  |  12 +-
 .../patches/upstream_omalloc_new_musl.patch   |  40 -----
 .../patches/upstream_polys_test_musl.patch    |  22 ---
 srcpkgs/singular/template                     |   6 +-
 srcpkgs/ugrep/template                        |   4 +-
 srcpkgs/vit/template                          |  22 +++
 srcpkgs/vscode/template                       |   6 +-
 ...ame-called-but-libgen.h-not-included.patch |  56 ++++++
 srcpkgs/xfce4-docklike-plugin/template        |  14 ++
 srcpkgs/xfce4-panel/template                  |   5 +-
 43 files changed, 513 insertions(+), 162 deletions(-)
 create mode 100644 srcpkgs/Carla/patches/unexpected_type_errors.patch
 create mode 100644 srcpkgs/cJSON/patches/fix-memory-leak.patch
 create mode 100644 srcpkgs/clearine/patches/clearine.py
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template
 create mode 100644 srcpkgs/imlib2/patches/big-endian.patch
 create mode 100644 srcpkgs/kcm-wacomtablet/update
 create mode 100644 srcpkgs/parted/patches/disable-failed-tests.patch
 create mode 100644 srcpkgs/python3-tasklib/template
 delete mode 100644 srcpkgs/singular/patches/upstream_omalloc_new_musl.patch
 delete mode 100644 srcpkgs/singular/patches/upstream_polys_test_musl.patch
 create mode 100644 srcpkgs/vit/template
 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/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
diff --git a/common/shlibs b/common/shlibs
index ebbd48a3d84c..d35944228287 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
@@ -4065,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/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"
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
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
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
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
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
diff --git a/srcpkgs/clearine/patches/clearine.py b/srcpkgs/clearine/patches/clearine.py
new file mode 100644
index 000000000000..ffca01cac407
--- /dev/null
+++ b/srcpkgs/clearine/patches/clearine.py
@@ -0,0 +1,23 @@
+--- a/src/clearine.py
++++ b/src/clearine.py
+@@ -107,15 +107,15 @@ def setcontent(self):
+         def find_key(data, section, key, default):
+             helper = Helper()
+             try:
+-                if data is "arr":
++                if data=="arr":
+                     return dotcat.get(section, key).split(",")
+-                if data is "str":
++                if data=="str":
+                     return dotcat.get(section, key, raw=True)
+-                if data is "int":
++                if data=="int":
+                     return dotcat.getint(section, key)
+-                if data is "flo":
++                if data=="flo":
+                     return dotcat.getfloat(section, key)
+-                if data is "clr":
++                if data=="clr":
+                     data = dotcat.get(section, key, raw=True)
+                     if data.startswith("#") or data.startswith("rgba("):
+                         return data
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
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
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"
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
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"
+	}
+}
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
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
+
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>"
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
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
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() {
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
 
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 4055f65beb58..ed0b7158e688 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"
@@ -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"
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=
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
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"
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
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
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
+}
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*"
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"
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
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
+}
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() {
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
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"

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (17 preceding siblings ...)
  2022-01-30 15:24 ` [PR PATCH] [Updated] " zen0bit
@ 2022-01-30 15:26 ` zen0bit
  2022-01-30 17:02 ` [PR PATCH] [Closed]: " paper42
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-30 15:26 UTC (permalink / raw)
  To: ml

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

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1025166819

Comment:
I cannot build it anymore even from official template...

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Closed]: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (18 preceding siblings ...)
  2022-01-30 15:26 ` zen0bit
@ 2022-01-30 17:02 ` paper42
  2022-01-30 17:02 ` paper42
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-01-30 17:02 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

Update template
https://github.com/void-linux/void-packages/pull/34519

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64 glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


## Trying again

pull request #33537 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (19 preceding siblings ...)
  2022-01-30 17:02 ` [PR PATCH] [Closed]: " paper42
@ 2022-01-30 17:02 ` paper42
  2022-01-30 17:41 ` zen0bit
  2022-01-30 17:41 ` paper42
  22 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-01-30 17:02 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1025185463

Comment:
```
>>> a = "123"
>>> a is "123"
<stdin>:1: SyntaxWarning: "is" with a literal. Did you mean "=="?
True
>>> a == "123"
True
```
So this PR is not fixing anything other than syntax warnings, if I am wrong, please leave a comment. I asked multiple times what this PR is supposed to fix, but you didn't respond. 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (20 preceding siblings ...)
  2022-01-30 17:02 ` paper42
@ 2022-01-30 17:41 ` zen0bit
  2022-01-30 17:41 ` paper42
  22 siblings, 0 replies; 27+ messages in thread
From: zen0bit @ 2022-01-30 17:41 UTC (permalink / raw)
  To: ml

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

New comment by zen0bit on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1025192898

Comment:
Yes

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: Update template
  2021-12-14  1:28 [PR PATCH] Update template zen0bit
                   ` (21 preceding siblings ...)
  2022-01-30 17:41 ` zen0bit
@ 2022-01-30 17:41 ` paper42
  22 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2022-01-30 17:41 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34519#issuecomment-1025192936

Comment:
> ```
> >>> a = "123"
> >>> a is "123"
> <stdin>:1: SyntaxWarning: "is" with a literal. Did you mean "=="?
> True
> >>> a == "123"
> True
> ```

This actually works only in some cases, if you describe what is actually happening, what is the bug and how can we reproduce this, we can reopen this PR.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-05-04 19:00 [PR PATCH] " asymmetros
@ 2021-05-04 19:18 ` asymmetros
  0 siblings, 0 replies; 27+ messages in thread
From: asymmetros @ 2021-05-04 19:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/asymmetros/void-packages strawberry-branch
https://github.com/void-linux/void-packages/pull/30680

Update template
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From bc6363eb850c3ec60195628d232b6fc3da1554f9 Mon Sep 17 00:00:00 2001
From: asymmetros <83448175+asymmetros@users.noreply.github.com>
Date: Tue, 4 May 2021 18:53:26 +0000
Subject: [PATCH 1/2] Update template

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

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..b1a719711947 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
@@ -14,5 +14,5 @@ short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
-distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+distfiles="https://files.strawberrymusicplayer.org/strawberry-0.9.3.tar.xz"
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e

From ed6595a63e989a6addf3714ec5cbea82e629d79c Mon Sep 17 00:00:00 2001
From: asymmetros <83448175+asymmetros@users.noreply.github.com>
Date: Tue, 4 May 2021 19:18:49 +0000
Subject: [PATCH 2/2] Update template

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

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index b1a719711947..653b98a5bf71 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -14,5 +14,5 @@ short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
-distfiles="https://files.strawberrymusicplayer.org/strawberry-0.9.3.tar.xz"
+distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
 checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-04-28 22:08 [PR PATCH] " grim-cypher
  2021-04-28 23:08 ` [PR PATCH] [Updated] " grim-cypher
@ 2021-04-29  0:25 ` grim-cypher
  1 sibling, 0 replies; 27+ messages in thread
From: grim-cypher @ 2021-04-29  0:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/grim-cypher/void-packages patch-1
https://github.com/void-linux/void-packages/pull/30568

Update template
updating to the new version of gradle 7.0



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

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

From dbf3c614c83def74df767701734676427412b82d Mon Sep 17 00:00:00 2001
From: grim-cypher <80390283+grim-cypher@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:44:36 +0530
Subject: [PATCH 1/3] Update template

updating to the new version of gradle 7.0
---
 srcpkgs/gradle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 8e9f08a9910b..88dab9e9d732 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=6.8.1
+version=7.0
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+checksum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 395d272d0e486e771fd3a9c9f2c22b90977d7bb6 Mon Sep 17 00:00:00 2001
From: grim-cypher <80390283+grim-cypher@users.noreply.github.com>
Date: Thu, 29 Apr 2021 04:38:23 +0530
Subject: [PATCH 2/3] Update template

---
 srcpkgs/gradle/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 88dab9e9d732..ca05694dac2f 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -9,12 +9,12 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
+checksum="https://services.gradle.org/distributions/gradle-${version}-bin.zip.sha256"
+
 
 do_install() {
-	vmkdir "usr/lib/gradle"
-	sed ${FILESDIR}/gradle -e "s;@VERSION@;${version};" > gradle
-	vbin gradle
-	vdoc README
-	mv lib ${DESTDIR}/usr/lib/gradle/
+	wget ${distfiles}
+	mkdir /opt/gradle
+	unzip -d /opt/gradle gradle-${version}-bin.zip
+	export PATH=$PATH:/opt/gradle/gradle-${version}/bin
 }

From ea2e01deab46a64663efb2e4ae657eff70742634 Mon Sep 17 00:00:00 2001
From: grim-cypher <80390283+grim-cypher@users.noreply.github.com>
Date: Thu, 29 Apr 2021 05:55:20 +0530
Subject: [PATCH 3/3] Update template

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

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index ca05694dac2f..d43fa54eeccd 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -16,5 +16,6 @@ do_install() {
 	wget ${distfiles}
 	mkdir /opt/gradle
 	unzip -d /opt/gradle gradle-${version}-bin.zip
-	export PATH=$PATH:/opt/gradle/gradle-${version}/bin
+	ln /opt/gradle/gradle-${version}/bin/gradle /usr/bin/gradle
 }
+do_install

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] Update template
  2021-04-28 22:08 [PR PATCH] " grim-cypher
@ 2021-04-28 23:08 ` grim-cypher
  2021-04-29  0:25 ` grim-cypher
  1 sibling, 0 replies; 27+ messages in thread
From: grim-cypher @ 2021-04-28 23:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/grim-cypher/void-packages patch-1
https://github.com/void-linux/void-packages/pull/30568

Update template
updating to the new version of gradle 7.0



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

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

From dbf3c614c83def74df767701734676427412b82d Mon Sep 17 00:00:00 2001
From: grim-cypher <80390283+grim-cypher@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:44:36 +0530
Subject: [PATCH 1/2] Update template

updating to the new version of gradle 7.0
---
 srcpkgs/gradle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 8e9f08a9910b..88dab9e9d732 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
 # Template file for 'gradle'
 pkgname=gradle
-version=6.8.1
+version=7.0
 revision=1
 depends="virtual?java-environment"
 short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+checksum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
 
 do_install() {
 	vmkdir "usr/lib/gradle"

From 395d272d0e486e771fd3a9c9f2c22b90977d7bb6 Mon Sep 17 00:00:00 2001
From: grim-cypher <80390283+grim-cypher@users.noreply.github.com>
Date: Thu, 29 Apr 2021 04:38:23 +0530
Subject: [PATCH 2/2] Update template

---
 srcpkgs/gradle/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 88dab9e9d732..ca05694dac2f 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -9,12 +9,12 @@ license="Apache-2.0"
 homepage="https://gradle.org/"
 changelog="https://docs.gradle.org/${version}/release-notes.html"
 distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
+checksum="https://services.gradle.org/distributions/gradle-${version}-bin.zip.sha256"
+
 
 do_install() {
-	vmkdir "usr/lib/gradle"
-	sed ${FILESDIR}/gradle -e "s;@VERSION@;${version};" > gradle
-	vbin gradle
-	vdoc README
-	mv lib ${DESTDIR}/usr/lib/gradle/
+	wget ${distfiles}
+	mkdir /opt/gradle
+	unzip -d /opt/gradle gradle-${version}-bin.zip
+	export PATH=$PATH:/opt/gradle/gradle-${version}/bin
 }

^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2022-01-30 17:41 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-14  1:28 [PR PATCH] Update template zen0bit
2021-12-14 13:19 ` Duncaen
2022-01-12 17:55 ` [PR PATCH] [Updated] " zen0bit
2022-01-12 17:59 ` zen0bit
2022-01-12 19:03 ` [PR REVIEW] " paper42
2022-01-12 19:05 ` [PR PATCH] [Updated] " zen0bit
2022-01-13  6:42 ` zen0bit
2022-01-13  6:45 ` zen0bit
2022-01-13  7:06 ` zen0bit
2022-01-13  7:16 ` zen0bit
2022-01-13  7:20 ` zen0bit
2022-01-13  7:43 ` zen0bit
2022-01-13  7:44 ` [PR REVIEW] " zen0bit
2022-01-13  8:13 ` [PR PATCH] [Closed]: " zen0bit
2022-01-14 12:19 ` paper42
2022-01-14 18:48 ` zen0bit
2022-01-14 18:59 ` [PR PATCH] [Updated] " zen0bit
2022-01-14 22:05 ` paper42
2022-01-30 15:24 ` [PR PATCH] [Updated] " zen0bit
2022-01-30 15:26 ` zen0bit
2022-01-30 17:02 ` [PR PATCH] [Closed]: " paper42
2022-01-30 17:02 ` paper42
2022-01-30 17:41 ` zen0bit
2022-01-30 17:41 ` paper42
  -- strict thread matches above, loose matches on Subject: below --
2021-05-04 19:00 [PR PATCH] " asymmetros
2021-05-04 19:18 ` [PR PATCH] [Updated] " asymmetros
2021-04-28 22:08 [PR PATCH] " grim-cypher
2021-04-28 23:08 ` [PR PATCH] [Updated] " grim-cypher
2021-04-29  0:25 ` grim-cypher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).