Merge remote-tracking branch 'origin/3.6' into 3.7

gtk3/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Vbvc09tNDvXeWX/6vqJWLztm9IiVniC5uW6Ws1FlbBR4d28gwnnT/oafMW2DWqO0kfTyqaLG5RVtfaTJontEwY=
-SHA256 (Pkgfile) = 1cb86f4a8ac5b5d03297c3a3e8a6d2a96414f8c7646e3e5d61cd2860a0090775
+RWSE3ohX2g5d/X1LH9D0ZkVDsbJ8sgegQNiTw1mxC/6mBYsiDd7dmOTLAjah+FY9FBG5BBQOj/gr92ntGF+yLol4xBzBVtNawAM=
+SHA256 (Pkgfile) = 558b24f5d382d0ada1480898212eb9f7496329db36e8d722e1d2a4f01a66d339
 SHA256 (.footprint) = a99a910ed137e5fc62ffc76b152e63c844a24b8b9df4535763d380eee835d069
-SHA256 (gtk+-3.24.33.tar.xz) = 588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801
+SHA256 (gtk+-21eb3b2a6c7828cbbe44df4bf8d5ee812bdb0094.tar.bz2) = f3cf71dccdc45fbd8e1e277298a8b3c2087681f1d7bfb06a2fc93cd0f565ad55
 SHA256 (gtk-register-3.sh) = ee9fab456cb6bc816e55ebaa61d095ead47eb1ed6a25eee85f21509fa4e40374
 SHA256 (gtk.immodules) = 1d7ed9a4110e57e6c0caf3daa376007cb4926d205e8165fa3de7c2fa83243f67

gtk3/Pkgfile

@@ -6,16 +6,21 @@
 
 name=gtk3
 version=3.24.33
-release=1
-source=(https://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz
-	gtk-register-3.sh gtk.immodules)
+release=2
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/4790
+# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4562
+_commit=21eb3b2a6c7828cbbe44df4bf8d5ee812bdb0094
+#source=(https://download.gnome.org/sources/gtk+/${version:0:4}/gtk+-$version.tar.xz
+source=(https://gitlab.gnome.org/GNOME/gtk/-/archive/$_commit/gtk+-$_commit.tar.bz2
+  gtk-register-3.sh gtk.immodules)
 
 build () {
 	prt-get isinst colord || PKGMK_GTK3+=' -Dcolord=no'
 	prt-get isinst libxkbcommon wayland-protocols && PKGMK_GTK3+=' -D wayland_backend=true' || PKGMK_GTK3+=' -Dwayland_backend=false'
 
 	CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
-	meson setup gtk+-$version build $PKGMK_GTK3 \
+#	meson setup gtk+-$version build $PKGMK_GTK3 \
+	meson setup gtk-$_commit build $PKGMK_GTK3 \
 		--prefix=/usr \
 		-D buildtype=plain \
 		--wrap-mode=nodownload \

libgcrypt/.footprint

@@ -9,9 +9,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgcrypt.a
 -rwxr-xr-x	root/root	usr/lib/libgcrypt.la
-lrwxrwxrwx	root/root	usr/lib/libgcrypt.so -> libgcrypt.so.20.4.0
-lrwxrwxrwx	root/root	usr/lib/libgcrypt.so.20 -> libgcrypt.so.20.4.0
--rwxr-xr-x	root/root	usr/lib/libgcrypt.so.20.4.0
+lrwxrwxrwx	root/root	usr/lib/libgcrypt.so -> libgcrypt.so.20.4.1
+lrwxrwxrwx	root/root	usr/lib/libgcrypt.so.20 -> libgcrypt.so.20.4.1
+-rwxr-xr-x	root/root	usr/lib/libgcrypt.so.20.4.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libgcrypt.pc
 drwxr-xr-x	root/root	usr/share/

libgcrypt/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Vj9H/iAmIaAXZd67zs3tKyGWi5BvgaoYWcWFmqANQZsh8lW7YLr7jjpef4yOTZqtoJ1cwqbUpYVxR2FSQ1NDgk=
-SHA256 (Pkgfile) = 7fd0205f1d41b9a4645739fbbd9328a2bbfc97e02515447af264761cc70cae13
-SHA256 (.footprint) = abbc4eac0fc30f0789f08db98cf40627b034e133e1e590f7dd4e9ed89cb3edd0
-SHA256 (libgcrypt-1.10.0.tar.bz2) = 6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81
+RWSE3ohX2g5d/YUKnkF5hr7B3FqRoS3KP3ZgHmu7ZnXuCo/CVPHPFL1TyTzyLrQxNxmj6ETFDF/sJ3wzd9qlTgMTnZD1l/yxUQE=
+SHA256 (Pkgfile) = 8767b885814f703e9493f241b0cf805bc46a85020744f4a87aa73ef165830770
+SHA256 (.footprint) = 447eae2489a38113bd5a6c09c3d6e9acaccc9391e3af91513d687ac3f08e273c
+SHA256 (libgcrypt-1.10.1.tar.bz2) = ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de

libgcrypt/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: libgpg-error
 
 name=libgcrypt
-version=1.10.0
+version=1.10.1
 release=1
 source=(https://www.gnupg.org/ftp/gcrypt/libgcrypt/$name-$version.tar.bz2)