Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ejabberd 22.10 update
@ 2023-01-01 19:48 wereket
  2023-01-01 19:56 ` [PR REVIEW] " paper42
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: wereket @ 2023-01-01 19:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wereket/void-packages master
https://github.com/void-linux/void-packages/pull/41396

ejabberd 22.10 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 8f146d490d629affec4e868cfa6e0db7bc554062 Mon Sep 17 00:00:00 2001
From: wreket <dagnachewa@gmail.com>
Date: Sun, 1 Jan 2023 14:47:30 -0500
Subject: [PATCH] ejabberd 22.10 update

---
 srcpkgs/ejabberd/template | 4 ++--
 test                      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 test

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index c77545190f4f..b7918d3fa6c7 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,6 +1,6 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=22.05
+version=22.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=b8e93b51ae3cb650a2870fae1b6705404bb155289e97be7e9a54961a9effb959
+checksum=8539707da7e75785444edf402b5ff60fc3f956806c341b2565702dcc77900402
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/test b/test
new file mode 100644
index 000000000000..edbddf1f4907
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+ERROR: XBPS_CROSS_TRIPLET is not defined!

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

* Re: [PR REVIEW] ejabberd 22.10 update
  2023-01-01 19:48 [PR PATCH] ejabberd 22.10 update wereket
@ 2023-01-01 19:56 ` paper42
  2023-01-01 19:57 ` paper42
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-01-01 19:56 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41396#discussion_r1059789789

Comment:
remove this file

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

* Re: ejabberd 22.10 update
  2023-01-01 19:48 [PR PATCH] ejabberd 22.10 update wereket
  2023-01-01 19:56 ` [PR REVIEW] " paper42
@ 2023-01-01 19:57 ` paper42
  2023-01-01 19:57 ` paper42
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-01-01 19:57 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41396#issuecomment-1368519681

Comment:
Please follow the commit message conventions documented in CONTRIBUTING.md

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

* Re: ejabberd 22.10 update
  2023-01-01 19:48 [PR PATCH] ejabberd 22.10 update wereket
  2023-01-01 19:56 ` [PR REVIEW] " paper42
  2023-01-01 19:57 ` paper42
@ 2023-01-01 19:57 ` paper42
  2023-01-02 21:23 ` [PR PATCH] [Updated] " wereket
  2023-01-02 21:24 ` [PR PATCH] [Closed]: " wereket
  4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2023-01-01 19:57 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41396#issuecomment-1368519757

Comment:
> #### Testing the changes
> - I tested the changes in this PR: **YES**|**briefly**|**NO**

Please choose one

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

* Re: [PR PATCH] [Updated] ejabberd 22.10 update
  2023-01-01 19:48 [PR PATCH] ejabberd 22.10 update wereket
                   ` (2 preceding siblings ...)
  2023-01-01 19:57 ` paper42
@ 2023-01-02 21:23 ` wereket
  2023-01-02 21:24 ` [PR PATCH] [Closed]: " wereket
  4 siblings, 0 replies; 6+ messages in thread
From: wereket @ 2023-01-02 21:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/wereket/void-packages master
https://github.com/void-linux/void-packages/pull/41396

ejabberd 22.10 update
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 8f146d490d629affec4e868cfa6e0db7bc554062 Mon Sep 17 00:00:00 2001
From: wreket <dagnachewa@gmail.com>
Date: Sun, 1 Jan 2023 14:47:30 -0500
Subject: [PATCH 001/114] ejabberd 22.10 update

---
 srcpkgs/ejabberd/template | 4 ++--
 test                      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 test

diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index c77545190f4f..b7918d3fa6c7 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,6 +1,6 @@
 # Template file for 'ejabberd'
 pkgname=ejabberd
-version=22.05
+version=22.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.process-one.net/en/ejabberd/"
 distfiles="https://github.com/processone/ejabberd/archive/${version}.tar.gz"
-checksum=b8e93b51ae3cb650a2870fae1b6705404bb155289e97be7e9a54961a9effb959
+checksum=8539707da7e75785444edf402b5ff60fc3f956806c341b2565702dcc77900402
 
 build_options="sqlite"
 build_options_default="sqlite"
diff --git a/test b/test
new file mode 100644
index 000000000000..edbddf1f4907
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+ERROR: XBPS_CROSS_TRIPLET is not defined!

From 58199ce2adac225e9b53464d4d33821e2a813375 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sat, 31 Dec 2022 07:28:32 -0700
Subject: [PATCH 002/114] python3-txtorcon: update to 22.0.0.

---
 srcpkgs/python3-txtorcon/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template
index 830859d26f6c..07e5fedce66b 100644
--- a/srcpkgs/python3-txtorcon/template
+++ b/srcpkgs/python3-txtorcon/template
@@ -1,19 +1,20 @@
 # Template file for 'python3-txtorcon'
 pkgname=python3-txtorcon
-version=21.1.0
-revision=4
+version=22.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools"
 depends="lsof python3-automat python3-cryptography python3-six python3-Twisted
- python3-zope.interface"
+ python3-zope.interface which"
 checkdepends="${depends} python3-mock python3-pytest"
 short_desc="Twisted-based asynchronous Tor control protocol implementation"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://txtorcon.readthedocs.io/en/latest/"
+changelog="https://raw.githubusercontent.com/meejah/txtorcon/main/docs/releases.rst"
 distfiles="https://github.com/meejah/txtorcon/archive/v${version}.tar.gz"
-checksum=61ef40e110a2b52255a6033293d02647dedb63ed9311ce572571c777b2302750
-make_check=ci-skip
+checksum=195c2e3d1ed4ad564570d20af54812163ca1de9e9ee034f0c8276fd4410759e7
+make_check=ci-skip # Can not open ports in CI
 
 post_install() {
 	vlicense LICENSE

From 82ce5afa12b4f786682eb6561e813d692cde2b66 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 1 Jan 2023 23:21:10 +0100
Subject: [PATCH 003/114] dq: update to 0.0.20230101.

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

diff --git a/srcpkgs/dq/template b/srcpkgs/dq/template
index db5389dd3e25..e0d84abd1b7f 100644
--- a/srcpkgs/dq/template
+++ b/srcpkgs/dq/template
@@ -1,6 +1,6 @@
 # Template file for 'dq'
 pkgname=dq
-version=0.0.20220822
+version=0.0.20230101
 revision=1
 build_style=gnu-makefile
 make_dirs="
@@ -12,10 +12,10 @@ conf_files="
  /etc/dqcache/root/servers/*"
 short_desc="Recursive DNS/DNSCurve server and cli tool to debug DNS/DNSCurve"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="Public Domain"
+license="CC0-1.0"
 homepage="https://mojzis.com/software/dq/"
 distfiles="https://github.com/janmojzis/dq/archive/${version##*.}.tar.gz"
-checksum=6f64b248154e852d0da2f6cc81e5578e7fb3387737aadf1b0bd3e14fec92e316
+checksum=29d891e7ce7a25b6226a2784e8c5edc7885657e94f1e800e4fadcb3427e0f183
 
 system_accounts="_dqcache"
 

From 9cc0b5b2fbae0685d3e889f43b583cb4867d5f08 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 1 Jan 2023 23:10:15 -0600
Subject: [PATCH 004/114] python3-rich: update to 13.0.0.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index e855152ef345..ba2a689bf868 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.6.0
-revision=2
+version=13.0.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-typing_extensions python3-Pygments python3-commonmark
@@ -12,7 +12,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=ba3a3775974105c221d31141f2c116f4fd65c5ceb0698657a11e9f295ec93fd0
+checksum=3aa9eba7219b8c575c6494446a59f702552efe1aa261e7eeb95548fa586e1950
 make_check=extended # some checks only work on windows
 
 post_install() {

From aceee26ca6d069218a45c723c1140fd877b108d7 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 1 Jan 2023 23:11:31 -0600
Subject: [PATCH 005/114] jc: update to 1.22.4.

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

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 48190f2059c4..1df359452f1b 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.22.3
+version=1.22.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/kellyjonbrazil/jc"
 changelog="https://raw.githubusercontent.com/kellyjonbrazil/jc/master/CHANGELOG"
 distfiles="https://github.com/kellyjonbrazil/jc/archive/refs/tags/v${version}.tar.gz"
-checksum=b4a8a7c07d789ddbc2cbbce07471a1599f65082638ed7198597da8412fc07e11
+checksum=6d64102677ae285a2abedd33aa65c2198a533ef1d5320f2e9a9d70c774a51783
 
 post_install() {
 	vman man/jc.1

From a22c4373cfb1d9b36a84c322022d21162bd6b96e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 2 Jan 2023 01:24:43 -0500
Subject: [PATCH 006/114] d2: downgrade to 0.1.3.

Turns out the latest version crashes immediately
---
 srcpkgs/d2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index c63a3e84a350..723c43b7af3b 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,8 @@
 # Template file for 'd2'
 pkgname=d2
-version=0.1.4
-revision=1
+reverts="0.1.4_1"
+version=0.1.3
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
@@ -10,4 +11,4 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://d2lang.com/"
 distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
-checksum=ce658b1ed243b2712a7544f109f08dbc6f9690d1f6443a3fa6b39d0f6ccd626a
+checksum=9dc8c88d07725d549b8a20ae3271e82b01c0c45b0c7338a1ec67aad0c4facc54

From 841f33872a7cee791873ad9f728f60c5f90a732d Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 2 Jan 2023 01:57:56 -0500
Subject: [PATCH 007/114] d2: upgrade to 0.1.4.

This reverts commit 50caa71b67b43cd318b9a72ef67ab36f27e09586.

Since now we can go ahead and just remove the plugin binary and no
longer segfault on running.

https://github.com/terrastruct/d2/issues/590
---
 srcpkgs/d2/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 723c43b7af3b..06ad1ee6df31 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,14 +1,13 @@
 # Template file for 'd2'
 pkgname=d2
-reverts="0.1.4_1"
-version=0.1.3
+version=0.1.4
 revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
-go_package="oss.terrastruct.com/d2 oss.terrastruct.com/d2/cmd/d2plugin-dagre"
+go_package="oss.terrastruct.com/d2"
 short_desc="Modern diagram scripting language that turns text to diagrams"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://d2lang.com/"
 distfiles="https://github.com/terrastruct/d2/archive/refs/tags/v${version}.tar.gz"
-checksum=9dc8c88d07725d549b8a20ae3271e82b01c0c45b0c7338a1ec67aad0c4facc54
+checksum=ce658b1ed243b2712a7544f109f08dbc6f9690d1f6443a3fa6b39d0f6ccd626a

From 96472300f7e81607d38da004dfdf14e8e63637dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 17:50:01 +0100
Subject: [PATCH 008/114] gtk4: update to 4.8.3.

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 3d3fc7de0f77..7e08d3dd0ec0 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.8.2
+version=4.8.3
 revision=1
 build_style=meson
 build_helper="gir"
@@ -32,7 +32,7 @@ homepage="https://www.gtk.org/"
 #changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-8/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=85b7a160b6e02eafa4e7d38f046f8720fab537d3fe73c01c864333a983a692a9
+checksum=b362f968d085b4d3d9340d4d38c706377ded9d5374e694a2b6b7e6292e3cba74
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"

From f52c25a73e06b649938d784f1fda57d131b6094c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 009/114] evolution-data-server: update to 3.46.2.

---
 common/shlibs                          | 19 ++++++++++---------
 srcpkgs/evolution-data-server/template | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..6b586ced1044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -603,21 +603,22 @@ libicalss.so.3 libical-3.0.4_1
 libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
-libcamel-1.2.so.63 evolution-data-server-3.42.0_1
-libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
-libebackend-1.2.so.10 evolution-data-server-3.17.90_1
-libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
-libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
-libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
-libebook-1.2.so.20 evolution-data-server-3.34.0_1
-libecal-2.0.so.1 evolution-data-server-3.34.0_1
+libcamel-1.2.so.64 evolution-data-server-3.46.0_1
+libebackend-1.2.so.11 evolution-data-server-3.46.0_1
+libebook-1.2.so.21 evolution-data-server-3.46.0_1
+libebook-contacts-1.2.so.4 evolution-data-server-3.46.0_1
+libecal-2.0.so.2 evolution-data-server-3.46.0_1
+libedata-book-1.2.so.27 evolution-data-server-3.46.0_1
+libedataserver-1.2.so.27 evolution-data-server-3.46.0_1
+libedataserverui-1.2.so.4 evolution-data-server-3.46.0_1
+libedataserverui4-1.0.so.0 evolution-data-server-3.46.0_1
 libevolution-calendar.so evolution-3.28.0_1
 libevolution-util.so evolution-3.28.0_1
 libemail-engine.so evolution-3.28.0_1
 libevolution-mail.so evolution-3.28.0_1
 libevolution-mail-formatter.so evolution-3.40.0_1
 libevolution-shell.so evolution-3.28.0_1
-libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
+libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
 libgdata.so.22 libgdata-0.17.9_1
 libpcap.so.1 libpcap-1.1.1_1
 libiptc.so.0 iptables-1.4.7_1
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 6304e8cc5b34..33b71f4524ed 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,26 +1,27 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.44.4
+version=3.46.2
 revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc
- -DWITH_GWEATHER4=ON -DWITH_PHONENUMBER=ON
- $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')"
+ -DWITH_PHONENUMBER=ON
+ $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')
+ -DENABLE_WEATHER=OFF"
 hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel
  $(vopt_if gir vala)"
 makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
- libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel
- libsoup-devel libphonenumber-devel $(vopt_if gir vala-devel)"
-depends="libgweather libsoup-gnome"
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel"
 checkdepends="dbus"
 short_desc="Centralized access to appointments and contacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz"
+checksum=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
+make_check=ci-skip # flaky in CI
 
 build_options="gir"
 build_options_default="gir"
@@ -36,7 +37,7 @@ pre_build() {
 evolution-data-server-devel_package() {
 	depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel
 		libgdata-devel>=0.15 libsecret-devel libglib-devel
-		libsoup-devel gtk+3-devel libxml2-devel
+		libsoup3-devel gtk4-devel libxml2-devel
 		${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From a57879b91b685d9f3fc38c337cd2fe8a64a91c77 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 20:07:27 +0100
Subject: [PATCH 010/114] libwnck: update to 43.0.

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

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 57d884c9f44d..c0f91a89fdce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
 # Template file for 'libwnck'
 pkgname=libwnck
-version=40.1
+version=43.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -12,9 +12,9 @@ short_desc="Library for layout and rendering of text"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libwnck/"
-changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611
+changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/libwnck/${version%.*}/libwnck-${version}.tar.xz"
+checksum=905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe
 
 build_options="gir"
 build_options_default="gir"

From 408e8b6afc8b71ec49301d2e9fbee381b0cf7516 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 011/114] adwaita-icon-theme: update to 43.

---
 srcpkgs/adwaita-icon-theme/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=42.0
+version=43
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 depends="librsvg"
 short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6

From bd42bfe615fc61c1a4b4ae6abe01a56581aaaa7c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 012/114] gnome-desktop: update to 43.

---
 common/shlibs                                 |  8 +-
 .../patches/optional_introspection.patch      | 93 -------------------
 srcpkgs/gnome-desktop/template                | 13 +--
 3 files changed, 11 insertions(+), 103 deletions(-)
 delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch

diff --git a/common/shlibs b/common/shlibs
index 6b586ced1044..c2a11c1cf1ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,10 +1136,10 @@ libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
-libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
-libgnome-desktop-4.so.1 gnome-desktop-42.0_1
-libgnome-bg-4.so.1 gnome-desktop-42.0_1
-libgnome-rr-4.so.1 gnome-desktop-42.0_1
+libgnome-desktop-3.so.20 gnome-desktop-43.0_1
+libgnome-desktop-4.so.2 gnome-desktop-43.0_1
+libgnome-bg-4.so.2 gnome-desktop-43.0_1
+libgnome-rr-4.so.2 gnome-desktop-43.0_1
 libsecret-1.so.0 libsecret-0.10_1
 libgweather-4.so.0 libgweather-4.0.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch
deleted file mode 100644
index b960ef27c588..000000000000
--- a/srcpkgs/gnome-desktop/patches/optional_introspection.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 18 Sep 2019 22:28:21 +0300
-Subject: [PATCH] meson: Add optionality for introspection
-
----
- libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
- meson_options.txt            |  4 +++
- 2 files changed, 30 insertions(+), 22 deletions(-)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index a0fb11f8..375cf57c 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -125,17 +125,19 @@ if get_option('build_gtk4')
-     ],
-   )
- 
--  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
--    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
--    export_packages: 'gnome-desktop-4',
--    namespace: 'GnomeDesktop',
--    nsversion: '4.0',
--    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
--    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
--    identifier_prefix: 'Gnome',
--    symbol_prefix: 'gnome',
--    install: true,
--  )
-+  if get_option('introspection')
-+    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
-+      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
-+      export_packages: 'gnome-desktop-4',
-+      namespace: 'GnomeDesktop',
-+      nsversion: '4.0',
-+      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
-+      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
-+      identifier_prefix: 'Gnome',
-+      symbol_prefix: 'gnome',
-+      install: true,
-+    )
-+  endif
- 
-   pkg.generate(
-     libgnome_desktop_base,
-@@ -255,17 +257,19 @@ if get_option('legacy_library')
-     ],
-   )
- 
--  gnome.generate_gir(libgnome_desktop,
--    sources: introspection_sources + libgnome_desktop_headers,
--    export_packages: 'gnome-desktop-3.0',
--    namespace: 'GnomeDesktop',
--    nsversion: '3.0',
--    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
--    identifier_prefix: 'Gnome',
--    symbol_prefix: 'gnome',
--    install: true
--  )
-+  if get_option('introspection')
-+    gnome.generate_gir(libgnome_desktop,
-+      sources: introspection_sources + libgnome_desktop_headers,
-+      export_packages: 'gnome-desktop-3.0',
-+      namespace: 'GnomeDesktop',
-+      nsversion: '3.0',
-+      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
-+      identifier_prefix: 'Gnome',
-+      symbol_prefix: 'gnome',
-+      install: true
-+    )
-+  endif
- 
-   pkg.generate(
-     libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e17e7330..c4db6eaf 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -17,6 +17,10 @@ option('debug_tools',
-   type: 'boolean', value: true, description: 'Build debug tools'
- )
- 
-+option('introspection',
-+  type: 'boolean', value: true, description: 'Whether to build introspection files'
-+)
-+
- option('udev',
-   type: 'feature', description: 'Udev support'
- )
--- 
-GitLab
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 86b8ca890776..ec82aeb9d2bf 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=42.6
+version=43
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
+configure_args="-Dudev=enabled -Dsystemd=disabled
  -Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext itstool pkg-config glib-devel"
 makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
  libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
 depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
 short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
-changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
 
 build_options="gir"
 build_options_default="gir"

From c3fdc90314ed3e6629621ccd90f1f0e458a9dfae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 013/114] mutter: update to 43.2.

---
 common/shlibs           |  8 ++++----
 srcpkgs/mutter/template | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c2a11c1cf1ef..84a970009f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,10 +2977,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-10.so.0 mutter-42.0_1
-libmutter-clutter-10.so.0 mutter-42.0_1
-libmutter-cogl-10.so.0 mutter-42.0_1
-libmutter-cogl-pango-10.so.0 mutter-42.0_1
+libmutter-11.so.0 mutter-43.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub-0.6.so.0 libgepub-0.6.0_4
 libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=42.6
+version=43.2
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
  wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
 depends="gsettings-desktop-schemas desktop-file-utils zenity"
 short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
-changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
+ libmutter-cogl-pango-11.so"
 make_check=no # needs a full graphical session
 
 # Upstream keeps pulling generated headers even though it can cause race
@@ -34,8 +34,8 @@ pre_build() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
 }
 
 mutter-devel_package() {
@@ -45,7 +45,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-10/*.gir"
+		vmove "usr/lib/mutter-11/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

From e51d23d6212e05b442dc846d30afef9592aee3c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 014/114] budgie-desktop: revbump for mutter 43

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

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.6.4
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"

From ff20eab8c456f23391927258a9134ef93d3b3f10 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 015/114] nautilus: update to 43.1.

---
 common/shlibs             |  2 +-
 srcpkgs/nautilus/template | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 84a970009f38..2cb86c210f0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -674,7 +674,7 @@ libgvfscommon.so.0 gvfs-1.7.2_1
 libgvfscommon-dnssd.so.0 gvfs-1.7.2_1
 libgvfsdaemon.so gvfs-1.20_1
 libgvfscommon.so gvfs-1.20_1
-libnautilus-extension.so.1 libnautilus-3.2.1_1
+libnautilus-extension.so.4 libnautilus-43.0_1
 libmpc.so.3 libmpc-1.0.1_1
 libsigc-2.0.so.0 libsigc++-1.1_1
 libsigc-3.0.so.0 libsigc++3-3.0.3_1
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 571013b24c7d..18e34619b0c4 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,26 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=42.2
+version=43.1
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gettext glib-devel libxslt pkg-config tracker"
-makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel
+hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel
  libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel
  libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel
- libhandy1-devel libportal-gtk3-devel"
+ libadwaita-devel libportal-gtk4-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme
  tracker-miners tracker"
 checkdepends="tracker tracker-miners python3-gobject dbus"
 short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Nautilus"
-changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended
@@ -40,7 +41,7 @@ libnautilus_package() {
 	}
 }
 nautilus-devel_package() {
-	depends="gtk+3-devel libnautilus>=${version}_${revision}"
+	depends="gtk4-devel libnautilus>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 8e0c8d86e171274602bf09aac29e278456124104 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 016/114] gnome-shell: update to 43.2.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=42.6
+version=43.2
 revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dsystemd=false -Dtests=false"
-hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
+hostmakedepends="libxslt pkg-config python3 sassc
  asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache"
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
  NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
- gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel gcr4-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower
  gstreamer1-pipewire gst-plugins-good1"
 checkdepends="xvfb-run mesa-dri $depends"
 short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
-changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From 43deef729d64f22a3ed5a50af7585d51d1e004c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 017/114] gnome-shell-extensions: update to 43.1.

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

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
 hostmakedepends="pkg-config gettext"
 depends="gnome-shell>=${version} nautilus unzip"
 short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17

From 4daa92c388be63632388d429a2d93a1889fe93ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 018/114] Endeavour: revbump for evolution-data-server 3.46

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

diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
 # Template file for 'Endeavour'
 pkgname=Endeavour
 version=43.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 4d111a0cdcf0735a46c09e6b5b4b3a0b0fa393fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 019/114] bijiben: revbump for evolution-data-server 3.46

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

diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
 # Template file for 'bijiben'
 pkgname=bijiben
 version=40.1
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 hostmakedepends="itstool pkg-config gettext glib-devel"

From f60f222458d1d7142bc19956b1387586d5b6cbc6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 020/114] gnome-panel: update to 3.46.0.

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

diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..2ef92c56c4f1 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.44.0
+version=3.46.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -13,8 +13,8 @@ short_desc="Panel Application for GNOME flashback"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomePanel"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
+distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz"
+checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1
 
 gnome-panel-devel_package() {
 	depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"

From 210425d3578d80ccbce3fb25ed3caec817f8feb7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 021/114] io.elementary.calendar: update to 6.1.2.

* use libsoup3
---
 .../patches/libsoup3.patch                    | 137 ++++++++++++++++++
 srcpkgs/io.elementary.calendar/template       |  10 +-
 2 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch

diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
new file mode 100644
index 000000000000..61659b902cba
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
@@ -0,0 +1,137 @@
+From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
+Date: Sun, 7 Aug 2022 21:18:35 +0200
+Subject: [PATCH] Add support for Evolution Data Server 3.46
+
+EDS 3.46 has switched to libsoup-3
+
+Co-authored-by: Bobby Rong <rjl931189261@126.com>
+---
+ meson.build                       | 10 ++++++++--
+ plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++
+ plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ff7a2d0f9..703a9686d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
+ libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
+-libsoup_dep = dependency('libsoup-2.4')
++if (libedataserver_dep.version().version_compare ('>=3.46'))
++    libsoup_dep = []
++    geocode_glib_dep = dependency('geocode-glib-2.0')
++    add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
++else
++    geocode_glib_dep = dependency('geocode-glib-1.0')
++    libsoup_dep = dependency('libsoup-2.4')
++endif
+ gmodule_dep = dependency('gmodule-2.0')
+ champlain_dep = dependency('champlain-0.12')
+ champlain_gtk_dep = dependency('champlain-gtk-0.12')
+ clutter_dep = dependency('clutter-1.0')
+ clutter_gtk_dep = dependency('clutter-gtk-1.0')
+ folks_dep = dependency('folks')
+-geocode_glib_dep = dependency('geocode-glib-1.0')
+ gclue_dep = dependency('libgeoclue-2.0')
+ libecal_dep = dependency('libecal-2.0')
+ libical_dep = dependency('libical-glib')
+diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala
+index e1f6fde53..e4f5e0f5c 100644
+--- a/plugins/CalDAV/CalDAVBackend.vala
++++ b/plugins/CalDAV/CalDAVBackend.vala
+@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+         collection.add (url_entry);
+         if (to_edit != null) {
+             E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
++#if HAS_EDS_3_46
++            var uri = webdav.dup_uri ();
++#else
+             var uri = webdav.dup_soup_uri ();
++#endif
+             if (uri.get_port () != 80) {
+                 ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
+             } else {
+@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+             foreach (var widget in widgets) {
+                 switch (widget.ref_name) {
+                     case "url_entry":
++#if HAS_EDS_3_46
++                        webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+                         webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+                         break;
+                     case "user_entry":
+                         auth.user = ((Gtk.Entry)widget.widget).text;
+@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+             foreach (var widget in widgets) {
+                 switch (widget.ref_name) {
+                     case "url_entry":
++#if HAS_EDS_3_46
++                        webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+                         webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+                         break;
+                     case "user_entry":
+                         auth.user = ((Gtk.Entry)widget.widget).text;
+diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala
+index 2f9fa3f2b..3f77bd13b 100644
+--- a/plugins/Google/GoogleBackend.vala
++++ b/plugins/Google/GoogleBackend.vala
+@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+                         }
+ 
+                         auth.user = decoded_user;
++#if HAS_EDS_3_46
++                        webdav.uri = GLib.Uri.build (
++                            GLib.UriFlags.NONE,
++                            "https",
++                            null,
++                            "www.google.com",
++                            -1,
++                            "/calendar/dav/%s/events".printf (decoded_user),
++                            null,
++                            null
++                        );
++#else
+                         var soup_uri = new Soup.URI (null);
+                         soup_uri.set_host ("www.google.com");
+                         soup_uri.set_scheme ("https");
+                         soup_uri.set_user (decoded_user);
+                         soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+                         webdav.soup_uri = soup_uri;
++#endif
+                         break;
+                     case "keep_copy":
+                         offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
+@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+                         }
+ 
+                         auth.user = decoded_user;
++#if HAS_EDS_3_46
++                        webdav.uri = GLib.Uri.build (
++                            GLib.UriFlags.NONE,
++                            "https",
++                            null,
++                            "www.google.com",
++                            -1,
++                            "/calendar/dav/%s/events".printf (decoded_user),
++                            null,
++                            null
++                        );
++#else
+                         var soup_uri = new Soup.URI (null);
+                         soup_uri.set_host ("www.google.com");
+                         soup_uri.set_scheme ("https");
+                         soup_uri.set_user (decoded_user);
+                         soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+                         webdav.soup_uri = soup_uri;
++#endif
+                         break;
+                     case "keep_copy":
+                         offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..fd37869876fa 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,20 +1,20 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
-version=6.1.0
-revision=2
+version=6.1.2
+revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
  glib-devel evolution-data-server-devel"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
  libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
 short_desc="Desktop calendar app designed for elementary OS"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calendar"
 distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
-checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
+checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31
 
 libio.elementary.calendar_package() {
 	short_desc+=" - library"
@@ -26,7 +26,7 @@ libio.elementary.calendar_package() {
 libio.elementary.calendar-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.calendar>=${version} evolution-data-server-devel
-	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup3-devel
 	 libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"

From ce8f570ebbf7335191247f07b6f6f51588e516d6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 022/114] evolution: update to 3.46.2.

---
 srcpkgs/evolution/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+revision=1
 build_style=cmake
 build_helper="qemu"
 configure_args="-DSYSCONF_INSTALL_DIR=/etc
  -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
  -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
- -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2"
+ -DENABLE_WEATHER=OFF -DWITH_ENCHANT_VERSION=2"
 hostmakedepends="intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
  evolution-data-server-devel gspell-devel libcanberra-devel
- libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel
- gnome-desktop-devel libsoup-devel cmark-devel"
+ libnotify-devel libwebkit2gtk41-devel ytnef-devel
+ gnome-desktop-devel libsoup3-devel cmark-devel"
 depends="gnome-keyring"
 short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f0b16e7abad3c7945a29c322f17dab4a08d61e99bd7cc91b8df35053c5c12e8c
+changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
+checksum=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 
 evolution-devel_package() {
-	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel
+	depends="libwebkit2gtk41-devel gtk+3-devel libglib-devel evolution-data-server-devel
 	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From d72414343f112e499ce67250c9740ab5d3c6a820 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 023/114] sushi: update to 43.0.

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

diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
 # Template file for 'sushi'
 pkgname=sushi
-version=42.0
+version=43.0
 revision=1
 build_helper="gir"
 build_style=meson
-hostmakedepends="glib-devel intltool pkg-config
+hostmakedepends="glib-devel gettext pkg-config
  $(vopt_if gir 'gobject-introspection') gjs"
 makedepends="clutter-gst3-devel clutter-gtk-devel evince-devel gjs-devel
- gtksourceview4-devel libmusicbrainz5-devel libsoup-gnome-devel webkit2gtk-devel"
+ gtksourceview4-devel libsoup3-devel libwebkit2gtk41-devel"
 depends="evince nautilus"
 short_desc="Quick image previewer over DBus for Nautilus"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
 lib32disabled=yes
 
 build_options="gir"

From 41d93012ff07f7081e17c482443d47ede67342f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 024/114] evolution-ews: update to 3.46.2.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,16 +1,16 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.44.4
+version=3.46.2
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
 hostmakedepends="cmake glib-devel intltool libmspack pkg-config"
-makedepends="evolution-devel libmspack-devel webkit2gtk-devel
- gnome-desktop-devel libsoup-devel"
+makedepends="evolution-devel libmspack-devel libwebkit2gtk41-devel
+ gnome-desktop-devel libsoup3-devel"
 short_desc="MS Exchange integration through Exchange Web Services"
 maintainer="Peter Kuchar <masaj@gmx.com>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41

From 3df21e73ead66f107f2bdeadb6a55fe6776e3828 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 025/114] folks: revbump for evolution-data-server 3.46

* fix tests
---
 srcpkgs/folks/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..e25bbf30105d 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,7 +1,7 @@
 # Template file for 'folks'
 pkgname=folks
 version=0.15.5
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Db_lto=false"
@@ -10,13 +10,15 @@ hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
 makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
  libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
 depends="zeitgeist"
+checkdepends="dbus bluez"
 short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
 changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
 checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
+make_check_pre="dbus-run-session"
 
 build_options="gir"
 build_options_default="gir"

From 25cd3475d1181ebbf607b68aa5b89eeb062a9f72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 026/114] gnome-control-center: update to 43.2.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..af6728cd45a1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=42.3
+version=43.2
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
 makedepends="ModemManager-devel accountsservice-devel alsa-plugins
  colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
  gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
 depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
  gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
 short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-control-center"
-changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
 make_check=no # needs X11 and requires altered filesystem
 
 pre_build() {

From c3bbca3075250962f1b5398daa2e4ba6ba2b9479 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 027/114] gdm: update to 43.0.

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
  gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
 checkdepends="check-devel"
 short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
 
 conf_files="
 	/etc/gdm/custom.conf

From 0dba649c031006443a6a75d18c536d36f4270dd2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 028/114] gnome-session: update to 43.0.

---
 srcpkgs/gnome-session/template | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,23 +1,18 @@
 # Template file for 'gnome-session'
 pkgname=gnome-session
-version=42.0
-revision=2
+version=43.0
+revision=1
 build_style=meson
 configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
-hostmakedepends="glib-devel intltool pkg-config xmlto"
+hostmakedepends="glib-devel gettext pkg-config xmlto"
 makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel
- libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel
- upower-devel xtrans"
-depends="dconf desktop-file-utils bash
- gsettings-desktop-schemas hicolor-icon-theme polkit"
+ libglib-devel libICE-devel libSM-devel xtrans"
+depends="dconf desktop-file-utils bash gsettings-desktop-schemas
+ hicolor-icon-theme polkit"
 short_desc="GNOME session management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-session"
-changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
-
-post_install() {
-	rm -rf ${DESTDIR}/tmp
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2

From 981c8a79be3afe15e53caf4c520828f1f0140890 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 029/114] gnome-settings-daemon: update to 43.0.

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=42.2
-revision=2
+version=43.0
+revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
  perl pkg-config"
-makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel
+makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr4-devel
  geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
 checkdepends="elogind libnotify python3-dbusmock python3-gobject
  python3-pycodestyle which hwids eudev"
 short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

From eb98287dc0501fc31935ec70ca4c9649a98fc74b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 030/114] budgie-control-center: revbump for gnome-desktop 43

---
 srcpkgs/budgie-control-center/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-control-center'
 pkgname=budgie-control-center
 version=1.1.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
  polkit python3 libxml2"

From 74b920330afd0ecec6ac142fa3cac81a4700094a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 031/114] budgie-screensaver: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
 version=5.1.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel

From 145b50706121bac2e84224aae6f9f632595de283 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 032/114] gnome-contacts: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
 build_style=meson
 hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
-makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-devel
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
  libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
 depends="desktop-file-utils"
 short_desc="GNOME contacts manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1

From 74acef2bc1f348da51ada43877fbca1995712d09 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 033/114] gnome-calendar: update to 43.1.

---
 srcpkgs/gnome-calendar/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,20 +1,21 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.1
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
  $(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
  gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
 short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calendar"
-changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
 
 build_options="gir"
 build_options_default="gir"

From d1a233991543cf7f479f980a2a095510eacd9548 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 034/114] evince: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=43.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)

From 1964ce8b8bb15704a1ccb7fec92d0359b8de5cd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 035/114] totem: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 0eb8af318ac2..b481d520e2a2 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
 # Template file for 'totem'
 pkgname=totem
 version=43.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Denable-python=no"

From 23299d0b7f33e372cf26d62b9f26dd4fc0d36154 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 036/114] xdg-desktop-portal-gnome: revbump for gnome-desktop
 43

---
 srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-desktop-portal-gnome'
 pkgname=xdg-desktop-portal-gnome
 version=43.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
 hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"

From 9c1608d1b925d5a14a00e0b1d7d8609501096686 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 037/114] eog: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
 # Template file for 'eog'
 pkgname=eog
 version=43.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 252e28c72416364d9e5cacf7fd98bb1827b75bb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 038/114] gnome-flashback: update to 3.46.0.

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

diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..bb4774a2c74d 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-flashback'
 pkgname=gnome-flashback
-version=3.44.0
+version=3.46.0
 revision=1
 build_helper=gir
 build_style=gnu-configure
@@ -9,16 +9,16 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
 makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
  pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
  libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
  gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
+depends="gnome-bluetooth gnome-session gnome-settings-daemon
  gnome-panel gnome-themes-extra metacity"
 short_desc="GNOME session with similar user experience to the GNOME 2.x series"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
+distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz"
+checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045
 
 post_extract() {
 	vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \

From 56e6fd9b8dbd125e84f4c390b4e0ca091bd0b540 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 039/114] gnome-screensaver: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"

From dd34c8e68bcc0465bad8655c21bc4e4501bf3995 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 040/114] cheese: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
 # Template file for 'cheese'
 pkgname=cheese
 version=43.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"

From 88dd1ab74c06366b82ddd3dbf6874347ea3ebcc5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 041/114] gnome-clocks: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
 version=43.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel vala

From 4af1accd8a6db4a54fb152f9d59839f5d180c998 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 042/114] brasero: don't build nautilus extension

doesn't work with nautilus 43
---
 srcpkgs/brasero/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.3
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
 depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ef23e938c286a6ee42a5a7550c891bd4f6dd7ad1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 043/114] evince: disable nautilus extension

* the extension doesn't support nautilus 43
---
 srcpkgs/evince/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
 # Template file for 'evince'
 pkgname=evince
 version=43.1
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
- -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled"
+ -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled
+ -Dnautilus=false"
 hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen)
  glib-devel itstool pkg-config perl-XML-Parser appstream-glib"
 # XXX missing packages for DVI backend.
 makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel
- libgxps-devel libsecret-devel libspectre-devel nautilus-devel
+ libgxps-devel libsecret-devel libspectre-devel
  poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Document viewer for multiple document formats"

From 1e52c576d9c59528e37a5dfdc709af698377e77a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 044/114] file-roller: update to 43.0.

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

diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..826a05a773a0 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,17 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=3.42.0
+version=43.0
 revision=1
 build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
+ gtk-update-icon-cache"
 makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GNOME Front-end to archiving programs like tar and zip"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/FileRoller"
 changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1

From 9c259b7db516832b4be308a8cef43d598ef7f148 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 045/114] gnome-mplayer: remove nautilus plugin

doesn't work with nautilus 43
---
 srcpkgs/gnome-mplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
  libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
 depends="mplayer desktop-file-utils hicolor-icon-theme"
 short_desc="Simple MPlayer GUI for GNOME"

From 9bbcfd9d5a0e645abc526bfbdae628b54bf6bbd2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 21:41:33 +0100
Subject: [PATCH 046/114] nautilus-python: update to 4.0.

---
 srcpkgs/nautilus-python/template | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index b65f4808f4f1..9c9c3393d172 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,25 +1,18 @@
 # Template file for 'nautilus-python'
 pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
+version=4.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="python3-gobject-devel nautilus-devel"
 depends="nautilus python3-gobject"
 short_desc="Python bindings for the Nautilus extension framework"
 maintainer="Nafis <mnabid.25@outlook.com>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
+distfiles="${GNOME_SITE}/nautilus-python/${version}/nautilus-python-${version}.tar.xz"
+checksum=17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
 
 build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
-	build_options_default="gtk_doc"
-fi
+build_options_default="gtk_doc"

From ebf75062b12a93b644dd08e3df7371662ad2fb12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:01:11 +0100
Subject: [PATCH 047/114] dropbox: update to 2022.12.05.

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

diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
index 7b73816c3c5c..aebb8a34a72f 100644
--- a/srcpkgs/dropbox/template
+++ b/srcpkgs/dropbox/template
@@ -1,19 +1,22 @@
 # Template file for 'dropbox'
 pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
+version=2022.12.05
+revision=1
+_commit=8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
+hostmakedepends="pkg-config gnome-common libtool python3-gobject python3-docutils gdk-pixbuf-devel"
 makedepends="nautilus-devel python3-devel python3-gobject-devel"
 depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
 short_desc="Dropbox file sharing"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
+distfiles="https://github.com/dropbox/nautilus-dropbox/archive/8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3.tar.gz"
+checksum=e6018254963314b63e81b2ab6f936b48e439ba256ad93b5d447fb8e75c20c2ab
+
+do_configure() {
+	./autogen.sh ${configure_args} --disable-static
+}
 
 nautilus-dropbox_package() {
 	short_desc="Dropbox nautilus plugin"

From b59e151a2e5cc5d493343c4977365f16645bf10b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:09:52 +0100
Subject: [PATCH 048/114] seahorse-nautilus: update to 3.11.92.2022.10.9.

---
 .../patches/fix-desktop-files.patch           | 56 -------------------
 .../seahorse-nautilus/patches/locale.patch    | 12 ----
 .../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
 .../patches/remove-unused-gnome-keyring.patch | 18 ------
 srcpkgs/seahorse-nautilus/template            | 21 +++----
 5 files changed, 8 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
 delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch

diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in      | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
- 
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
- 
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
- 
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- 	DO_CHECK=$enableval, DO_CHECK=yes)
- 
- if test	"$DO_CHECK" = "yes"; then
--	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- 	ok="no"
- 	if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
- 
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
- 
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index d80a1258aeae..fa20d6134565 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,22 +1,17 @@
 # Template file for 'seahorse-nautilus'
 pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
+version=3.11.92.2022.10.9
+revision=1
+_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd
+build_style=meson
+hostmakedepends="pkg-config gettext gnupg glib-devel"
 makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
+ gpgme-devel libcryptui-devel gcr-devel"
 depends="gnupg desktop-file-utils"
 short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
+distfiles="https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/${_commit}/seahorse-nautilus-${_commit}.tar.gz"
+checksum=8f82b1ffef1a38e1b6d40fb463428037e881ff1e5c88292b24afd436ba6740af
 lib32disabled=yes
-
-pre_configure() {
-	autoreconf -fi
-}

From 8d0c13544a25f6960d78e335735a767bd0eb6eeb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 049/114] gnome-online-accounts: update to 3.46.0.

---
 srcpkgs/gnome-online-accounts/template | 27 +++++++++++---------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index fa21b95b7434..413a971ed87e 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,27 +1,22 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
-version=3.44.0
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+build_style=meson
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)
- --enable-documentation --enable-backend
- --enable-google --enable-kerberos --enable-flickr
- --enable-facebook --disable-static --enable-exchange  --enable-imap-smtp
- --enable-owncloud --enable-windows-live
- --enable-lastfm --enable-media-server"
-hostmakedepends="docbook-xsl gettext glib-devel
- libxslt pkg-config $(vopt_if gir vala)"
-makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
- libsoup-devel mit-krb5-devel rest0-devel telepathy-glib-devel webkit2gtk-devel"
+configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi)
+ -Dmedia_server=true -Dman=true"
+hostmakedepends="pkg-config gettext glib-devel docbook-xsl libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
 depends="hicolor-icon-theme"
 short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
 
 build_options="gir"
 build_options_default="gir"

From 3109e3a2aae836a72fa581674c960e9e313d2b79 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 050/114] gnome-console: update to 43.0.

console nautilus plugin is now included in nautilus
---
 srcpkgs/gnome-console/template | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 100644
--- a/srcpkgs/gnome-console/template
+++ b/srcpkgs/gnome-console/template
@@ -1,26 +1,23 @@
 # Template file for 'gnome-console'
 pkgname=gnome-console
-version=42.2
+version=43.0
 revision=1
 build_style=meson
-configure_args="-Dnautilus=enabled"
-hostmakedepends="pkg-config desktop-file-utils gettext sassc
+hostmakedepends="pkg-config desktop-file-utils gettext
  gobject-introspection glib-devel gtk-update-icon-cache"
-makedepends="libhandy1-devel vte3-devel libgtop-devel nautilus-devel
+makedepends="libadwaita-devel vte3-gtk4-devel libgtop-devel
  gsettings-desktop-schemas-devel pcre2-devel"
 depends="gsettings-desktop-schemas"
 short_desc="Simple user-friendly terminal emulator for the GNOME desktop"
-maintainer="oreo639 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/console"
-changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049
+changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-console/${version%.*}/gnome-console-${version}.tar.xz"
+checksum=b9642485a37a70e82cc10553b0e2681756ba361ff5e4cbf3182f150231fea99e
 
 nautilus-gnome-console-extension_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
-		short_desc+=" - nautilus integration"
-		pkg_install() {
-			vmove usr/lib/nautilus/extensions-3.0
-		}
+	short_desc+=" - transitional package"
+	build_style=meta
 }

From 7032f4148a49a23c0579213ff6ac9cfb1eeac894 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 051/114] libgweather: update to 4.2.0.

---
 srcpkgs/libgweather/patches/cross.patch       | 21 ++++++++
 .../patches/fix-cross-introspection.patch     | 14 -----
 ...metar-test-dont-use-known-duplicates.patch | 51 -------------------
 srcpkgs/libgweather/template                  | 15 +++---
 4 files changed, 29 insertions(+), 72 deletions(-)
 create mode 100644 srcpkgs/libgweather/patches/cross.patch
 delete mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch
 delete mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch

diff --git a/srcpkgs/libgweather/patches/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+ 
+ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
+-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
++build_gir = get_option('introspection') and g_ir_scanner.found()
+ build_docs = get_option('gtk_doc') and build_gir
+ 
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+   dependency('gi-docgen', version: '>= 2021.6',
+     fallback: ['gi-docgen', 'dummy_dep'],
++    native: true,
+   )
+ 
+   gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- a/srcpkgs/libgweather/patches/fix-cross-introspection.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 08311af4..ef554f2e 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4',
- )
- 
- g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
--build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
-+build_gir = get_option('introspection') and g_ir_scanner.found()
- 
- enable_vala = get_option('enable_vala')
- vapigen = find_program('vapigen', required: enable_vala == 'true')
-
diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
deleted file mode 100644
index 5646cd24cc21..000000000000
--- a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001
-From: Pierre Labastie <pierre.labastie@neuf.fr>
-Date: Sun, 10 Apr 2022 22:24:47 +0200
-Subject: [PATCH] metar test: Don't use "known" duplicates
-
-The metar list provided by NOAA contains duplicate ICAO codes.
-Those duplicates may change over time, so it does not make sense
-to use an array of known duplicates. Presently a duplicate is rejected
-when it is known, and inserted if it is not, leading to  a difference
-in the number of insertions and the number of keys, so that the test
-fails. If any duplicate is rejected, the number of insertions is
-always equal to the number of keys (unless something goes wrong
-in g_hash_table_insert). And this is the default behavior for known
-duplicates anyway.
-
-Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168
----
- libgweather/tests/metar.c | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c
-index 7d6c7c04..a6fa7e79 100644
---- a/libgweather/tests/metar.c
-+++ b/libgweather/tests/metar.c
-@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents)
-             continue;
-         }
- 
-+        /* If it is a duplicate discard it */
-         if (g_hash_table_lookup (stations_ht, station)) {
--            const char * const known_duplicates[] = {
--                "VOGO",
--                "KHQG",
--                "KOEL",
--                "KTQK",
--                "KX26",
--                NULL
--            };
--            if (g_strv_contains (known_duplicates, station)) {
--                g_free (station);
--                continue;
--            }
-             g_test_message ("Weather station '%s' already defined\n", station);
-+            g_free (station);
-+            continue;
-         }
- 
-         g_hash_table_insert (stations_ht, station, g_strdup (line));
--- 
-GitLab
-
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index b4fcfcb12563..fdcdffd1c355 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,22 +1,23 @@
 # Template file for 'libgweather'
 pkgname=libgweather
 reverts="40.0_1"
-version=4.0.0
-revision=3
+version=4.2.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
 depends="tzdata"
 short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 216083d3130e0ce3d77442ed5575636fa2b2cacb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 052/114] geary: update to 43.0.

---
 srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
 srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
 srcpkgs/geary/template                 | 15 +++++-----
 3 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 srcpkgs/geary/patches/vala-0.56a.patch
 delete mode 100644 srcpkgs/geary/patches/vala-0.56b.patch

diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch
deleted file mode 100644
index df2c3902db14..000000000000
--- a/srcpkgs/geary/patches/vala-0.56a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sun, 30 Jan 2022 19:54:11 +0100
-Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
-
----
- src/client/util/util-cache.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
-index f054e32e5..ecc275e84 100644
---- a/src/client/util/util-cache.vala
-+++ b/src/client/util/util-cache.vala
-@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
-     private class CacheEntry<T> {
- 
- 
--        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
-+        public static int lru_compare(CacheEntry a, CacheEntry b) {
-             if (a.key == b.key) {
-                 return 0;
-             }
--- 
-GitLab
-
diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch
deleted file mode 100644
index 2d071a133751..000000000000
--- a/srcpkgs/geary/patches/vala-0.56b.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 30 Nov 2021 15:31:31 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/client/application/application-client.vala | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
-index 6ce19ce2a..e6ba85331 100644
---- a/src/client/application/application-client.vala
-+++ b/src/client/application/application-client.vala
-@@ -8,16 +8,16 @@
- 
- // Defined by CMake build script.
- extern const string GETTEXT_PACKAGE;
--extern const string _APP_ID;
--extern const string _BUILD_ROOT_DIR;
--extern const string _GSETTINGS_DIR;
--extern const string _INSTALL_PREFIX;
--extern const string _NAME_SUFFIX;
-+public extern const string _APP_ID;
-+public extern const string _BUILD_ROOT_DIR;
-+public extern const string _GSETTINGS_DIR;
-+public extern const string _INSTALL_PREFIX;
-+public extern const string _NAME_SUFFIX;
- extern const string _PLUGINS_DIR;
- extern const string _PROFILE;
- extern const string _REVNO;
--extern const string _SOURCE_ROOT_DIR;
--extern const string _VERSION;
-+public extern const string _SOURCE_ROOT_DIR;
-+public extern const string _VERSION;
- extern const string _WEB_EXTENSIONS_DIR;
- 
- 
--- 
-GitLab
-
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index e1360898bfdc..4be416e38a48 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,14 +1,14 @@
 # Template file for 'geary'
 pkgname=geary
-version=40.0
-revision=5
+version=43.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="-Dprofile=release -Dcontractor=enabled"
 hostmakedepends="desktop-file-utils iso-codes pkg-config itstool
- gobject-introspection vala glib-devel gettext"
-makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel
- libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+makedepends="enchant2-devel gcr-devel gmime3-devel libsoup3-devel libglib-devel
+ libgee08-devel libsecret-devel libwebkit2gtk41-devel libxml2-devel
  gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel
  folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel
  libpeas-devel gsound-devel libstemmer-devel"
@@ -17,8 +17,9 @@ short_desc="Lightweight email program for the GNOME desktop"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Geary"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
-checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
+changelog="https://gitlab.gnome.org/GNOME/geary/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/geary/${version%.*}/geary-${version}.tar.xz"
+checksum=489166f87dd9d29011f5e5b79694f2588b473f7e191c59ce9013c8c8e0e363e7
 make_check=no # tests fail with a webkit process crash
 
 post_patch() {

From 37905f7cb4195d8cecdf0d9b5837fee31783d056 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 053/114] gnome-initial-setup: update to 43.2.

---
 srcpkgs/gnome-initial-setup/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
 makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
  gnome-online-accounts-devel gdm-devel libpwquality-devel
  mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
 depends="iso-codes"
 short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
 changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698

From 2f0f83b685e93c54dfb4db02d365081369c1bd2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 054/114] grilo-plugins: disable goa

---
 srcpkgs/grilo-plugins/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..8fbcaeb4fed8 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,14 +1,15 @@
 # Template file for 'grilo-plugins'
 pkgname=grilo-plugins
 version=0.3.14
-revision=2
+revision=3
 build_style=meson
-hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
+configure_args="-Dgoa=disabled"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
 # XXX missing plugins: fakemetadata.
 makedepends="grilo-devel gom-devel json-glib-devel
  libquvi-devel rest0-devel sqlite-devel libgcrypt-devel
- tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
- gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
+ tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
+ gstreamer1-devel libdmapsharing-devel lua53-devel
  avahi-glib-libs-devel"
 checkdepends="python3-gobject gst-plugins-bad1 dbus"
 short_desc="Plugins for Grilo"

From 2a9cb7ceaa5f404a9437d2bee2b0d8666e3054cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 055/114] gsettings-desktop-schemas: update to 43.0.

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

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="gettext pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
 
 # Package build options
 build_options="gir"

From 29f1f5970fc2b2cf64a1ef923e2feca98b4ad06e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 056/114] GPaste: update to 43.0.

---
 srcpkgs/GPaste/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..80485cb88440 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,23 +1,25 @@
 # Template file for 'GPaste'
 pkgname=GPaste
-version=42.1
+version=43.0
 revision=1
 build_helper="gir"
 build_style=meson
 configure_args="$(vopt_bool gnome_shell gnome-shell)
  -Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
- -Dsystemd-user-unit-dir=/usr/lib/systemd"
-hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
+ -Dsystemd-user-unit-dir=/usr/lib/systemd/user"
+hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
+ desktop-file-utils"
 makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
  libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
 short_desc="Clipboard management system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
 distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
 
 build_options="gnome_shell"
 desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +30,7 @@ post_install() {
 }
 
 GPaste-devel_package() {
-	depends="libgpaste-${version}_${revision}"
+	depends="libgpaste>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 3a6326e02f2a5580beb94c3e4384f93adde21efa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 057/114] gnome-terminal: update to 3.46.7.

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
 revision=1
 build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
 makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
  nautilus-devel vte3-devel"
 depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 		short_desc+=" - nautilus integration"
 		pkg_install() {
-			vmove usr/lib/nautilus/extensions-3.0
+			vmove usr/lib/nautilus/extensions-4
 		}
 }

From cb98691a7ecbd2a788587243f1887b994d896850 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 058/114] gnome-user-docs: update to 43.0.

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

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=42.0
+version=43.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
 makedepends="yelp"
 depends="yelp"
 short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="CC-BY-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee

From 72d088fcabb182f888e69713c407615e83564ccd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 059/114] gnome-font-viewer: update to 43.0.

---
 srcpkgs/gnome-font-viewer/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-font-viewer'
 pkgname=gnome-font-viewer
-version=42.0
+version=43.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
  gnome-desktop-devel harfbuzz-devel libadwaita-devel"
 depends="desktop-file-utils"
 short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9

From c780ca57a7f784d9f24d97edeb3cf2efec673e27 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 060/114] orca: update to 43.0.

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

diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
 # Template file for 'orca'
 pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext itstool pkg-config"
 makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-gobject-devel"

From 93e5257b7ac9a723b0da2f68c17a9fe4b4509063 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 061/114] freerdp: update to 2.9.0.

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

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..53e67690f863 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
  -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
 CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in

From 7e560cfa740b746b7ab79ef723f7bc12d2af4766 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 062/114] gnome-remote-desktop: update to 43.2.

---
 .../patches/remove-systemd-dep.patch          | 26 -------------------
 srcpkgs/gnome-remote-desktop/template         | 10 +++----
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch

diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
- 
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
--  if servicedir == ''
--    servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
--  endif
--
--  if servicedir == ''
--    error('Couldn\'t determine systemd user unit service directory')
--  endif
--endif
- 
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
 # Template file for 'gnome-remote-desktop'
 pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
 revision=1
 build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
  -Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
 makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
  freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
 short_desc="GNOME remote desktop server"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
 distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
 make_check=no # xvfb failed to start

From e3836c44e23bc36f3d109d389d507fd48a341908 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 063/114] devhelp: update to 43.0.

---
 srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
 srcpkgs/devhelp/template                 | 13 ++++---
 2 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch

diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build                 | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
--  appdata,
-   input: configure_file(
-     input: 'org.gnome.Devhelp.appdata.xml.in.in',
-     output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
- 
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
--  plugin_info_file,
-   type: 'desktop',
-   input: plugin_info_file + '.desktop.in',
-   output: plugin_info_file,
--- 
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..7c641946341a 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
 # Template file for 'devhelp'
 pkgname=devhelp
-version=41.2
+version=43.0
 revision=1
 build_helper="gir"
 build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
 short_desc="API documentation browser for GTK+ and GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
 replaces="devhelp-gedit-plugin<=40.0_1"
 
 devhelp-devel_package() {
 	short_desc+=" - development files"
-	depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+	depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
 	 devhelp-libs>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include

From 6d3e0af1a8a08b260431940eff49d389a7b87f3c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 064/114] sysprof: update to 3.46.0.

---
 common/shlibs            |  2 +-
 srcpkgs/sysprof/template | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2cb86c210f0a..b8c2ae161e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ libunbound.so.8 libunbound-1.13.1_2
 libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
 libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..0a40abfb42b7 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,20 @@
 # Template file for 'sysprof'
 pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
 revision=2
 build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+ json-glib-devel libunwind-devel libadwaita-devel"
 short_desc="System-wide profiler for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/sysprof"
 changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
 
 # for ITS rules
 if [ "$CROSS_BUILD" ]; then

From 123ea2bec8b82261237f42a81114fa6ad06db626 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 065/114] gnome-builder: update to 43.4.

---
 srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
 short_desc="IDE for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"
 	LIBS="-lexecinfo"
 fi
-
-do_check() {
-	xvfb-run ninja -C build test
-}

From 0285d241c002784bcb858d9f4969386f165545b1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 066/114] zenity: update to 3.43.0.

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

diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
 # Template file for 'zenity'
 pkgname=zenity
-version=3.42.1
+version=3.43.0
 revision=1
 build_style=meson
 configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
 hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
 short_desc="Display GNOME dialogs from the command line"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://help.gnome.org/users/zenity/"
 changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
 
 build_options="webkit"
 build_options_default="webkit"

From 8e5879fd846216d9201135305aa3d22dfe6a2772 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 067/114] gnome-core: update to 43.0.

---
 srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome-core'
 pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
@@ -14,24 +14,24 @@ depends="
  at-spi2-atk>=2.38.0
  cantarell-fonts>=0.301
  dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
  font-adobe-source-code-pro>=2.030R
  gcr>=3.41.0
  gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
  gmime>=3.2.7
  gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
  gnome-color-manager>=3.36.0
  gnome-control-center>=${version}
  gnome-desktop>=${version}
  gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
  gnome-session>=${version}
  gnome-settings-daemon>=${version}
  gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
  gvfs>=1.50.0
  mutter>=${version}
  nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
  xdg-desktop-portal-gnome>=${version}
  zenity>=3.${version}"

From 6b71071543d16f22f793e163be1f2b01f0a64c6a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 068/114] gnome: update to 43.0.

* replace gnome-terminal with gnome-console
---
 srcpkgs/gnome/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
 depends="
  gnome-core>=${version}
  baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
  eog>=${version}
  evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
  gnome-calculator>=${version}
  gnome-calendar>=${version}
  gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
  gnome-disk-utility>=${version}
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
  gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
  gnome-text-editor>=${version}
  gnome-tweaks>=42.beta
  gnome-weather>=${version}
  gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
  mousetweaks>=3.32.0
  orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
  totem>=${version}"
 
 _apps_depends="
  Endeavour>=${version}
  bijiben>=40.1
  dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
  epiphany>=${version}
  evolution>=3.44.0
  ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
  gnome-disk-utility>=${version}
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
  gnome-nettool>=${version}
  gnome-photos>=${version}
  gnome-screenshot>=41.0
  gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
  gnome-text-editor>=${version}
  gnote>=${version}
  polari>=3.38.0

From 9b46e5aa2a5a327a8828e2ed5309e0cbadd78fb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 23 Dec 2022 13:49:15 +0100
Subject: [PATCH 069/114] android-tools: update to 33.0.3p2.

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

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 2707f5f0f1a3..f24415ad022c 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=33.0.3p1
+version=33.0.3p2
 revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=be2047cf256051674af5aeb4bbfed276989512f80d1191e2864c919061f961d8
+checksum=6bf6b52d7389e79fc92b63cc206451ee42fc4f7da769d76922193e98d75f5604
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 5bac946d9c32c5acaf8464039b35df5f5ea753c5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:10:30 +0100
Subject: [PATCH 070/114] xorg-server: update to 21.1.6.

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

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06d50aadbf62..b0f87841ae16 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=21.1.5
+version=21.1.6
 revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -24,7 +24,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720
+checksum=1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-25_1 xf86-video-modesetting-1_1"

From 722fa6f4377776dbc9b5aacaa6d5b8d2eb23e71c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:14:31 +0100
Subject: [PATCH 071/114] miller: update to 6.6.0.

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

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 2c179e73a2a5..5d44be21c7fd 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,6 +1,6 @@
 # Template file for 'miller'
 pkgname=miller
-version=6.5.0
+version=6.6.0
 revision=1
 build_style=go
 go_import_path="github.com/johnkerl/miller"
@@ -11,7 +11,7 @@ license="BSD-2-Clause"
 homepage="http://johnkerl.org/miller/"
 changelog="https://github.com/johnkerl/miller/releases"
 distfiles="https://github.com/johnkerl/miller/releases/download/v${version}/miller-${version}.tar.gz"
-checksum=682f1583863ab0f1bfabf713e0e66f2ff656da96a0eab2b58ab9a7e933f46cc9
+checksum=943616a95989fbb8ea7ca47625391b8a86fd009a041eff3636e50443fea05406
 
 post_install() {
 	vman man/mlr.1

From 6eaea7df79aec52bc15115cc2346f9dbd2ae2bd1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:17:15 +0100
Subject: [PATCH 072/114] ipset: update to 7.17.

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

diff --git a/srcpkgs/ipset/template b/srcpkgs/ipset/template
index 488ca06cf5e2..75cc4e672158 100644
--- a/srcpkgs/ipset/template
+++ b/srcpkgs/ipset/template
@@ -1,6 +1,6 @@
 # Template file for 'ipset'
 pkgname=ipset
-version=7.16
+version=7.17
 revision=1
 build_style=gnu-configure
 configure_args="--with-kmod=no PKG_CONFIG=pkg-config"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://ipset.netfilter.org/"
 changelog="https://ipset.netfilter.org/changelog.html"
 distfiles="https://ipset.netfilter.org/ipset-${version}.tar.bz2"
-checksum=87b1d9cdf4a1de3d1d0671e7da33e111eb65087e65ad75268b22bf13f0f296d0
+checksum=be49c9ff489dd6610cad6541e743c3384eac96e9f24707da7b3929d8f2ac64d8
 
 libipset_package() {
 	short_desc+=" - library files"

From a350c9217dc167b1306339ed05a737a139a00c63 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:18:20 +0100
Subject: [PATCH 073/114] libcbor: update to 0.10.1.

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

diff --git a/common/shlibs b/common/shlibs
index b8c2ae161e9c..84c17ee8926a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3897,7 +3897,7 @@ libmpir.so.23 mpir-3.0.0_1
 libmpirxx.so.8 mpir-3.0.0_1
 libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
-libcbor.so.0.9 libcbor-0.9.0_1
+libcbor.so.0.10 libcbor-0.10.1_1
 libfido2.so.1 libfido2-1.6.0_2
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libcbor/template b/srcpkgs/libcbor/template
index 82b413e6202d..a4f27d8bb9b3 100644
--- a/srcpkgs/libcbor/template
+++ b/srcpkgs/libcbor/template
@@ -1,6 +1,6 @@
 # Template file for 'libcbor'
 pkgname=libcbor
-version=0.9.0
+version=0.10.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/PJK/libcbor"
 distfiles="https://github.com/PJK/libcbor/archive/v${version}.tar.gz"
-checksum=da81e4f9333e0086d4e2745183c7052f04ecc4dbcffcf910029df24f103c15d1
+checksum=e8fa0a726b18861c24428561c80b3c95aca95f468df4e2f3e3ac618be12d3047
 
 post_install() {
 	vlicense LICENSE.md

From 5086d7474e994a99d6ec4cbf38dade6123684ec8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:21:22 +0100
Subject: [PATCH 074/114] libfido2: rebuild for libcbor-0.10.1.

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

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index bb68556787ef..3d3a9623412c 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,7 +1,7 @@
 # Template file for 'libfido2'
 pkgname=libfido2
 version=1.12.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
 hostmakedepends="pkg-config"

From 4c03939984dde1bf8ec8611b88fc85d511667287 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:24:27 +0100
Subject: [PATCH 075/114] python: update to 2.7.18.6.

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

diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 170067aad2ef..a1abf2c8772c 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
 #
 pkgname=python
-version=2.7.18.5
+version=2.7.18.6
 revision=1
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=e5e80ae00e20994150f2acfe4acfc541cbe6e4e77d334e1e7f9f33f303ab89ba
+checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
 
 alternatives="
  python:idle:/usr/bin/idle2.7

From 8fb59d1d618943ab6e16654d002f2c260d83a82e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 Jan 2023 14:24:33 +0100
Subject: [PATCH 076/114] python-tkinter: update to 2.7.18.6.

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

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 833087c20c7b..274efb18c7ac 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -7,7 +7,7 @@
 _desc="Interpreted, interactive, object-oriented programming language"
 
 pkgname=python-tkinter
-version=2.7.18.5
+version=2.7.18.6
 revision=1
 pycompile_dirs="usr/lib/python2.7/lib-tk"
 hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=3a829df9331f9b8d827553df92256533da51622aab013452b0b56731d17c53d6
+checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
 
 pre_configure() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.

From 0fbb109d9d38102ddc4ca04c5ce7e751c4edc954 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 1 Jan 2023 23:19:14 -0500
Subject: [PATCH 077/114] just: update to 1.10.0

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

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 08c06c4b068c..611737ee5a2f 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.9.0
+version=1.10.0
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz"
-checksum=3f2a2cd532dffd978ea28817a909b3ccbe09837380f014eed615ec8557302cec
+checksum=a64fdfc1b1797571a9871746d90ed63d5826eff8aebd6c36ccbc5319ae5265e5
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From bceeb0b206aefec88e494a09f7b6d23abb96a028 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 13:14:18 +0100
Subject: [PATCH 078/114] perl-Test-Fatal: update to 0.017

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

diff --git a/srcpkgs/perl-Test-Fatal/template b/srcpkgs/perl-Test-Fatal/template
index a8a99e015319..50f8c832f420 100644
--- a/srcpkgs/perl-Test-Fatal/template
+++ b/srcpkgs/perl-Test-Fatal/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Test-Fatal'
 pkgname=perl-Test-Fatal
-version=0.016
-revision=2
+version=0.017
+revision=1
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="perl perl-Try-Tiny"
@@ -11,4 +11,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Test-Fatal"
 distfiles="${CPAN_SITE}/Test/${pkgname/perl-/}-$version.tar.gz"
-checksum=7283d430f2ba2030b8cd979ae3039d3f1b2ec3dde1a11ca6ae09f992a66f788f
+checksum=37dfffdafb84b762efe96b02fb2aa41f37026c73e6b83590db76229697f3c4a6

From 412f2f738095d7c171af3483a7125933f3c06318 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 26 Dec 2022 21:33:32 +0530
Subject: [PATCH 079/114] usbutils: update to 015.

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

diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index 4c7f552a3fe0..0990ce387008 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -1,7 +1,7 @@
 # Template file for 'usbutils'
 pkgname=usbutils
-version=014
-revision=2
+version=015
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/hwdata --disable-zlib"
 hostmakedepends="automake libtool pkg-config"
@@ -13,14 +13,10 @@ license="GPL-2.0-only"
 homepage="https://github.com/gregkh/usbutils"
 changelog="https://raw.githubusercontent.com/gregkh/usbutils/master/NEWS"
 distfiles="${KERNEL_SITE}/utils/usb/usbutils/usbutils-${version}.tar.xz"
-checksum=3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69
+checksum=c3b451bb1f4ff9f6356cac5a6956a9ac8e85d81651af56a29e689f94fa6fda6e
 replaces="usbhid-dump<=1.4_1"
 
 post_install() {
 	# Remove lsusb.py - avoid useless python scripts
 	rm -f ${DESTDIR}/usr/bin/lsusb.py
-	# Remove usb ids - provided by hwids
-	rm -rf ${DESTDIR}/usr/share/hwdata
-	# Remove update-usbids.sh - handled by hwids
-	rm -f ${DESTDIR}/usr/sbin/update-usbids.sh
 }

From bb0d2b524ac116ff3a96b28aff4fce196ff2b1b8 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 28 Dec 2022 02:44:46 +0300
Subject: [PATCH 080/114] New package: ipsvd

---
 srcpkgs/ipsvd/patches/cross.patch | 47 +++++++++++++++++++++++++++++++
 srcpkgs/ipsvd/template            | 40 ++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 srcpkgs/ipsvd/patches/cross.patch
 create mode 100644 srcpkgs/ipsvd/template

diff --git a/srcpkgs/ipsvd/patches/cross.patch b/srcpkgs/ipsvd/patches/cross.patch
new file mode 100644
index 000000000000..3e729cf44315
--- /dev/null
+++ b/srcpkgs/ipsvd/patches/cross.patch
@@ -0,0 +1,47 @@
+chskshsgr must be built for the host.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -194,17 +194,22 @@
+ case_diffb.o: case.h case_diffb.c compile
+ 	./compile case_diffb.c
+ 
+-chkshsgr: chkshsgr.o load
+-	./load chkshsgr
++chkshsgr: chkshsgr.o loadhost
++	./loadhost chkshsgr
+ 
+-chkshsgr.o: chkshsgr.c compile
+-	./compile chkshsgr.c
++chkshsgr.o: chkshsgr.c compilehost
++	./compilehost chkshsgr.c
+ 
+ choose: choose.sh warn-auto.sh
+ 	rm -f choose
+ 	cat warn-auto.sh choose.sh >choose
+ 	chmod 555 choose
+ 
++compilehost:
++	cat warn-auto.sh > compilehost
++	@echo 'exec cc -c $${1+"$$@"}' >> compilehost
++	chmod 555 compilehost
++
+ coe.o: coe.c coe.h compile
+ 	./compile coe.c
+ 
+@@ -351,6 +356,15 @@
+ 	sh print-ld.sh >load
+ 	chmod 555 load
+ 
++loadhost:
++	rm -f loadhost
++	@echo > loadhost
++	@echo 'systype="`cat systype`"' >> loadhost
++	@echo 'cat warn-auto.sh' >> loadhost
++	@echo 'main="$$1"; shift' >> loadhost
++	@echo 'exec cc -o "$$main" "$$main".o $${1+"$$@"}' >> loadhost
++	chmod 555 loadhost
++
+ lock_ex.o: compile hasflock.h lock.h lock_ex.c
+ 	./compile lock_ex.c
+ 
diff --git a/srcpkgs/ipsvd/template b/srcpkgs/ipsvd/template
new file mode 100644
index 000000000000..c1e118fb4c40
--- /dev/null
+++ b/srcpkgs/ipsvd/template
@@ -0,0 +1,40 @@
+# Template file for 'ipsvd'
+pkgname=ipsvd
+version=1.0.0
+revision=1
+build_wrksrc="${pkgname}-${version}"
+short_desc="Set of internet protocol service daemons for Unix"
+maintainer="Krul Ceter <kruceter@proton.me>"
+license="BSD-3-Clause"
+homepage="http://smarden.org/ipsvd"
+distfiles="http://smarden.org/ipsvd/ipsvd-${version}.tar.gz"
+checksum=ef7a725bc85acb5d09ab57658385bb470b3e4da5a4ffc88b5da6c6bd37d01fad
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+do_configure() {
+	echo "$CC $CFLAGS" > src/conf-cc
+	echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" > src/conf-ld
+}
+
+do_build() {
+	package/compile
+}
+
+do_install() {
+	# sslio and sslsvd are not compiled (matrixssl is required).
+	rm -r man/{sslio,sslsvd}* doc/{sslio,sslsvd}*
+
+	for bin in command/*; do
+		vbin "$bin";
+	done
+
+	for man in man/*; do
+		vman "$man";
+	done
+
+	for doc in doc/*; do
+		vdoc "$doc";
+	done
+
+	vlicense package/COPYING
+}

From 7e9958f2eb3a3ed17d17dab6900d20a29acb6314 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Wed, 28 Dec 2022 23:54:09 +0300
Subject: [PATCH 081/114] New package: socklog-ucspi

---
 .../socklog-ucspi/files/socklog-ucspi-tcp/log/run  |  3 +++
 srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run  |  5 +++++
 srcpkgs/socklog-ucspi/template                     | 14 ++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
 create mode 100644 srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
 create mode 100644 srcpkgs/socklog-ucspi/template

diff --git a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
new file mode 100644
index 000000000000..acfadabea4d8
--- /dev/null
+++ b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec vlogger -p daemon -t socklog-ucspi-tcp
diff --git a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
new file mode 100644
index 000000000000..fd750fe9a45e
--- /dev/null
+++ b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+
+exec tcpsvd -vllogserver -u nobody ${HOST:-0} ${PORT:-10116} socklog ucspi TCPREMOTEIP
diff --git a/srcpkgs/socklog-ucspi/template b/srcpkgs/socklog-ucspi/template
new file mode 100644
index 000000000000..6fa8a209f0dc
--- /dev/null
+++ b/srcpkgs/socklog-ucspi/template
@@ -0,0 +1,14 @@
+# Template file for 'socklog-ucspi'
+pkgname=socklog-ucspi
+version=20221228
+revision=1
+build_style=meta
+depends="socklog ipsvd"
+short_desc="UCSPI-TCP services for socklog"
+maintainer="Krul Ceter <kruceter@proton.me>"
+license="Public Domain"
+homepage="http://smarden.org/socklog"
+
+do_install() {
+	vsv socklog-ucspi-tcp
+}

From 2c0b8d659cb8f8e18ddba61d9d3c06951d66b315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 2 Jan 2023 13:59:53 +0100
Subject: [PATCH 082/114] SLADE: update to 3.2.1.

---
 srcpkgs/SLADE/patches/pointer-decay.patch    | 29 -----------
 srcpkgs/SLADE/patches/signed....patch        | 20 ++++++++
 srcpkgs/SLADE/patches/system-libraries.patch | 53 ++++++++++++++++----
 srcpkgs/SLADE/template                       |  4 +-
 4 files changed, 64 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/SLADE/patches/pointer-decay.patch
 create mode 100644 srcpkgs/SLADE/patches/signed....patch

diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch
deleted file mode 100644
index 7719471b03f6..000000000000
--- a/srcpkgs/SLADE/patches/pointer-decay.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/External/sol/sol.hpp
-+++ b/src/External/sol/sol.hpp
-@@ -6818,7 +6818,7 @@
- 			}
- 
- 			static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) {
--				return stack::push<const wchar_t*>(L, str, str + sz);
-+				return stack::push<const wchar_t*>(L, str + 0, str + sz);
- 			}
- 		};
- 
-@@ -6829,7 +6829,7 @@
- 			}
- 
- 			static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) {
--				return stack::push<const char16_t*>(L, str, str + sz);
-+				return stack::push<const char16_t*>(L, str + 0, str + sz);
- 			}
- 		};
- 
-@@ -6840,7 +6840,7 @@
- 			}
- 
- 			static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) {
--				return stack::push<const char32_t*>(L, str, str + sz);
-+				return stack::push<const char32_t*>(L, str + 0, str + sz);
- 			}
- 		};
- 
diff --git a/srcpkgs/SLADE/patches/signed....patch b/srcpkgs/SLADE/patches/signed....patch
new file mode 100644
index 000000000000..fafceaf00537
--- /dev/null
+++ b/srcpkgs/SLADE/patches/signed....patch
@@ -0,0 +1,20 @@
+--- a/src/Utility/Colour.h	2022-05-13 15:08:51.000000000 +0200
++++ -	2023-01-02 14:26:37.082908132 +0100
+@@ -13,7 +13,7 @@
+ 
+ 	// Constructors
+ 	ColRGBA() = default;
+-	ColRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, char blend = -1, short index = -1) :
++	ColRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, signed char blend = -1, short index = -1) :
+ 		r{ r }, g{ g }, b{ b }, a{ a }, index{ index }
+ 	{
+ 	}
+@@ -21,7 +21,7 @@
+ 	explicit ColRGBA(const wxColour& c) : r{ c.Red() }, g{ c.Green() }, b{ c.Blue() }, a{ c.Alpha() } {}
+ 
+ 	// Functions
+-	void set(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, char blend = -1, short index = -1)
++	void set(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, signed char blend = -1, short index = -1)
+ 	{
+ 		this->r     = r;
+ 		this->g     = g;
diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch
index d2a0ca72471b..f9393b244310 100644
--- a/srcpkgs/SLADE/patches/system-libraries.patch
+++ b/srcpkgs/SLADE/patches/system-libraries.patch
@@ -1,17 +1,48 @@
-lzma is p7zip not liblzma
---- a/src/External/CMakeLists.txt
-+++ b/src/External/CMakeLists.txt
-@@ -24,12 +24,10 @@
+--- a/src/Audio/ModMusic.cpp	2022-05-13 15:08:51.000000000 +0200
++++ -	2023-01-02 14:13:21.643696778 +0100
+@@ -32,7 +32,7 @@
+ // -----------------------------------------------------------------------------
+ #include "Main.h"
+ #include "ModMusic.h"
+-#include "thirdparty/dumb/dumb.h"
++#include <dumb.h>
+ 
+ using namespace slade;
+ using namespace audio;
+--- a/src/Application/App.cpp	2022-05-13 15:08:51.000000000 +0200
++++ -	2023-01-02 14:13:44.631508582 +0100
+@@ -60,7 +60,7 @@
+ #include "UI/WxUtils.h"
+ #include "Utility/StringUtils.h"
+ #include "Utility/Tokenizer.h"
+-#include "thirdparty/dumb/dumb.h"
++#include <dumb.h>
+ #include <filesystem>
+ 
+ using namespace slade;
+--- a/thirdparty/CMakeLists.txt	2022-05-13 15:08:51.000000000 +0200
++++ -	2023-01-02 14:14:00.580831197 +0100
+@@ -10,7 +10,6 @@
+ set(EXTERNAL_SOURCES
+ )
  file(GLOB_RECURSE EXTERNAL_SOURCES
- 	*.cpp
- 	*.cxx
 -	dumb/*.c
--	lua/*.c
  	lzma/C/LzmaDec.c
- 	${SLADE_HEADERS}
- 	)
+ 	mus2mid/mus2mid.cpp
+ 	zreaders/*.cpp
+@@ -30,4 +29,4 @@
  
  add_library(external STATIC ${EXTERNAL_SOURCES})
- target_link_libraries(external ${ZLIB_LIBRARY})
+ target_link_libraries(external ${ZLIB_LIBRARY} lunasvg fmt ${CMAKE_DL_LIBS})
 -set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
-+set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE)
++set(EXTERNAL_LIBRARIES external dumb PARENT_SCOPE)
+--- a/src/CMakeLists.txt	2022-05-13 15:08:51.000000000 +0200
++++ -	2023-01-02 14:17:00.363717559 +0100
+@@ -116,7 +116,6 @@
+ 	${MPG123_INCLUDE_DIR}
+ 	.
+ 	..
+-	../thirdparty/dumb
+ 	../thirdparty/glad/include
+ 	./Application
+ 	)
diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index f7c5d5cd9ff8..8b680574c3b9 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,6 +1,6 @@
 # Template file for 'SLADE'
 pkgname=SLADE
-version=3.1.13
+version=3.2.1
 revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/sirjuddington/SLADE"
 changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
 distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
-checksum=a9719f8639ae579c9671fda8c8ccbcc1ed55f7c98208fdeb439fb8d52fe340d7
+checksum=c327fa62ba491ac481d769700261d810128910007297fd9d9dbe26ac0e78bb2c
 
 pre_configure() {
 	case $XBPS_TARGET_MACHINE in

From 3113b9a6f5d7a11fd140b69fc03af97eb82f84a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 28 Dec 2022 22:05:27 +0100
Subject: [PATCH 083/114] perl-Sub-HandlesVia: update to 0.046.

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

diff --git a/srcpkgs/perl-Sub-HandlesVia/template b/srcpkgs/perl-Sub-HandlesVia/template
index 201e29976795..e0852a26a6a5 100644
--- a/srcpkgs/perl-Sub-HandlesVia/template
+++ b/srcpkgs/perl-Sub-HandlesVia/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Sub-HandlesVia'
 pkgname=perl-Sub-HandlesVia
-version=0.045
+version=0.046
 revision=1
 build_style=perl-module
 hostmakedepends="perl perl-Type-Tiny perl-Exporter-Tiny perl-Class-Tiny perl-Class-Method-Modifiers"
@@ -12,4 +12,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Sub-HandlesVia"
 distfiles="${CPAN_SITE}/Sub/Sub-HandlesVia-${version}.tar.gz"
-checksum=e21678b2f5a67f46305604a80b0709f9c81e155db8b4cfd92eb8eb094e124ccf
+checksum=76c5b9e5d02cb46f528c33c6e0c5d6b532cb99d97943ed5390d3bb264f3b8ee6

From 0a814211c84517535b221e28c84b59b89c39497c Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Wed, 28 Dec 2022 13:20:17 +0100
Subject: [PATCH 084/114] tree: update to 2.1.0

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

diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index 2aa57b156610..b74113a90c14 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -1,6 +1,6 @@
 # Template file for 'tree'
 pkgname=tree
-version=2.0.4
+version=2.1.0
 revision=1
 build_style=gnu-makefile
 short_desc="Recursive directory listing program"
@@ -9,7 +9,7 @@ license="GPL-2.0-or-later"
 homepage="https://mama.indstate.edu/users/ice/tree"
 changelog="https://mama.indstate.edu/users/ice/tree/changes.html"
 distfiles="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${version}/unix-tree-${version}.tar.gz"
-checksum=c51b3a758fcbc25c7f88316491db5ac6926d032f45af96687297a95a3b7b15de
+checksum=e9f829a03996451bcf90fae4fdee4285bece6dc1a89de92a3f8e6cad29e03c71
 
 do_install() {
 	make MANDIR=${DESTDIR}/usr/share/man DESTDIR=${DESTDIR}/usr/bin install

From b87ca9d9bb11838d16ed46ff7766ba57c318504d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 27 Dec 2022 16:45:57 +0100
Subject: [PATCH 085/114] sioyek: update to 2.0.0

---
 ...7c65cf85d1eee4515ef67b9a89c939ae9492.patch | 107 ------------------
 ...876fb2dcd3c82d619316e1cf8959521d4071.patch |  44 -------
 srcpkgs/sioyek/template                       |   5 +-
 3 files changed, 3 insertions(+), 153 deletions(-)
 delete mode 100644 srcpkgs/sioyek/patches/310c7c65cf85d1eee4515ef67b9a89c939ae9492.patch
 delete mode 100644 srcpkgs/sioyek/patches/7a9e876fb2dcd3c82d619316e1cf8959521d4071.patch

diff --git a/srcpkgs/sioyek/patches/310c7c65cf85d1eee4515ef67b9a89c939ae9492.patch b/srcpkgs/sioyek/patches/310c7c65cf85d1eee4515ef67b9a89c939ae9492.patch
deleted file mode 100644
index a2a35645f52e..000000000000
--- a/srcpkgs/sioyek/patches/310c7c65cf85d1eee4515ef67b9a89c939ae9492.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 310c7c65cf85d1eee4515ef67b9a89c939ae9492 Mon Sep 17 00:00:00 2001
-From: hrdl <31923882+lennonhill@users.noreply.github.com>
-Date: Mon, 29 Aug 2022 12:43:31 +0200
-Subject: [PATCH] Parse mupdf 1.20 links
-
----
- pdf_viewer/document_view.cpp |  2 +-
- pdf_viewer/main_widget.cpp   |  6 +++---
- pdf_viewer/utils.cpp         | 20 +++++---------------
- pdf_viewer/utils.h           |  2 +-
- 4 files changed, 10 insertions(+), 20 deletions(-)
-
-diff --git a/pdf_viewer/document_view.cpp b/pdf_viewer/document_view.cpp
-index ace3f161d..1362ee4b5 100644
---- a/pdf_viewer/document_view.cpp
-+++ b/pdf_viewer/document_view.cpp
-@@ -1077,7 +1077,7 @@ std::vector<DocumentPos> DocumentView::find_line_definitions() {
- 
- 			std::optional<PdfLink> pdf_link = current_document->get_link_in_page_rect(get_center_page_number(), line_rects[line_index]);
- 			if (pdf_link.has_value()) {
--				auto parsed_uri = parse_uri(pdf_link.value().uri);
-+				auto parsed_uri = parse_uri(mupdf_context, pdf_link.value().uri);
- 				result.push_back({ parsed_uri.page - 1, parsed_uri.x, parsed_uri.y });
- 				return result;
- 			}
-diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
-index 5265398d2..707d11b30 100644
---- a/pdf_viewer/main_widget.cpp
-+++ b/pdf_viewer/main_widget.cpp
-@@ -153,7 +153,7 @@ void MainWidget::set_overview_position(int page, float offset) {
- 
- void MainWidget::set_overview_link(PdfLink link) {
- 
--    auto [page, offset_x, offset_y] = parse_uri(link.uri);
-+    auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri);
-     if (page >= 1) {
-         set_overview_position(page - 1, offset_y);
-     }
-@@ -2861,7 +2861,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
- 					open_web_url(utf8_decode(selected_link->uri));
-                 }
-                 else{
--					auto [page, offset_x, offset_y] = parse_uri(selected_link->uri);
-+					auto [page, offset_x, offset_y] = parse_uri(mupdf_context, selected_link->uri);
- 					long_jump_to_destination(page-1, offset_y);
-                 }
-             }
-@@ -3472,7 +3472,7 @@ void MainWidget::handle_link_click(const PdfLink& link) {
- 		return;
- 	}
- 
--	auto [page, offset_x, offset_y] = parse_uri(link.uri);
-+	auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri);
- 
- 	// convert one indexed page to zero indexed page
- 	page--;
-diff --git a/pdf_viewer/utils.cpp b/pdf_viewer/utils.cpp
-index a25d18f10..e416737ba 100644
---- a/pdf_viewer/utils.cpp
-+++ b/pdf_viewer/utils.cpp
-@@ -24,6 +24,8 @@
- #include <qnetworkreply.h>
- #include <qscreen.h>
- 
-+#include <mupdf/pdf.h>
-+
- extern std::wstring LIBGEN_ADDRESS;
- extern std::wstring GOOGLE_SCHOLAR_ADDRESS;
- extern std::ofstream LOG_FILE;
-@@ -106,21 +108,9 @@ bool rects_intersect(fz_rect rect1, fz_rect rect2) {
- 	return range_intersects(rect1.x0, rect1.x1, rect2.x0, rect2.x1) && range_intersects(rect1.y0, rect1.y1, rect2.y0, rect2.y1);
- }
- 
--ParsedUri parse_uri(std::string uri) {
--	int comma_index = -1;
--
--	uri = uri.substr(1, uri.size() - 1);
--	comma_index = static_cast<int>(uri.find(","));
--	int page = atoi(uri.substr(0, comma_index ).c_str());
--
--	uri = uri.substr(comma_index+1, uri.size() - comma_index-1);
--	comma_index = static_cast<int>(uri.find(","));
--	float offset_x = atof(uri.substr(0, comma_index ).c_str());
--
--	uri = uri.substr(comma_index+1, uri.size() - comma_index-1);
--	float offset_y = atof(uri.c_str());
--
--	return { page, offset_x, offset_y };
-+ParsedUri parse_uri(fz_context* mupdf_context, std::string uri) {
-+	fz_link_dest dest = pdf_parse_link_uri(mupdf_context, uri.c_str());
-+	return { dest.loc.page + 1, dest.x, dest.y };
- }
- 
- char get_symbol(int key, bool is_shift_pressed, const std::vector<char>& special_symbols) {
-diff --git a/pdf_viewer/utils.h b/pdf_viewer/utils.h
-index 4d551c35a..aa0d0d61b 100644
---- a/pdf_viewer/utils.h
-+++ b/pdf_viewer/utils.h
-@@ -33,7 +33,7 @@ void get_flat_toc(const std::vector<TocNode*>& roots, std::vector<std::wstring>&
- int mod(int a, int b);
- bool range_intersects(float range1_start, float range1_end, float range2_start, float range2_end);
- bool rects_intersect(fz_rect rect1, fz_rect rect2);
--ParsedUri parse_uri(std::string uri);
-+ParsedUri parse_uri(fz_context* mupdf_context, std::string uri);
- char get_symbol(int key, bool is_shift_pressed, const std::vector<char>&special_symbols);
- 
- template<typename T>
diff --git a/srcpkgs/sioyek/patches/7a9e876fb2dcd3c82d619316e1cf8959521d4071.patch b/srcpkgs/sioyek/patches/7a9e876fb2dcd3c82d619316e1cf8959521d4071.patch
deleted file mode 100644
index 653cb132684f..000000000000
--- a/srcpkgs/sioyek/patches/7a9e876fb2dcd3c82d619316e1cf8959521d4071.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7a9e876fb2dcd3c82d619316e1cf8959521d4071 Mon Sep 17 00:00:00 2001
-From: ahrm <a.hr.mostafavi@gmail.com>
-Date: Mon, 29 Aug 2022 14:57:02 +0430
-Subject: [PATCH] Fix some compatibility issues with mupdf 1.20.0
-
----
- pdf_viewer/document.cpp     | 4 ++--
- pdf_viewer/pdf_renderer.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
-index 083e40244..61375d598 100644
---- a/pdf_viewer/document.cpp
-+++ b/pdf_viewer/document.cpp
-@@ -559,14 +559,14 @@ void Document::convert_toc_tree(fz_outline* root, std::vector<TocNode*>& output)
- 		current_node->title = utf8_decode(root->title);
- 		current_node->x = root->x;
- 		current_node->y = root->y;
--		if (root->page == -1) {
-+		if (root->page.page == -1) {
- 			float xp, yp;
- 			fz_location loc = fz_resolve_link(context, doc, root->uri, &xp, &yp);
- 			int chapter_page = accum_chapter_pages[loc.chapter];
- 			current_node->page = chapter_page + loc.page;
- 		}
- 		else {
--			current_node->page = root->page;
-+			current_node->page = root->page.page;
- 		}
- 		convert_toc_tree(root->down, current_node->children);
- 
-diff --git a/pdf_viewer/pdf_renderer.cpp b/pdf_viewer/pdf_renderer.cpp
-index cc8a89d16..fd17a52c4 100644
---- a/pdf_viewer/pdf_renderer.cpp
-+++ b/pdf_viewer/pdf_renderer.cpp
-@@ -315,7 +315,7 @@ void PdfRenderer::run_search(int thread_index)
- 
- 				const int max_hits_per_page = 20;
- 				fz_quad hitboxes[max_hits_per_page];
--				int num_results = fz_search_page(mupdf_context, page, utf8_encode(req.search_term).c_str(), hitboxes, max_hits_per_page);
-+				int num_results = fz_search_page(mupdf_context, page, utf8_encode(req.search_term).c_str(), nullptr, hitboxes, max_hits_per_page);
- 
- 				if (num_results > 0) {
- 					req.search_results_mutex->lock();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
index ef5c44f9096d..db527c57b0c6 100644
--- a/srcpkgs/sioyek/template
+++ b/srcpkgs/sioyek/template
@@ -1,6 +1,6 @@
 # Template file for 'sioyek'
 pkgname=sioyek
-version=1.5.0
+version=2.0.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools
@@ -14,7 +14,7 @@ maintainer="dkwo <npiazza@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sioyek.info/"
 distfiles="https://github.com/ahrm/sioyek/archive/refs/tags/v${version}.tar.gz"
-checksum=2d01c757953c3f2d98428376e642d13b8a9edeba8fee506477e8aa178756f16b
+checksum=92398b6da5e297c59f22cd3c6b562194846f28bc17bb4ae9432869aafeb5df17
 nocross=yes
 
 do_build() {
@@ -30,5 +30,6 @@ do_install() {
 	vmkdir usr/share/sioyek/shaders
 	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
 	vinstall tutorial.pdf 644 usr/share/sioyek
+	vinstall resources/sioyek.desktop 644 usr/share/applications
 	vman resources/sioyek.1
 }

From b72019c0d1394e39b35bd50ef14b00e29303891f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 2 Jan 2023 15:56:07 +0100
Subject: [PATCH 086/114] libzapojit: remove package

archived, uses libsoup3 and gnome-online-accounts which uses libsoup3
---
 common/shlibs                     |  1 -
 srcpkgs/libzapojit/template       | 32 -------------------------------
 srcpkgs/removed-packages/template |  3 ++-
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/libzapojit/template

diff --git a/common/shlibs b/common/shlibs
index 84c17ee8926a..3ec774dba25a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1154,7 +1154,6 @@ libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1
 libcheese-gtk.so.25 libcheese-3.17.90_1
 libSoundTouch.so.1 soundtouch-1.9.2_1
-libzapojit-0.0.so.0 libzapojit-0.0.2_1
 libmusicbrainz5.so.1 libmusicbrainz5-5.1.0_1
 librygel-core-2.6.so.2 librygel-0.26.0_1
 librygel-renderer-2.6.so.2 librygel-0.26.0_1
diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template
deleted file mode 100644
index ae7554d4d7fe..000000000000
--- a/srcpkgs/libzapojit/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'libzapojit'
-pkgname=libzapojit
-version=0.0.3
-revision=10
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
-makedepends="json-glib-devel rest0-devel gnome-online-accounts-devel"
-short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/Zapojit"
-distfiles="${GNOME_SITE}/libzapojit/0.0/libzapojit-${version}.tar.xz"
-checksum=3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e
-
-build_options="gir"
-build_options_default="gir"
-
-libzapojit-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/share/gtk-doc
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..244a3e43e241 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -139,9 +139,9 @@ replaces="
  grv<=0.3.1_3
  gsettings-qt<=0.1+17.10.20170824_3
  gst1-python<=1.18.3_1
+ gtk-sharp2<=2.12.45_2
  gtkhtml-devel<=4.10.0_1
  gtkhtml<=4.10.0_1
- gtk-sharp2<=2.12.45_2
  guile1.8-devel<=1.8.8_3
  guile1.8<=1.8.8_3
  gx-go<=1.9.0_1
@@ -291,6 +291,7 @@ replaces="
  libxml2-python<=2.9.10_4
  libxnoise<=0.2.21_4
  libxslt-python<=1.1.34_5
+ libzapojit<=0.0.3_10
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1

From c2a901dd984203623ebd19835560dcbf823f70fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 2 Jan 2023 16:04:04 +0100
Subject: [PATCH 087/114] gnome-recipes: remove package

uses libsoup2 version of rest and gnome-online-accounts which uses libsoup3
---
 .../patches/gnome-recipes-fix-cross.patch          |  9 ---------
 srcpkgs/gnome-recipes/template                     | 14 --------------
 srcpkgs/removed-packages/template                  |  1 +
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch
 delete mode 100644 srcpkgs/gnome-recipes/template

diff --git a/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch b/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch
deleted file mode 100644
index 7792b5c2bc03..000000000000
--- a/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tools/meson.build
-+++ b/tools/meson.build
-@@ -1,3 +1,5 @@
- recipe_extract = executable('recipe-extract', 'recipe-extract.c',
-            include_directories : top_inc,
--           dependencies: deps)
-+           native: true,
-+           dependencies: dependency('glib-2.0', native: true),
-+)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
deleted file mode 100644
index 37c44c1e486d..000000000000
--- a/srcpkgs/gnome-recipes/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'gnome-recipes'
-pkgname=gnome-recipes
-version=2.0.4
-revision=2
-build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config git"
-makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
- libsoup-devel gnome-online-accounts-devel rest0-devel json-glib-devel"
-short_desc="GNOME app for sharing and finding recipes"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Recipes"
-distfiles="${GNOME_SITE}/gnome-recipes/${version%.*}/gnome-recipes-${version}.tar.xz"
-checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 244a3e43e241..80895711de31 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -126,6 +126,7 @@ replaces="
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-online-miners<=3.34.0_3
+ gnome-recipes<=2.0.4_2
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_2
  go-gdm<=1.4_7

From c5a0ddd42f64351db5403c5f4e7b5f911bb17762 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 2 Jan 2023 16:10:45 +0100
Subject: [PATCH 088/114] deja-dup: update to 44.0.

---
 srcpkgs/deja-dup/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/deja-dup/template b/srcpkgs/deja-dup/template
index 92507ea60a79..73048a892169 100644
--- a/srcpkgs/deja-dup/template
+++ b/srcpkgs/deja-dup/template
@@ -1,12 +1,12 @@
 # Template file for 'deja-dup'
 pkgname=deja-dup
-version=42.8
+version=44.0
 revision=1
 build_style=meson
-hostmakedepends="appstream-glib dbus glib-devel intltool itstool
+hostmakedepends="appstream-glib dbus glib-devel gettext itstool
  libgpg-error-devel pkg-config vala desktop-file-utils"
 makedepends="gnome-online-accounts-devel json-glib-devel libgpg-error-devel
- libhandy1-devel libpeas-devel libsecret-devel libsoup-devel"
+ libadwaita-devel libpeas-devel libsecret-devel libsoup3-devel"
 depends="dbus duplicity"
 short_desc="Simple backup tool that uses duplicity as the backend"
 maintainer="John <me@johnnynator.dev>"
@@ -14,9 +14,10 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/deja-dup"
 changelog="https://gitlab.gnome.org/World/deja-dup/-/raw/main/NEWS.md"
 distfiles="https://gitlab.gnome.org/World/deja-dup/-/archive/${version}/deja-dup-${version}.tar.gz"
-checksum=5e7e7206db6aa57dbb9b948df041774e8ba8915685ceb6324a747776c9067467
+checksum=355aa145a8007e0bbb5f2da579d638f99c3d6b91013b8381e33d8f5f864d8e29
+#make_check=no
 
-do_check() {
-	# tests fail
-	:
-}
+#do_check() {
+#	# tests fail
+#	:
+#}

From 51075238c4915d06027f8f51a63a0ea65a817d88 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 2 Jan 2023 16:25:17 +0100
Subject: [PATCH 089/114] gnome-software: update to 43.2.

---
 .../0001-only-associate-flatpak-mimetypes.patch |  8 --------
 srcpkgs/gnome-software/template                 | 17 +++++++++--------
 2 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch

diff --git a/srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch b/srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch
deleted file mode 100644
index 63c2b3aa2232..000000000000
--- a/srcpkgs/gnome-software/patches/0001-only-associate-flatpak-mimetypes.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/gnome-software-local-file.desktop.in
-+++ b/src/gnome-software-local-file.desktop.in
-@@ -9,4 +9,4 @@ Type=Application
- Icon=system-software-install
- StartupNotify=true
- NoDisplay=true
--MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref;application/vnd.snap;
-+MimeType=application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref
diff --git a/srcpkgs/gnome-software/template b/srcpkgs/gnome-software/template
index 4d21ca5c05a7..be718acb046e 100644
--- a/srcpkgs/gnome-software/template
+++ b/srcpkgs/gnome-software/template
@@ -1,23 +1,24 @@
 # Template file for 'gnome-software'
 pkgname=gnome-software
-version=42.4
-revision=2
+version=43.2
+revision=1
 build_style=meson
-configure_args="-Dvalgrind=false -Dpackagekit=false -Dfwupd=false
- -Dmalcontent=false $(vopt_bool gtk_doc) -Dsoup2=true"
+configure_args="-Dpackagekit=false -Dfwupd=false
+ -Dmalcontent=false -Dwebapps=false $(vopt_bool gtk_doc)
+ -Dhardcoded_foss_webapps=false -Dhardcoded_proprietary_webapps=false"
 hostmakedepends="pkg-config tar glib-devel gettext libxslt docbook-xsl
- $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gtk_doc gtk-doc) AppStream"
 makedepends="AppStream-devel libxmlb-devel gnome-online-accounts-devel
  json-glib-devel gtk4-devel libadwaita-devel gsettings-desktop-schemas-devel
- gspell-devel polkit-devel flatpak-devel libgudev-devel libsoup-devel"
+ gspell-devel polkit-devel flatpak-devel libgudev-devel libsoup3-devel"
 checkdepends="dbus"
 short_desc="GNOME Software Center (flatpak only)"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-software"
 distfiles="https://gitlab.gnome.org/GNOME/gnome-software/-/archive/${version}/gnome-software-${version}.tar.gz"
-checksum=adaa905239ed3a3f6df40c9257c67f96dec891abdac0575f97577f1d97d555b1
-make_check=ci-skip # gs-self-test-modalias, gs-self-test-repos and gs-self-test-src fail in CI
+checksum=5d93c568d5106a1183ee80fab573961cb0617af10e685314822aca5bedfd789d
+make_check=no # FIXME
 
 build_options="gtk_doc"
 

From 259e3086bedde0267d6498beda2ad97da3974058 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 23 Dec 2022 21:35:10 +0530
Subject: [PATCH 090/114] jo: update to 1.9.

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

diff --git a/srcpkgs/jo/template b/srcpkgs/jo/template
index e0bc77e1120a..79ac669408c5 100644
--- a/srcpkgs/jo/template
+++ b/srcpkgs/jo/template
@@ -1,18 +1,14 @@
 # Template file for 'jo'
 pkgname=jo
-version=1.6
+version=1.9
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
+makedepends="bash-completion"
 short_desc="Small utility to create JSON objects"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/jpmens/jo"
 changelog="https://raw.githubusercontent.com/jpmens/jo/master/ChangeLog"
-distfiles="https://github.com/jpmens/jo/archive/${version}.tar.gz"
-checksum=ae2837ddad9993d5e28fe8db00efec6b2378d68b7366021353a1e297b5fa2025
-
-post_install() {
-	vmkdir usr/share/bash-completion/completions
-	mv "${DESTDIR}"/etc/bash_completion.d/*.bash "${DESTDIR}"/usr/share/bash-completion/completions/
-}
+distfiles="https://github.com/jpmens/jo/archive/refs/tags/${version}.tar.gz"
+checksum=87b3e40584730d6f8b8cdb9deb1700173d25dc54403fcb17d2c1d9def2ba8102

From 7bfa48be5e53319f71f4df61a00beecb6b8fe022 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 26 Dec 2022 19:31:22 +0100
Subject: [PATCH 091/114] leftwm: update to 0.4.1

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

diff --git a/srcpkgs/leftwm/template b/srcpkgs/leftwm/template
index abcfee8124e8..f872956e22c1 100644
--- a/srcpkgs/leftwm/template
+++ b/srcpkgs/leftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'leftwm'
 pkgname=leftwm
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=cargo
 configure_args="--no-default-features --features lefthk,sys-log"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/leftwm/leftwm"
 changelog="https://raw.githubusercontent.com/leftwm/leftwm/main/CHANGELOG"
 distfiles="https://github.com/leftwm/leftwm/archive/refs/tags/${version}.tar.gz"
-checksum=af5999852975de453e19bd199bfc021519ca95e4016a97a1508dc4d678dddd8b
+checksum=fe10c6ef9f458a889ff0020d348e0185eeba8c606e2fb8ac04a78ac214ce40bc
 
 do_install() {
 	vdoc README.md

From 10a5d89ac5bf5dc94b52c9748cea239dcc17b076 Mon Sep 17 00:00:00 2001
From: Albert Schwarzkopf <dev-voidlinux@quitesimple.org>
Date: Sat, 24 Dec 2022 15:23:28 +0100
Subject: [PATCH 092/114] unzip: sync patches from Fedora etc.

Sync a number of (CVE-related) patches from other distros:

unzip-zipbomb-part{4,5,6}.patch: Fedora
CVE-2021-4217.patch: Archlinux
CVE-2022-0529.patch,CVE-2022-0530.patch: Ubuntu
---
 srcpkgs/unzip/patches/CVE-2021-4217.patch     | 19 ++++
 srcpkgs/unzip/patches/CVE-2022-0529.patch     | 37 ++++++++
 srcpkgs/unzip/patches/CVE-2022-0530.patch     | 28 ++++++
 srcpkgs/unzip/patches/series                  |  7 ++
 ...e-overlap-detection-on-32bit-systems.patch | 50 ++++++++++
 .../unzip/patches/unzip-zipbomb-part4.patch   | 25 +++++
 .../unzip/patches/unzip-zipbomb-part5.patch   | 26 +++++
 .../unzip/patches/unzip-zipbomb-part6.patch   | 95 +++++++++++++++++++
 srcpkgs/unzip/template                        |  2 +-
 9 files changed, 288 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/unzip/patches/CVE-2021-4217.patch
 create mode 100644 srcpkgs/unzip/patches/CVE-2022-0529.patch
 create mode 100644 srcpkgs/unzip/patches/CVE-2022-0530.patch
 create mode 100644 srcpkgs/unzip/patches/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
 create mode 100644 srcpkgs/unzip/patches/unzip-zipbomb-part4.patch
 create mode 100644 srcpkgs/unzip/patches/unzip-zipbomb-part5.patch
 create mode 100644 srcpkgs/unzip/patches/unzip-zipbomb-part6.patch

diff --git a/srcpkgs/unzip/patches/CVE-2021-4217.patch b/srcpkgs/unzip/patches/CVE-2021-4217.patch
new file mode 100644
index 000000000000..37b83cca0575
--- /dev/null
+++ b/srcpkgs/unzip/patches/CVE-2021-4217.patch
@@ -0,0 +1,19 @@
+diff --git a/process.c b/process.c
+index d2a846e..cba2463 100644
+--- a/process.c
++++ b/process.c
+@@ -2064,10 +2064,14 @@ int getUnicodeData(__G__ ef_buf, ef_len)
+           G.unipath_checksum = makelong(offset + ef_buf);
+           offset += 4;
+ 
++          if (!G.filename_full) {
++            /* Check if we have a unicode extra section but no filename set */
++            return PK_ERR;
++          }
++
+           /*
+            * Compute 32-bit crc
+            */
+-
+           chksum = crc32(chksum, (uch *)(G.filename_full),
+                          strlen(G.filename_full));
diff --git a/srcpkgs/unzip/patches/CVE-2022-0529.patch b/srcpkgs/unzip/patches/CVE-2022-0529.patch
new file mode 100644
index 000000000000..f38abf414d2e
--- /dev/null
+++ b/srcpkgs/unzip/patches/CVE-2022-0529.patch
@@ -0,0 +1,37 @@
+From: Enrico Zini <enrico@debian.org>
+Subject: Fix wide string conversion
+Bug-Debian: https://bugs.debian.org/1010355
+X-Debian-version: 6.0-27
+
+--- unzip-6.0.orig/process.c
++++ unzip-6.0/process.c
+@@ -2511,13 +2511,15 @@ char *wide_to_local_string(wide_string,
+   char buf[9];
+   char *buffer = NULL;
+   char *local_string = NULL;
++  size_t buffer_size;
+ 
+   for (wsize = 0; wide_string[wsize]; wsize++) ;
+ 
+   if (max_bytes < MAX_ESCAPE_BYTES)
+     max_bytes = MAX_ESCAPE_BYTES;
+ 
+-  if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
++  buffer_size = wsize * max_bytes + 1;
++  if ((buffer = (char *)malloc(buffer_size)) == NULL) {
+     return NULL;
+   }
+ 
+@@ -2556,7 +2558,11 @@ char *wide_to_local_string(wide_string,
+       /* no MB for this wide */
+         /* use escape for wide character */
+         char *escape_string = wide_to_escape_string(wide_string[i]);
+-        strcat(buffer, escape_string);
++        size_t buffer_len = strlen(buffer);
++        size_t escape_string_len = strlen(escape_string);
++        if (buffer_len + escape_string_len + 1 > buffer_size)
++          escape_string_len = buffer_size - buffer_len - 1;
++        strncat(buffer, escape_string, escape_string_len);
+         free(escape_string);
+     }
+   }
diff --git a/srcpkgs/unzip/patches/CVE-2022-0530.patch b/srcpkgs/unzip/patches/CVE-2022-0530.patch
new file mode 100644
index 000000000000..5e7627abc2ea
--- /dev/null
+++ b/srcpkgs/unzip/patches/CVE-2022-0530.patch
@@ -0,0 +1,28 @@
+From: Enrico Zini <enrico@debian.org>
+Subject: Fix null pointer dereference on invalid UTF-8 input
+Bug-Debian: https://bugs.debian.org/1010355
+X-Debian-version: 6.0-27
+
+--- unzip-6.0.orig/fileio.c
++++ unzip-6.0/fileio.c
+@@ -2364,6 +2364,9 @@ int do_string(__G__ length, option)   /*
+                   /* convert UTF-8 to local character set */
+                   fn = utf8_to_local_string(G.unipath_filename,
+                                             G.unicode_escape_all);
++                  if (fn == NULL)
++                    return PK_ERR;
++
+                   /* make sure filename is short enough */
+                   if (strlen(fn) >= FILNAMSIZ) {
+                     fn[FILNAMSIZ - 1] = '\0';
+--- unzip-6.0.orig/process.c
++++ unzip-6.0/process.c
+@@ -2615,6 +2615,8 @@ char *utf8_to_local_string(utf8_string,
+   int escape_all;
+ {
+   zwchar *wide = utf8_to_wide_string(utf8_string);
++  if (wide == NULL)
++    return NULL;
+   char *loc = wide_to_local_string(wide, escape_all);
+   free(wide);
+   return loc;
diff --git a/srcpkgs/unzip/patches/series b/srcpkgs/unzip/patches/series
index cd67627dfc41..c4f3fc1b2bda 100644
--- a/srcpkgs/unzip/patches/series
+++ b/srcpkgs/unzip/patches/series
@@ -27,3 +27,10 @@ unzip-zipbomb-part1.patch
 unzip-zipbomb-part2.patch
 unzip-zipbomb-part3.patch
 unzip-zipbomb-manpage.patch
+unzip-zipbomb-part4.patch
+unzip-zipbomb-part5.patch
+unzip-zipbomb-part6.patch
+CVE-2021-4217.patch
+CVE-2022-0529.patch
+CVE-2022-0530.patch
+unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
diff --git a/srcpkgs/unzip/patches/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch b/srcpkgs/unzip/patches/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
new file mode 100644
index 000000000000..ad6a157c568a
--- /dev/null
+++ b/srcpkgs/unzip/patches/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
@@ -0,0 +1,50 @@
+From 13f0260beae851f7d5dd96e9ef757d8d6d7daac1 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 07:20:13 -0800
+Subject: [PATCH] Fix false overlapped components detection on 32-bit systems.
+
+32-bit systems with ZIP64_SUPPORT enabled could have different
+size types for zoff_t and zusz_t. That resulted in bad parameter
+passing to the bound tracking functions, itself due to the lack of
+use of C function prototypes in unzip. This commit assures that
+parameters are cast properly for those calls.
+
+This problem occurred only for ill-chosen make options, which give
+a 32-bit zoff_t. A proper build will result in a zoff_t of 64 bits,
+even on 32-bit systems.
+---
+ extract.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 1b73cb0..d9866f9 100644
+--- a/extract.c
++++ b/extract.c
+@@ -329,7 +329,7 @@ static ZCONST char Far OverlappedComponents[] =
+ 
+ 
+ /* A growable list of spans. */
+-typedef zoff_t bound_t;
++typedef zusz_t bound_t;
+ typedef struct {
+     bound_t beg;        /* start of the span */
+     bound_t end;        /* one past the end of the span */
+@@ -518,7 +518,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+         return PK_MEM;
+     }
+     if ((G.extra_bytes != 0 &&
+-         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++         cover_add((cover_t *)G.cover,
++                   (bound_t)0, (bound_t)G.extra_bytes) != 0) ||
+         (G.ecrec.have_ecr64 &&
+          cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
+                    G.ecrec.ec64_end) != 0) ||
+@@ -1216,7 +1217,7 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ 
+         /* seek_zipf(__G__ pInfo->offset);  */
+         request = G.pInfo->offset + G.extra_bytes;
+-        if (cover_within((cover_t *)G.cover, request)) {
++        if (cover_within((cover_t *)G.cover, (bound_t)request)) {
+             Info(slide, 0x401, ((char *)slide,
+               LoadFarString(OverlappedComponents)));
+             return PK_BOMB;
diff --git a/srcpkgs/unzip/patches/unzip-zipbomb-part4.patch b/srcpkgs/unzip/patches/unzip-zipbomb-part4.patch
new file mode 100644
index 000000000000..beffa2c99872
--- /dev/null
+++ b/srcpkgs/unzip/patches/unzip-zipbomb-part4.patch
@@ -0,0 +1,25 @@
+From 5e2efcd633a4a1fb95a129a75508e7d769e767be Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 20:36:28 -0800
+Subject: [PATCH] Fix bug in UZbunzip2() that incorrectly updated G.incnt.
+
+The update assumed a full buffer, which is not always full. This
+could result in a false overlapped element detection when a small
+bzip2-compressed file was unzipped. This commit remedies that.
+---
+ extract.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index d9866f9..0cb7bfc 100644
+--- a/extract.c
++++ b/extract.c
+@@ -3010,7 +3010,7 @@ __GDEF
+ #endif
+ 
+     G.inptr = (uch *)bstrm.next_in;
+-    G.incnt = (G.inbuf + INBUFSIZ) - G.inptr;  /* reset for other routines */
++    G.incnt -= G.inptr - G.inbuf;       /* reset for other routines */
+ 
+ uzbunzip_cleanup_exit:
+     err = BZ2_bzDecompressEnd(&bstrm);
diff --git a/srcpkgs/unzip/patches/unzip-zipbomb-part5.patch b/srcpkgs/unzip/patches/unzip-zipbomb-part5.patch
new file mode 100644
index 000000000000..ca6a43a7c5be
--- /dev/null
+++ b/srcpkgs/unzip/patches/unzip-zipbomb-part5.patch
@@ -0,0 +1,26 @@
+From 5c572555cf5d80309a07c30cf7a54b2501493720 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 21:39:09 -0800
+Subject: [PATCH] Fix bug in UZinflate() that incorrectly updated G.incnt.
+
+The update assumed a full buffer, which is not always full. This
+could result in a false overlapped element detection when a small
+deflate-compressed file was unzipped using an old zlib. This
+commit remedies that.
+---
+ inflate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inflate.c b/inflate.c
+index 2f5a015..70e3cc0 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -700,7 +700,7 @@ int UZinflate(__G__ is_defl64)
+       G.dstrm.total_out));
+ 
+     G.inptr = (uch *)G.dstrm.next_in;
+-    G.incnt = (G.inbuf + INBUFSIZ) - G.inptr;  /* reset for other routines */
++    G.incnt -= G.inptr - G.inbuf;       /* reset for other routines */
+ 
+ uzinflate_cleanup_exit:
+     err = inflateReset(&G.dstrm);
diff --git a/srcpkgs/unzip/patches/unzip-zipbomb-part6.patch b/srcpkgs/unzip/patches/unzip-zipbomb-part6.patch
new file mode 100644
index 000000000000..3dce6e3421e1
--- /dev/null
+++ b/srcpkgs/unzip/patches/unzip-zipbomb-part6.patch
@@ -0,0 +1,95 @@
+From 122050bac16fae82a460ff739fb1ca0f106e9d85 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sat, 2 Jan 2021 13:09:34 -0800
+Subject: [PATCH] Determine Zip64 status entry-by-entry instead of for entire
+ file.
+
+Fixes a bug for zip files with mixed Zip64 and not Zip64 entries,
+which resulted in an incorrect data descriptor length. The bug is
+seen when a Zip64 entry precedes a non-Zip64 entry, in which case
+the data descriptor would have been assumed to be larger than it
+is, resulting in an incorrect bomb warning due to a perceived
+overlap with the next entry. This commit determines and saves the
+Zip64 status for each entry based on the central directory, and
+then computes the length of each data descriptor accordingly.
+---
+ extract.c | 5 +++--
+ globals.h | 2 --
+ process.c | 4 +---
+ unzpriv.h | 1 +
+ 4 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 504afd6..878817d 100644
+--- a/extract.c
++++ b/extract.c
+@@ -658,6 +658,7 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+                     break;
+                 }
+             }
++            G.pInfo->zip64 = FALSE;
+             if ((error = do_string(__G__ G.crec.extra_field_length,
+                 EXTRA_FIELD)) != 0)
+             {
+@@ -2187,12 +2188,12 @@ static int extract_or_test_member(__G)    /* return PK-type error code */
+              (clen == SIG &&                    /* if not SIG, no signature */
+               ((G.lrec.csize & LOW) != SIG ||   /* if not SIG, have signature */
+                (ulen == SIG &&                  /* if not SIG, no signature */
+-                (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
++                (G.pInfo->zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
+                                                 /* if not SIG, have signature */
+                 )))))
+                    /* skip four more bytes to account for signature */
+                    shy += 4 - readbuf((char *)buf, 4);
+-        if (G.zip64)
++        if (G.pInfo->zip64)
+             shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
+         if (shy)
+             error = PK_ERR;
+diff --git a/globals.h b/globals.h
+index f9c6daf..a883c90 100644
+--- a/globals.h
++++ b/globals.h
+@@ -261,8 +261,6 @@ typedef struct Globals {
+     ecdir_rec       ecrec;         /* used in unzip.c, extract.c */
+     z_stat   statbuf;              /* used by main, mapname, check_for_newer */
+ 
+-    int zip64;                     /* true if Zip64 info in extra field */
+-
+     int      mem_mode;
+     uch      *outbufptr;           /* extract.c static */
+     ulg      outsize;              /* extract.c static */
+diff --git a/process.c b/process.c
+index d75d405..d643c6f 100644
+--- a/process.c
++++ b/process.c
+@@ -1903,8 +1903,6 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #define Z64FLGS 0xffff
+ #define Z64FLGL 0xffffffff
+ 
+-    G.zip64 = FALSE;
+-
+     if (ef_len == 0 || ef_buf == NULL)
+         return PK_COOL;
+ 
+@@ -1943,7 +1941,7 @@ int getZip64Data(__G__ ef_buf, ef_len)
+           break;                /* Expect only one EF_PKSZ64 block. */
+ #endif /* 0 */
+ 
+-          G.zip64 = TRUE;
++          G.pInfo->zip64 = TRUE;
+         }
+ 
+         /* Skip this extra field block. */
+diff --git a/unzpriv.h b/unzpriv.h
+index 09f288e..75b3359 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -2034,6 +2034,7 @@ typedef struct min_info {
+ #ifdef UNICODE_SUPPORT
+     unsigned GPFIsUTF8: 1;   /* crec gen_purpose_flag UTF-8 bit 11 is set */
+ #endif
++    unsigned zip64: 1;       /* true if entry has Zip64 extra block */
+ #ifndef SFX
+     char Far *cfilname;      /* central header version of filename */
+ #endif
diff --git a/srcpkgs/unzip/template b/srcpkgs/unzip/template
index 94c85876e9d6..a625a153bd09 100644
--- a/srcpkgs/unzip/template
+++ b/srcpkgs/unzip/template
@@ -1,7 +1,7 @@
 # Template file for 'unzip'
 pkgname=unzip
 version=6.0
-revision=14
+revision=15
 makedepends="bzip2-devel"
 short_desc="List, test and extract compressed files in a ZIP archive"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 986b1125b95baee5cdc9d889c829e85042c499fc Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 16 Dec 2022 02:07:28 +0000
Subject: [PATCH 093/114] sed: update to 4.9.

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

diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template
index 18d0b5baf1f4..3df39dcfe76c 100644
--- a/srcpkgs/sed/template
+++ b/srcpkgs/sed/template
@@ -1,6 +1,6 @@
 # Template file for 'sed'
 pkgname=sed
-version=4.8
+version=4.9
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/sed"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633
+checksum=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 4ffbc64a1481ca4e74cab218a4c85940ee4c7bf0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 23 Dec 2022 08:14:07 +0100
Subject: [PATCH 094/114] github-cli: update to 2.21.1

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

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 07b79a59b713..43f62e5171cf 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.20.2
+version=2.21.1
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://cli.github.com"
 changelog="https://github.com/cli/cli/releases"
 distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=221380a32559984b64cdda81fabb60e5d4ed00db49ffe8390ddc149bef25c5a7
+checksum=7c57f77ce5c8f1f418582b891224cedb364672f397251a1c593b8875f7c34f87
 
 pre_build() {
 	local _date

From 02e1a32495a1d7f5332e700162514dbbd97550a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 2 Jan 2023 16:37:30 +0100
Subject: [PATCH 095/114] removed-packages: bump version to pick up changes

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 80895711de31..6348bc031851 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20221217
+version=0.1.20230102
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"

From c4cf4444e84a4147ca46eba5d4996fd161211b8d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 096/114] pidgin: revbump for evolution-data-server 3.46

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

diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
 version=2.14.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv

From 50b61301365eb6347a4cd791bb6d1a70f91ffe46 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Sun, 1 Jan 2023 18:00:04 +0100
Subject: [PATCH 097/114] seahorse: update to 43.0

---
 srcpkgs/seahorse/patches/musl.patch | 90 +++++++++++++++++++++++++++++
 srcpkgs/seahorse/template           | 10 ++--
 2 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/seahorse/patches/musl.patch

diff --git a/srcpkgs/seahorse/patches/musl.patch b/srcpkgs/seahorse/patches/musl.patch
new file mode 100644
index 000000000000..d6a6bba396da
--- /dev/null
+++ b/srcpkgs/seahorse/patches/musl.patch
@@ -0,0 +1,90 @@
+From 6d673637d90066f4756568ce1b2f1f3c89a37c74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
+Date: Thu, 20 Oct 2022 18:35:33 +0200
+Subject: [PATCH] ssh: avoid stdout and stderr variable names
+
+In Alpine Linux, the compiler:
+
+C compiler for the host machine: gcc (gcc 12.2.1 "gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924")
+C linker for the host machine: gcc ld.bfd 2.39
+Vala compiler for the host machine: valac (valac 0.56.3)
+
+ended up including stdio.h into the C code generated from Vala.
+This produced the following (and similar) errors due to
+stderr and stdout being #define in stdio.h:
+
+ninja: job failed: gcc -Issh/libseahorse-ssh.a.p -Issh -I../ssh -Icommon -I../common -I. -I.. -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/gcr-3 -I/usr/include/gck-1 -I/usr/include/p11-kit-1 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libhandy-1 -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -w -O0 -DGCR_API_SUBJECT_TO_CHANGE -DGCK_API_SUBJECT_TO_CHANGE -DSECRET_WITH_UNSTABLE -include config.h -Wno-unused-parameter -Wno-missing-field-initializers -Os -fomit-frame-pointer -Os -fomit-frame-pointer -fPIC -pthread -MD -MQ ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -MF ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o.d -o ssh/libseahorse-ssh.a.p/meson-generated_operation.c.o -c ssh/libseahorse-ssh.a.p/operation.c
+In file included from /usr/include/fortify/stdio.h:22,
+                 from /usr/include/pango-1.0/pango/pango-utils.h:25,
+                 from /usr/include/pango-1.0/pango/pango.h:51,
+                 from /usr/include/gtk-3.0/gdk/gdktypes.h:35,
+                 from /usr/include/gtk-3.0/gdk/gdkapplaunchcontext.h:30,
+                 from /usr/include/gtk-3.0/gdk/gdk.h:32,
+                 from /usr/include/gtk-3.0/gtk/gtk.h:30,
+                 from common/seahorse-common.h:11,
+                 from ssh/seahorse-ssh.h:6,
+                 from ssh/libseahorse-ssh.a.p/operation.c:25:
+ssh/libseahorse-ssh.a.p/operation.c: In function 'seahorse_ssh_operation_operation_async_co':
+ssh/libseahorse-ssh.a.p/operation.c:621:17: error: expected identifier before '(' token
+  621 |         _data_->stdout = NULL;
+      |                 ^~~~~~
+ssh/libseahorse-ssh.a.p/operation.c:622:17: error: expected identifier before '(' token
+  622 |         _data_->stderr = NULL;
+      |                 ^~~~~~
+
+Fix the problem by naming the variables std_out and std_err, as it
+was before commit e60e5fd4b1545053e99758b894e8ef981de08c3e
+
+Fixes e60e5fd4b1545053e99758b894e8ef981de08c3e
+
+Coauthored-by: psykose <alice@ayaya.dev>
+---
+ ssh/operation.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ssh/operation.vala b/ssh/operation.vala
+index afa161ce..4743d0a5 100644
+--- a/ssh/operation.vala
++++ b/ssh/operation.vala
+@@ -84,12 +84,12 @@ public abstract class Operation : GLib.Object {
+ 
+         // And off we go to run the program
+         var subprocess = launcher.spawnv(args);
+-        string? stdout = null, stderr = null;
++        string? std_out = null, std_err = null;
+         try {
+-            yield subprocess.communicate_utf8_async(input, cancellable, out stdout, out stderr);
+-            return stdout;
++            yield subprocess.communicate_utf8_async(input, cancellable, out std_out, out std_err);
++            return std_out;
+         } catch (GLib.Error e) {
+-            Seahorse.Util.show_error(null, this.prompt_title, stderr);
++            Seahorse.Util.show_error(null, this.prompt_title, std_err);
+             throw e;
+         }
+     }
+@@ -221,10 +221,10 @@ public class PrivateImportOperation : Operation {
+ 
+         // Start command to generate public key
+         string cmd = "%s -y -f '%s'".printf(Config.SSH_KEYGEN_PATH, file);
+-        string stdout = yield operation_async(cmd, null, cancellable);
++        string std_out = yield operation_async(cmd, null, cancellable);
+ 
+         // We'll build the key string from the output
+-        var key_str = new StringBuilder(stdout);
++        var key_str = new StringBuilder(std_out);
+ 
+         // Only use the first line of the output
+         int pos = int.max(key_str.str.index_of_char('\n'), key_str.str.index_of_char('\r'));
+@@ -232,7 +232,7 @@ public class PrivateImportOperation : Operation {
+             key_str.erase(pos);
+ 
+         // Parse the data so we can get the fingerprint
+-        KeyData? keydata = KeyData.parse_line(stdout);
++        KeyData? keydata = KeyData.parse_line(std_out);
+ 
+         // Add the comment to the output
+         if (data.comment != null) {
+-- 
+GitLab
+
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 29ea1021534e..be8ba454b4a8 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,18 +1,18 @@
 # Template file for 'seahorse'
 pkgname=seahorse
-version=41.0
-revision=2
+version=43.0
+revision=1
 build_style=meson
 build_helper=gir
 hostmakedepends="gcr-devel gettext glib-devel gnupg itstool libsecret-devel
  openssh pkg-config vala"
 makedepends="avahi-glib-libs-devel gcr-devel gpgme-devel gtk+3-devel
  libgirepository-devel libhandy1-devel libldap-devel libsecret-devel
- libsoup-devel libpwquality-devel"
+ libsoup3-devel libpwquality-devel"
 depends="hicolor-icon-theme desktop-file-utils gcr>=3.14 gnupg>=2 openssh"
 short_desc="GNOME application for managing encryption keys"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/seahorse"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e6eec09e810448295f547f18c1d5772b65c3edc1d9e5a2595f10b5dde68929f5
+distfiles="${GNOME_SITE}/seahorse/${version%.*}/seahorse-${version}.tar.xz"
+checksum=5b1d1bfba74f3658227f3c82e296f330dd0fcd1ef4636b6a218228fee5ea832d

From b6e5c369d80ae47979146b9cda73c0dc9ddc154c Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Mon, 2 Jan 2023 12:28:02 +0100
Subject: [PATCH 098/114] stfl: change upstream url

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

diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template
index 0d970c9d2c26..c1326ed31e89 100644
--- a/srcpkgs/stfl/template
+++ b/srcpkgs/stfl/template
@@ -8,8 +8,8 @@ makedepends="ncurses-devel"
 short_desc="Curses-based widget set for text terminals"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.clifford.at/stfl/"
-distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz"
+homepage="http://bygone.clairexen.net/stfl/"
+distfiles="http://bygone.clairexen.net/stfl/stfl-${version}.tar.gz"
 checksum=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090
 
 post_install() {

From fa088bc8bc578e55323f0d6505f44b248b90dbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 2 Jan 2023 18:46:12 +0100
Subject: [PATCH 099/114] yt-dlp: update to 2023.01.02.

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 8e50be5e7752..99e29af03748 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.11.11
+version=2023.01.02
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=51fa055912c7fc742a882ff58236bd25b39055b98168a3563ed17cc575c3c3ae
+checksum=e1d8053ea9b6c31072037edda9cfe8741b8204ab5edc8eac61f4ba8077e65247
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 7c81969c1399c1dee414f3523784a515865ce819 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 29 Dec 2022 12:45:46 +0300
Subject: [PATCH 100/114] profile-cleaner: resolve conflict with pc

Makefile shipped with the package shortens profile-cleaner to pc, thus
causing conflict with the 'pc' package.
---
 srcpkgs/profile-cleaner/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template
index 1ed480d7ebd7..823021e9cccd 100644
--- a/srcpkgs/profile-cleaner/template
+++ b/srcpkgs/profile-cleaner/template
@@ -1,7 +1,7 @@
 # Template file for 'profile-cleaner'
 pkgname=profile-cleaner
 version=2.42
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="bash sqlite bc parallel findutils"
 short_desc="Reduces profile size by cleaning their sqlite databases"
@@ -12,5 +12,12 @@ distfiles="https://github.com/graysky2/profile-cleaner/archive/v${version}.tar.g
 checksum=427d3c9aa0ab7cd1031a40e6da507027bd3ce4bc80a504a9dbeee536e864e9e1
 
 post_install() {
+	# makefile shipped with the package shortens profile-cleaner to pc,
+	# thus causing conflict with the 'pc' package.
+	unlink ${DESTDIR}/usr/bin/pc
+	mv ${DESTDIR}/usr/share/man/man1/pc.1 \
+		${DESTDIR}/usr/share/man/man1/profile-cleaner.1
+	mv ${DESTDIR}/usr/share/zsh/site-functions/_pc \
+		${DESTDIR}/usr/share/zsh/site-functions/_profile-cleaner
 	vlicense LICENSE
 }

From 5c58d010cebb9b9d21cfa70a9b8aba7e1b9bd49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 28 Dec 2022 22:07:51 +0100
Subject: [PATCH 101/114] python3-hcloud: update to 1.18.2.

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

diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
index 49009f7c5018..88867b6ba866 100644
--- a/srcpkgs/python3-hcloud/template
+++ b/srcpkgs/python3-hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-hcloud'
 pkgname=python3-hcloud
-version=1.18.1
-revision=2
+version=1.18.2
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-future python3-dateutil"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/hetznercloud/hcloud-python"
 distfiles="${PYPI_SITE}/h/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=9e1cfd7c911c632b7bae121ed009183e01bf995d2bf3b2948ff98cd80ef4acf1
+checksum=37bd5ba56387e3c491c5babd3e08ab91d5f0390cd5e880e4dfea19e21681bc9e
 
 post_install() {
 	vlicense LICENSE

From 174c49190280d55f82fe55fb0c94e1f14b1b2e83 Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Thu, 29 Dec 2022 21:00:00 +0100
Subject: [PATCH 102/114] New package: ulozto-downloader-3.3.0

---
 srcpkgs/ulozto-downloader/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/ulozto-downloader/template

diff --git a/srcpkgs/ulozto-downloader/template b/srcpkgs/ulozto-downloader/template
new file mode 100644
index 000000000000..81a2f591b786
--- /dev/null
+++ b/srcpkgs/ulozto-downloader/template
@@ -0,0 +1,20 @@
+# Template file for 'ulozto-downloader'
+pkgname=ulozto-downloader
+version=3.3.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="tor python3-ansicolor python3-tkinter python3-requests python3-Pillow
+ python3-numpy python3-pysocks python3-stem"
+short_desc="Uloz.to quick multiple sessions downloader"
+maintainer="Emil Miler <em@0x45.cz>"
+license="MIT"
+homepage="https://github.com/setnicka/ulozto-downloader"
+changelog="https://github.com/eoyilmaz/setnicka/ulozto-downloader/releases/tag/${version}"
+distfiles="https://github.com/setnicka/ulozto-downloader/archive/refs/tags/${version}.tar.gz"
+checksum=326d2a2aa7353dd90681bf3692fb6f2ecc55c9cc5f046d77ef2b88bab4a4b228
+make_check=no # no internal test suite present
+
+post_install() {
+	vlicense LICENSE.txt LICENSE
+}

From edaa0da5c693a309f96f79e6e4935534e292ae8e Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Mon, 2 Jan 2023 11:43:22 +0100
Subject: [PATCH 103/114] Thunar: update to 4.18.1

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

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index d92eb19f33c6..7a1a841d34ca 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,6 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-version=4.18.0
+version=4.18.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=d1f4b080c97b9e390eff199aaaac7562fb20f031686f8d5ee5207e953bfc2feb
+checksum=2b0e91802ca4d5f4e25cc8a76a6c362f47d02d00b0184344945b33d0c43a3166
 
 Thunar-devel_package() {
 	depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"

From 00b99a40c951818b337342c4a9d373027e10e6b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 31 Dec 2022 17:23:01 +0100
Subject: [PATCH 104/114] .gitignore: explicitly allow paths

This prevents git from picking up masterdirs that don't happen to be
named the usual way and more custom and temporary files that should not
be tracked by git.
---
 .gitignore | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 958f644eee94..287be809543a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,18 @@
 *.swp
 *~
 \#*#
-*.o
-masterdir*
-hostdir*
-masterdir*/
-hostdir*/
+
+# exclude everything in root except files and directories from void-packages
+/*
+!/CONTRIBUTING.md
+!/COPYING
+!/Manual.md
+!/README.md
+!/common
+!/etc
+!/srcpkgs
+!/xbps-src
 etc/conf
 etc/conf.*
 etc/virtual
 etc/xbps.d/custom
-.xbps-checkvers*.plist

From f72445bcdde9df7d69f9d8ff049a8dfd84a89aff Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 20 Dec 2022 12:38:57 +0530
Subject: [PATCH 105/114] gping: update to 1.6.3.

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

diff --git a/srcpkgs/gping/template b/srcpkgs/gping/template
index 47a6a23168eb..f980c3f71d86 100644
--- a/srcpkgs/gping/template
+++ b/srcpkgs/gping/template
@@ -1,6 +1,6 @@
 # Template file for 'gping'
 pkgname=gping
-version=1.6.1
+version=1.6.3
 revision=1
 build_wrksrc="gping"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="icp <pangolin@vivaldi.net>"
 license="MIT"
 homepage="https://github.com/orf/gping/"
 distfiles="https://github.com/orf/gping/archive/refs/tags/gping-v${version}.tar.gz"
-checksum=f27dc8aadd7f323861e8700d47efd13199f924fe0b2e20fef1f537bed01c1454
+checksum=ed55d87d04482a137e1d56355095f56fb4977724032245e3547206274966c1c5
 
 post_install() {
 	vlicense ../LICENSE

From 941e82b9c50a5ca97e3dbb9422add7254c0e97b7 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 20 Dec 2022 15:38:33 +0530
Subject: [PATCH 106/114] usql: update to 0.13.3.

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

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 255b3f80eab7..1521f2afbf40 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
 # Template file for 'usql'
 pkgname=usql
-version=0.13.1
+version=0.13.3
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="MIT"
 homepage="https://github.com/xo/usql"
 distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=ec19e8ce838f11b43acc0ba46cf193b561e894608e7e7addf29936a8e76e9057
+checksum=1a8cc27eab43597d41b09c3ad779ac4599531dffb93e0f4d5a8498166caf58ce
 
 post_install() {
 	vlicense LICENSE

From c69af6d3de0d68fc913d9d94130c3dfa48db78eb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Dec 2022 11:11:16 +0200
Subject: [PATCH 107/114] libdeflate: update to 1.15.

Also:
- change build system to cmake (upstream change)
---
 srcpkgs/libdeflate/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libdeflate/template b/srcpkgs/libdeflate/template
index fc3eb24cf513..055d0069aa55 100644
--- a/srcpkgs/libdeflate/template
+++ b/srcpkgs/libdeflate/template
@@ -1,9 +1,8 @@
 # Template file for 'libdeflate'
 pkgname=libdeflate
-version=1.12
+version=1.15
 revision=1
-build_style=gnu-makefile
-make_build_args="PROG_SUFFIX=libdeflate"
+build_style=cmake
 checkdepends="zlib-devel"
 short_desc="Optimized library for DEFLATE/zlib/gzip (de)compression"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -11,7 +10,7 @@ license="MIT"
 homepage="https://github.com/ebiggers/libdeflate"
 changelog="https://raw.githubusercontent.com/ebiggers/libdeflate/master/NEWS.md"
 distfiles="https://github.com/ebiggers/libdeflate/archive/refs/tags/v${version}.tar.gz"
-checksum=ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06
+checksum=58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b
 
 post_install() {
 	vlicense COPYING
@@ -25,5 +24,6 @@ libdeflate-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "/usr/lib/pkgconfig"
+		vmove "/usr/lib/cmake"
 	}
 }

From 18829c1f225fabfeab55d230113ca6336deb3a69 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 11 Dec 2022 11:11:23 +0200
Subject: [PATCH 108/114] notcurses: update to 3.0.9.

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

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 724e7b7f2475..6dd8a091319f 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=3.0.8
+version=3.0.9
 revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://nick-black.com/dankwiki/index.php/Notcurses"
 changelog="https://raw.githubusercontent.com/dankamongmen/notcurses/master/NEWS.md"
 distfiles="https://github.com/dankamongmen/notcurses/archive/v${version}.tar.gz"
-checksum=56c33ffe2a2bc4d0b6e3ac14bdf620cf41e3293789135f76825057d0166974fd
+checksum=e5cc02aea82814b843cdf34dedd716e6e1e9ca440cf0f899853ca95e241bd734
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From d839000d49ece1899da7ac9c18a2af29358081aa Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Tue, 13 Dec 2022 17:49:59 +0100
Subject: [PATCH 109/114] kitty: update to 0.26.5.

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

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..717f6ca2fda7 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.26.3
-revision=2
+version=0.26.5
+revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=e86f06da696fce7d6e5822bd82198abdd5d94dbebd5eaacbd3a7b4f6001342f9
+checksum=5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 

From 477631a186b7569944d2b509fa2920f97035cf0d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 8 Dec 2022 15:58:12 +0530
Subject: [PATCH 110/114] uni: update to 2.5.1.

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

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 20e014acfd08..3486e43b6877 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,16 +1,20 @@
 # Template file for 'uni'
 pkgname=uni
-version=2.2.1
+version=2.5.1
 revision=1
 build_style=go
-go_import_path=arp242.net/uni/v2
+go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"
 short_desc="Query the Unicode database from the CLI, with good support for emojis"
 maintainer="Martin Tournoij <martin@arp242.net>"
 license="MIT"
 homepage="https://github.com/arp242/uni"
-distfiles="https://github.com/arp242/uni/archive/v${version}.tar.gz"
-checksum=f6ec48009618d678f635e22600a1eac19560de99a62bfded9ad9859208e3fbde
+distfiles="https://github.com/arp242/uni/archive/refs/tags/v${version}.tar.gz"
+checksum=806fbba66efaa45cd5691efcd8457ba8fe88d3b2f6fd0b027f1e6ef62253d6fb
+
+do_check() {
+	go test ./...
+}
 
 post_install() {
 	vlicense LICENSE

From 2393848e233a82caa0395505af51c53ff7b7ffb5 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Thu, 10 Nov 2022 17:16:34 +0600
Subject: [PATCH 111/114] crun: update to 1.7.2.

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

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 6b9e98a51d60..5c2f41607f4c 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.6
+version=1.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=d6b100d22b718a8d490c2725935d202843becb24caf830b88119cfaff630c0ce
+checksum=f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From e28085775e3fbfcc0d452eefd543df4e13d22ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 28 Dec 2022 22:12:56 +0100
Subject: [PATCH 112/114] python3-subprocess-tee: update to 0.4.1.

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

diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template
index 77dc6153e221..807e3eac6520 100644
--- a/srcpkgs/python3-subprocess-tee/template
+++ b/srcpkgs/python3-subprocess-tee/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-subprocess-tee'
 pkgname=python3-subprocess-tee
-version=0.4.0
+version=0.4.1
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -10,12 +10,12 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/pycontribs/subprocess-tee"
 distfiles="${PYPI_SITE}/s/subprocess-tee/subprocess-tee-${version}.tar.gz"
-checksum=7ea885ff32cdb2b2d3b2a6c464492f2ee1ebbf324e50598d75de4f6f3ea0f149
+checksum=b3c124993f8b88d1eb1c2fde0bc2069787eac720ba88771cba17e8c93324825d
 # requires molecule, which isn't packaged yet
 make_check=no
 
 post_patch() {
-	vsed -e "/setuptools_scm_git_archive/d" -e "/pip/d" -i pyproject.toml
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
 }
 
 post_install() {

From 11076947699f90b394e92a1ac0024226169fd47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 28 Dec 2022 21:37:50 +0100
Subject: [PATCH 113/114] git-cliff: update to 1.0.0.

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

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index a5be7074cad5..32e0eb7357a0 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,6 +1,6 @@
 # Template file for 'git-cliff'
 pkgname=git-cliff
-version=0.10.0
+version=1.0.0
 revision=1
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/orhun/git-cliff"
 changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=c77b7b38edae80b3a66c96f15d0bc3eaaa0bc55e1d3fbc8187c55070306188c1
+checksum=57321d1b1787f601b76347bcc981fbaf7d6a923a6fc1191a5360b6d72079186d
 
 post_install() {
 	vdoc README.md

From e98eadc122830db2fa41e2cf9e4a393dba2e1245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 28 Dec 2022 20:16:35 +0100
Subject: [PATCH 114/114] cargo-edit: update to 0.11.7.

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

diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 9ed63d29272a..622677f94b6e 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-edit'
 pkgname=cargo-edit
-version=0.11.6
+version=0.11.7
 revision=1
 archs="x86_64* i686* aarch64* arm*" # uses ring
 build_style=cargo
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/killercup/cargo-edit"
 changelog="https://raw.githubusercontent.com/killercup/cargo-edit/master/CHANGELOG.md"
 distfiles="https://github.com/killercup/cargo-edit/archive/v${version}.tar.gz"
-checksum=3110b5ffa65ac958aa0c5fa2b4c69db967d2fc18a71de1a598153b4c22c302e0
+checksum=73b3300afda280685be2a2391d5238aea341c2e15ac95ab288fa0f5ad38137fb
 
 post_install() {
 	vlicense LICENSE

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

* Re: [PR PATCH] [Closed]: ejabberd 22.10 update
  2023-01-01 19:48 [PR PATCH] ejabberd 22.10 update wereket
                   ` (3 preceding siblings ...)
  2023-01-02 21:23 ` [PR PATCH] [Updated] " wereket
@ 2023-01-02 21:24 ` wereket
  4 siblings, 0 replies; 6+ messages in thread
From: wereket @ 2023-01-02 21:24 UTC (permalink / raw)
  To: ml

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

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

ejabberd 22.10 update
https://github.com/void-linux/void-packages/pull/41396

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

end of thread, other threads:[~2023-01-02 21:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-01 19:48 [PR PATCH] ejabberd 22.10 update wereket
2023-01-01 19:56 ` [PR REVIEW] " paper42
2023-01-01 19:57 ` paper42
2023-01-01 19:57 ` paper42
2023-01-02 21:23 ` [PR PATCH] [Updated] " wereket
2023-01-02 21:24 ` [PR PATCH] [Closed]: " wereket

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