Upstream 3.24.42

2 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38f532282f62..9794f3b46a40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = gtk3-classic
 	pkgdesc = Patched GTK+3 that provides a more classic experience
-	pkgver = 3.24.41
+	pkgver = 3.24.42
 	pkgrel = 1
 	url = https://github.com/lah7/gtk3-classic
 	install = gtk3.install
 	arch = x86_64
 	license = LGPL-2.0-only
-	makedepends = adwaita-icon-theme
-	makedepends = at-spi2-atk
+	makedepends = at-spi2-core
 	makedepends = atk
 	makedepends = cairo
 	makedepends = cantarell-fonts
@@ -17,6 +16,7 @@ pkgbase = gtk3-classic
 	makedepends = git
 	makedepends = gobject-introspection
 	makedepends = gtk-update-icon-cache
+	makedepends = hicolor-icon-theme
 	makedepends = libcups
 	makedepends = libegl
 	makedepends = libepoxy
@@ -37,7 +37,6 @@ pkgbase = gtk3-classic
 	makedepends = shared-mime-info
 	makedepends = wayland
 	makedepends = wayland-protocols
-	depends = at-spi2-atk
 	depends = atk
 	depends = cairo
 	depends = desktop-file-utils
@@ -61,9 +60,9 @@ pkgbase = gtk3-classic
 	optdepends = colord: color management support
 	optdepends = dconf: default GSettings backend
 	optdepends = libcups: printer support in print dialog
-	provides = gtk3=3.24.41
-	provides = gtk3-typeahead=3.24.41
-	provides = gtk3-mushrooms=3.24.41
+	provides = gtk3=3.24.42
+	provides = gtk3-typeahead=3.24.42
+	provides = gtk3-mushrooms=3.24.42
 	provides = gtk3-print-backends
 	provides = libgtk-3.so
 	provides = libgdk-3.so
@@ -74,12 +73,12 @@ pkgbase = gtk3-classic
 	conflicts = gtk3-nocsd
 	conflicts = gtk3-nocsd-git
 	conflicts = gtk3-nocsd-legacy-git
-	source = git+https://github.com/lah7/gtk3-classic.git#commit=c0af0886c1e9d3c66e03e57c8084fb2c2259f3e2
-	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.tar.xz
-	source = gtk-query-immodules-3.0.hook::https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/raw/e0b04924de3fb69bdc60fc1f7f322b0bc5ce1802/gtk-query-immodules-3.0.hook
+	source = git+https://github.com/lah7/gtk3-classic.git#commit=83313fe74b0611d59099871941441ff7d8b74bb6
+	source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.tar.xz
+	source = gtk-query-immodules-3.0.hook::https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/raw/e6dc1b0abce1d021ea3cec2f8c0d3fdf93cd0b87/gtk-query-immodules-3.0.hook
 	source = settings.ini
-	sha256sums = SKIP
-	sha256sums = 47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa
+	sha256sums = 738383c7dccc345c71c8018ff64651dcf410be9c554918e7c27fd5a8cd3107d9
+	sha256sums = 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2
 	sha256sums = a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 
diff --git a/PKGBUILD b/PKGBUILD
index 8df4fbde51a7..0c87374ec23d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
 # This file is based on original PKGBUILD of GTK3 package.
 # https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/commits/main
 
-__arch_pkg_commit="e0b04924de3fb69bdc60fc1f7f322b0bc5ce1802"
-_gtkver=3.24.41
+__arch_pkg_commit="e6dc1b0abce1d021ea3cec2f8c0d3fdf93cd0b87"
+_gtkver=3.24.42
 
-_gtk3_classic_commit="c0af0886c1e9d3c66e03e57c8084fb2c2259f3e2"
+_gtk3_classic_commit="83313fe74b0611d59099871941441ff7d8b74bb6"
 
 pkgbase=gtk3-classic
 pkgname=($pkgbase)
@@ -22,7 +22,6 @@ provides=(gtk3=$_gtkver gtk3-typeahead=$_gtkver gtk3-mushrooms=$_gtkver gtk3-pri
 arch=(x86_64)
 license=(LGPL-2.0-only)
 depends=(
-	at-spi2-atk
 	atk
 	cairo
 	desktop-file-utils
@@ -49,10 +48,8 @@ optdepends=(
 	'dconf: default GSettings backend'
 	'libcups: printer support in print dialog'
 )
-
 makedepends=(
-	adwaita-icon-theme
-	at-spi2-atk
+	at-spi2-core
 	atk
 	cairo
 	cantarell-fonts
@@ -62,6 +59,7 @@ makedepends=(
 	git
 	gobject-introspection
 	gtk-update-icon-cache
+	hicolor-icon-theme
 	libcups
 	libegl
 	libepoxy
@@ -91,8 +89,8 @@ source=(
 	"gtk-query-immodules-3.0.hook::https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/raw/$__arch_pkg_commit/gtk-query-immodules-3.0.hook"
 	settings.ini
 )
-sha256sums=('SKIP'
-            '47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa'
+sha256sums=('738383c7dccc345c71c8018ff64651dcf410be9c554918e7c27fd5a8cd3107d9'
+            '50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2'
             'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')