Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP]: GNOME 43
Date: Tue, 22 Nov 2022 22:11:44 +0100	[thread overview]
Message-ID: <20221122211144.ZlXRWkfGn3Pph4KBYPHtnx-WZ6G-KR6e10VPW4euQaA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39513@inbox.vuxu.org>

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

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

https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513

[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->

very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.

[ci skip]

depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
<!--
#### 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/39513.patch is attached

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

From be19f5f36a7d2dbd0c5f574ed00fe7ac9ea991b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 01/33] gjs: update to 1.74.0.

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

diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 682a4f72e419..1ddc35a718fc 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,12 +1,12 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.72.2
+version=1.74.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
 configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel"
+makedepends="dbus-glib-devel mozjs102-devel readline-devel sysprof-devel"
 checkdepends="xvfb-run cantarell-fonts"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-42/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ddee379bdc5a7d303a5d894be2b281beb8ac54508604e7d3f20781a869da3977
+checksum=7d6418af62cc73556ab2c25b4adf67f45238ab8925888f7a57251359d4ebed1e
 make_check_pre="xvfb-run"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -32,7 +32,7 @@ post_install() {
 }
 
 gjs-devel_package() {
-	depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}"
+	depends="libgirepository-devel mozjs102-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 451c35bc173f82f484a975d926381b45d5746773 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 02/33] New package: gcr4-4.0.0

---
 common/shlibs         |  2 ++
 srcpkgs/gcr4-devel    |  1 +
 srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
 srcpkgs/gcr4/update   |  1 +
 4 files changed, 47 insertions(+)
 create mode 120000 srcpkgs/gcr4-devel
 create mode 100644 srcpkgs/gcr4/template
 create mode 100644 srcpkgs/gcr4/update

diff --git a/common/shlibs b/common/shlibs
index 37895879b1ba..0338579188c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1036,6 +1036,8 @@ libudisks2.so.0 udisks2-1.93.0_1
 libgcr-base-3.so.1 gcr-3.3.92_1
 libgck-1.so.0 gcr-3.8.0_1
 libgcr-ui-3.so.1 gcr-3.8.0_1
+libgck-2.so.0.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.0_1
 libcld2.so cld2-0.0.1.20150821_1
 libcld2_full.so cld2-full-0.0.1.20150821_1
 libwacom.so.2 libwacom-0.3_1
diff --git a/srcpkgs/gcr4-devel b/srcpkgs/gcr4-devel
new file mode 120000
index 000000000000..e85b363d95de
--- /dev/null
+++ b/srcpkgs/gcr4-devel
@@ -0,0 +1 @@
+gcr4
\ No newline at end of file
diff --git a/srcpkgs/gcr4/template b/srcpkgs/gcr4/template
new file mode 100644
index 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+configure_args="$(vopt_bool gir introspection) $(vopt_bool gir gtk_doc)"
+hostmakedepends="gettext glib-devel gnupg gi-docgen gettext pkg-config openssh
+ libxslt $(vopt_if gir vala)"
+makedepends="libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel gtk4-devel"
+depends="desktop-file-utils hicolor-icon-theme gnupg"
+checkdepends="dbus"
+short_desc="GNOME crypto package"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gcr"
+changelog="https://gitlab.gnome.org/GNOME/gcr/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
+checksum=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+	rm ${DESTDIR}/usr/libexec/gcr-ssh-agent
+}
+
+gcr4-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/doc
+			vmove usr/share/vala
+		fi
+	}
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"

From 2e6f2ba2db011656de4954b1e6374d2151a1387b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 03/33] mutter: update to 43.0.

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

diff --git a/common/shlibs b/common/shlibs
index 0338579188c7..15f873d92491 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2978,10 +2978,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.rc_1
+libmutter-clutter-11.so.0 mutter-43.rc_1
+libmutter-cogl-11.so.0 mutter-43.rc_1
+libmutter-cogl-pango-11.so.0 mutter-43.rc_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 1861675a621e..dd6e4aac5600 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=42.4
+version=43.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,9 +20,9 @@ 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=c22c7fa3d187061dbf280c3850e118b7b5009065d01de31616acd500c4982a40
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+checksum=8d9ba528ed99ef6799642e147b3fe9f2bcbeca9beced2845c1cadb331cd3e525
+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 0f22187eab314b594771aeac212e7550e912ad17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 04/33] gnome-shell: update to 43.0.

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

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 886d388d8aba..144e7da1aa65 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,17 +1,17 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=42.4
+version=43.0
 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"
@@ -21,7 +21,7 @@ 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"
 distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=875ff2970ea9fb7a05506e32a0d50dc917f41b4ca37134b41377f9c82873c54e
+checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

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

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

diff --git a/common/shlibs b/common/shlibs
index 15f873d92491..b7c5a1335b2f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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..a6fc89cfdb1d 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,26 +1,26 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.44.4
+version=3.46.0
 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=e5fa28095a183f7ab5a928e35a828379b481ddef83ed4c7b51a2e3c4aef5cdab
 
 build_options="gir"
 build_options_default="gir"
@@ -36,7 +36,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 1b69a79d914f29fa2140ac4ddad4131baa2c24e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/33] evolution: update to 3.46.0.

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

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 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.0
+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=e09e9276bc6b9abf0dad3a4e813eea1d025f4f6aaf1fac3b7b0f88895742913f
 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 72ae36c488abe2730bd16e79bef0cdef214f5cb6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/33] sushi: update to 43.0.

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

diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..530d5eac4a2a 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,20 @@
 # 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
  $(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 libmusicbrainz5-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
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
 lib32disabled=yes
 
 build_options="gir"

From 650fac08480d4c79c49956e035f39bfeaa46344f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/33] evolution-ews: update to 3.46.0.

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

diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..9cc0b9809f69 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.0
 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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+checksum=bd97ba205cc45bad12997bee1348a2f91d8b02d714583d79f4fae1794dac1b80

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

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..acc873462be6 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"

From 28c096cd01cbd81c79b5b96eaec288ca2b2a98a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/33] 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 7f57da942d3f4edac1f2049a0aabcd6a319e8105 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/33] gnome-control-center: update to 43.0.

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

diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..d6a5662e0b58 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
-version=42.3
+version=43.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -23,7 +23,7 @@ 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
+checksum=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
 make_check=no # needs X11 and requires altered filesystem
 
 pre_build() {

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

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 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="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
 
 conf_files="
 	/etc/gdm/custom.conf

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

---
 srcpkgs/gnome-session/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..af3335442a04 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>"
 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
-}
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2

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

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

diff --git a/common/shlibs b/common/shlibs
index b7c5a1335b2f..07f7dc0fea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1138,10 +1138,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 d157e14baffb..0622908753aa 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.4
+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
@@ -15,9 +15,10 @@ short_desc="GNOME desktop management utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
+#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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1ce2c9d5067969dbe0b282ea5a9acfb8698751f03cd07e2c730240f85dc9ad25
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
 
 build_options="gir"
 build_options_default="gir"

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

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
@@ -20,7 +20,7 @@ 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
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
 CFLAGS="-UG_DISABLE_ASSERT"
 
 if [ "$CROSS_BUILD" ]; then

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

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

diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..4ee3cbced47f 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
 version=42.0
-revision=2
+revision=3
 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

From 9659c05c334a4612d63c1fd7092449b45862052b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/33] cheese: update to 43.alpha.

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

diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 066828c02207..8842089b11ec 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=41.1
+version=43.alpha
 revision=1
 build_style=meson
 build_helper="gir"
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Cheese"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547
+checksum=badae9f7bda6fa5721dab7a08b8237a75e5325c0c9a669498ff54f772146e4cf
 
 build_options="gir gtk_doc"
 build_options_default="gir"

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

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

diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-calendar'
 pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
  $(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
+#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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+checksum=09e5c0f9360f3f856deaa7c0db30f5dab0151180df4183807c6cf3602992f5cc
 
 build_options="gir"
 build_options_default="gir"

From 61dda9f7d2ec99fce98bd5f903e4192af00af6cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/33] 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 0b7aae2e9efc..83ea29b5a485 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
 # Template file for 'eog'
 pkgname=eog
 version=43.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 15fcc9cc78dfd512a9d5de8abdb214d372f70096 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/33] 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 730fb3c5f6d1..43ab670861c9 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
 # Template file for 'evince'
 pkgname=evince
 version=43.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)

From c19eda61a66b094bc99898f8f1c4c2241dad836d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/33] 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 79a0c5adfa438bdc5e84e086748873935ca5a416 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 22/33] nautilus: revbump for gnome-desktop 43

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

diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index 571013b24c7d..ea8f2ad81d47 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,7 +1,7 @@
 # Template file for 'nautilus'
 pkgname=nautilus
 version=42.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)"

From 5cbae35fc21604969e4c45773526fb5c4c80b4f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 23/33] gnome-clocks: update to 42.0.

---
 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 9197dbbcbd46..7ce5da3a10cb 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
 version=42.0
-revision=2
+revision=3
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel vala

From 02cc371312b724554769901edb2af8371d276e93 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 24/33] nautilus: update to 43.0.

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

diff --git a/common/shlibs b/common/shlibs
index 07f7dc0fea0a..6bebe3b6402e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,15 +1,15 @@
 # Template file for 'nautilus'
 pkgname=nautilus
-version=42.2
-revision=2
+version=43.0
+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"
+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"
@@ -19,7 +19,7 @@ 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
+checksum=3cf54fac0a8abee090e155417f7b16f63ea0ac0c264ef4f54574af345801a911
 # tests timeout:
 # 11/11 test-nautilus-search-engine-tracker            TIMEOUT        480.00s
 make_check=extended
@@ -40,7 +40,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 b6e0fbdd331c80f4ce04c663731dad47acabf605 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 25/33] 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 43ab670861c9..7ffa8e3a33b0 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
 # Template file for 'evince'
 pkgname=evince
 version=43.0
-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 11a2507810ba90ae26620e565aa3ef932931658e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 26/33] file-roller: revbump for nautilus 43

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

diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..0c929aa19e70 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,7 +1,7 @@
 # Template file for 'file-roller'
 pkgname=file-roller
 version=3.42.0
-revision=1
+revision=3
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel

From adcc675eb42b2118c6dbcb2b2d438e1b1d63a547 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 27/33] 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..f936f384468e 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"
+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 30258e2bbfc7b991fc5ecbf0e05210ea2c9b6f5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 28/33] gnome-console: update to 43.0.

console nautilus plugin is now included in nautilus
---
 srcpkgs/gnome-console/template | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..3b3d80f4f538 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>"
 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 0dd15200d7e298f71425ddd1350bb8762069d560 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 29/33] libgweather: update to 4.2.0.

---
 .../patches/fix-cross-introspection.patch     | 14 -----
 ...metar-test-dont-use-known-duplicates.patch | 51 -------------------
 srcpkgs/libgweather/template                  | 11 ++--
 3 files changed, 6 insertions(+), 70 deletions(-)
 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/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..36b51d9945fa 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)
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ json-glib-devel $(vopt_if gir vala)
  $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
 depends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 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 604a845441b6024b1fe6c2c8598c38f3595485aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 30/33] geary: update to 43.0.

---
 srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
 srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
 srcpkgs/geary/template                 | 13 +++++----
 3 files changed, 7 insertions(+), 71 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..79642f2195bd 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
+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 fcfdf2f57e4af67bf54f111231decc6bef6dabe9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 31/33] gnome-initial-setup: update to 43.0.

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

diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-initial-setup'
 pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.0
+revision=1
 build_style=meson
 configure_args="-Dparental_controls=disabled -Dsystemd=false"
 hostmakedepends="pkg-config glib-devel gettext"
@@ -9,8 +9,8 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
  gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-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>"
@@ -18,4 +18,4 @@ 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=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955

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

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

diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
 version=0.3.14
 revision=2
 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 8ce21e5313bf4b12b1499d0ba049e9d0565b75d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Nov 2022 22:09:44 +0100
Subject: [PATCH 33/33] gnome-console: update to 43.0.

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

diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 3b3d80f4f538..c041023d594b 100644
--- a/srcpkgs/gnome-console/template
+++ b/srcpkgs/gnome-console/template
@@ -9,7 +9,7 @@ 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-43/NEWS"

  parent reply	other threads:[~2022-11-22 21:11 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-28 21:39 [PR PATCH] " paper42
2022-09-28 22:10 ` [PR PATCH] [Updated] " paper42
2022-09-28 22:47 ` paper42
2022-09-28 22:57 ` [PR REVIEW] " oreo639
2022-09-28 22:57 ` oreo639
2022-09-28 23:15 ` paper42
2022-09-28 23:29 ` oreo639
2022-09-29  1:41 ` oreo639
2022-09-29 15:48 ` [PR PATCH] [Updated] " paper42
2022-09-29 15:48 ` [PR REVIEW] " paper42
2022-09-29 15:48 ` paper42
2022-09-30 20:17 ` [PR PATCH] [Updated] " paper42
2022-10-12 10:04 ` paper42
2022-10-26 19:06 ` paper42
2022-11-03 21:38 ` [PR REVIEW] " oreo639
2022-11-03 21:38 ` oreo639
2022-11-22 19:17 ` oreo639
2022-11-22 19:19 ` oreo639
2022-11-22 21:11 ` paper42 [this message]
2022-11-22 21:54 ` [PR PATCH] [Updated] " paper42
2022-11-23  1:38 ` [PR REVIEW] " oreo639
2022-11-23  1:39 ` oreo639
2022-11-23  1:59 ` oreo639
2022-11-23  2:00 ` oreo639
2022-11-23  2:01 ` oreo639
2022-11-23  6:04 ` oreo639
2022-11-23  6:04 ` oreo639
2022-11-23 17:39 ` oreo639
2022-11-23 20:08 ` [PR PATCH] [Updated] " paper42
2022-12-02  7:27 ` oreo639
2022-12-02  7:27 ` oreo639
2022-12-09 17:32 ` [PR PATCH] [Updated] " paper42
2022-12-11 20:53 ` paper42
2022-12-11 21:00 ` paper42
2022-12-11 21:53 ` paper42
2022-12-13 20:00 ` paper42
2022-12-15 16:39 ` paper42
2022-12-15 17:09 ` paper42
2022-12-15 19:48 ` paper42
2022-12-15 20:13 ` paper42
2022-12-15 20:54 ` paper42
2023-01-01 20:26 ` paper42
2023-01-01 21:32 ` paper42
2023-01-01 22:29 ` paper42
2023-01-01 23:17 ` [PR REVIEW] " oreo639
2023-01-02  8:03 ` [PR PATCH] [Updated] " paper42
2023-01-02  8:07 ` paper42
2023-01-02 10:51 ` [PR REVIEW] " paper42
2023-01-02 10:52 ` paper42
2023-01-02 10:52 ` [PR PATCH] [Closed]: " paper42
2023-01-02 14:03 ` motorto
2023-01-03 21:46 ` thegarlynch
2023-01-04 14:51 ` paper42
2023-01-09  4:46 ` thegarlynch
2023-01-09  4:46 ` thegarlynch
2023-01-09  4:47 ` thegarlynch
2023-01-10 17:57 ` lane-brain
2023-01-10 18:00 ` JamiKettunen
2023-01-10 18:09 ` lane-brain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221122211144.ZlXRWkfGn3Pph4KBYPHtnx-WZ6G-KR6e10VPW4euQaA@z \
    --to=paper42@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).