community/glew/APKBUILD

@@ -17,6 +17,11 @@ source="https://downloads.sourceforge.net/glew/glew-$pkgver.tgz
 	"
 replaces="mesa-dev"
 
+prepare() {
+	default_prepare
+	update_config_guess
+}
+
 build() {
 	make \
 		STRIP= \

community/gnome-session/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: team/gnome <ablocorrea@hotmail.com>
 pkgname=gnome-session
 pkgver=45.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GNOME session manager"
 url="https://gitlab.gnome.org/GNOME/gnome-session"
 arch="all"
@@ -38,7 +38,7 @@ build() {
 	abuild-meson \
 		-Db_lto=true \
 		-Dsystemd_journal=true \
-		-Dsystemd_session=disable \
+		-Dsystemd_session=enable \
 		-Dsystemduserunitdir=/DELETEME \
 		. output
 	meson compile -C output

community/goimapnotify/APKBUILD

@@ -16,6 +16,13 @@ export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
 export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
 export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
 
+prepare() {
+	default_prepare
+	go get -u golang.org/x/sys@v0.6.0
+	go get -u golang.org/x/net@v0.6.0
+	go mod tidy
+}
+
 build() {
 	export CGO_CPPFLAGS="$CPPFLAGS"
 	export CGO_CFLAGS="$CFLAGS"
@@ -23,11 +30,6 @@ build() {
 	export CGO_LDFLAGS="$LDFLAGS"
 	export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw"
 
-	# Fix build on riscv64
-	go mod edit -replace \
-		golang.org/x/sys=golang.org/x/sys@v0.0.0-20210630005230-0f9fa26af87c
-	go mod download golang.org/x/sys
-
 	go build -ldflags "-linkmode=external \"-extldflags=$LDFLAGS\""
 }
 

community/got/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: omni <omni+alpine@hack.org>
 pkgname=got
 _pkgname=got-portable
-pkgver=0.98.2
+pkgver=0.99
 pkgrel=0
 pkgdesc="A VCS which prioritizes ease of use and simplicity over flexibility"
 url="https://gameoftrees.org/"
@@ -36,5 +36,5 @@ package() {
 }
 
 sha512sums="
-b7b9e7e043a201c19dd4c99997acd561418d683c3c4c34207014f4f616cf9514822dcee56c477192709db3f6fa4b2ce9a48bb4692d560d05a3c04ce3fdf46516  got-portable-0.98.2.tar.gz
+59504e9d0fe507f255a51aa0e565f69b190d7e94147c0848066919a932f44ff0724d841ba872c3ad34383e65adc1bffd30927a13add9314975bb613d2aa6b5f1  got-portable-0.99.tar.gz
 "

community/gpick/APKBUILD

 # Contributor: knuxify <knuxify@gmail.com>
-# Maintainer: knuxify <knuxify@gmail.com>
+# Maintainer:
 pkgname=gpick
 pkgver=0.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Advanced color picker written in C++ using GTK+ toolkit"
 url="http://gpick.org"
 arch="all"

community/grass-gis/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=grass-gis
 pkgver=8.3.2
 _shortver=${pkgver%.*}; _shortver=${_shortver/./}
-pkgrel=1
+pkgrel=2
 pkgdesc="Geographic Resources Analysis Support System"
 url="https://grass.osgeo.org"
 arch="all !s390x" # s390x: tests fail

community/gst-editing-services/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-editing-services
-pkgver=1.22.11
-pkgrel=1
+pkgver=1.24.3
+pkgrel=0
 pkgdesc="GStreamer Editing Services Library"
 url="https://gstreamer.freedesktop.org"
 # s390x blocked by 7 failing tests
@@ -46,5 +46,5 @@ package() {
 }
 
 sha512sums="
-87f1240c3c18d1530ace3f15ad50acef90dab2808198658b5f9da54a5cfe2ee2c040e7bdd766550e566c5e86a1509b12a473b6063f3a7e471ee18b163b40873d  gst-editing-services-1.22.11.tar.xz
+4b658303ea7619d2feb099491b8fcfa366db8c7437d59fb3187d4f574cb26f9dd30376e1eb45ed23e4528044cdb7c56ff9765e14bffb2ffcbe622e68ec754379  gst-editing-services-1.24.3.tar.xz
 "

community/gst-libav/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-libav
-pkgver=1.22.11
+pkgver=1.24.3
 pkgrel=0
 pkgdesc="GStreamer streaming media framework libav plugin"
 url="https://gstreamer.freedesktop.org"
@@ -45,6 +45,6 @@ doc() {
 }
 
 sha512sums="
-808e5659130ed608960bddb68f4ab678149a21e1fb45ebe85d82f47166a254756d615ed37eb83e2aaba349e93279bf2dc43a73daa5c33833aba26d3d8e115362  gst-libav-1.22.11.tar.xz
+21cd138eb6de79edf10c45fb41847c38449e3936490bafc5fef51705f218f25399b4ec021fc9612df2296614b458ed3b1b626a0a307877636ee555a787bf79cf  gst-libav-1.24.3.tar.xz
 b6ea595d0875c22b69fb7c32ce3e03e187ce8c76ad5992fd709500507fc89e021f6f53fc951a61b5edf0312963bf7d313542a3970bbab27e335887e5db34d26b  flaky.patch
 "

community/gst-plugins-bad/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-bad
-pkgver=1.22.11
+pkgver=1.24.3
 pkgrel=0
 pkgdesc="GStreamer streaming media framework bad plug-ins"
 url="https://gstreamer.freedesktop.org/"
@@ -127,5 +127,5 @@ package() {
 }
 
 sha512sums="
-cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70  gst-plugins-bad-1.22.11.tar.xz
+fb4c53ea1837ab03480a2c1f9d2bf8dbdd1d7064b3f7ce4ff3eb5f8ec2f915f36442734b94332c867c3f8f815940f1c2a6e0763a62c4afb55324a8eb69bbf14b  gst-plugins-bad-1.24.3.tar.xz
 "

community/gst-plugins-good/6804.patch

+From 1c702187b067f1a2378bc236023d7e2b1f368be6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Sun, 5 May 2024 18:29:39 +0300
+Subject: [PATCH] qtdemux: Use `G_GUINT64_CONSTANT` when creating test caps
+
+Otherwise this fails on 32 bit platforms.
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3521
+---
+ .../gst-plugins-good/tests/check/elements/qtdemux.c       | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c
+index dd7b30e3233..1e067e02cbe 100644
+--- a/tests/check/elements/qtdemux.c
++++ b/tests/check/elements/qtdemux.c
+@@ -1085,8 +1085,8 @@ GST_START_TEST (test_qtdemux_compensate_data_offset)
+       "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL);
+   caps =
+       gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
+-      "mss-fragmented", "timescale", G_TYPE_UINT64, 10000000, "media-caps",
+-      GST_TYPE_CAPS, mediacaps, NULL);
++      "mss-fragmented", "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
++      "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
+
+   /* Send segment event* */
+   event = gst_event_new_caps (caps);
+@@ -1165,8 +1165,8 @@ GST_START_TEST (test_qtdemux_mss_fragment)
+       "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL);
+   caps =
+       gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING,
+-      "mss-fragmented", "timescale", G_TYPE_UINT64, 10000000, "media-caps",
+-      GST_TYPE_CAPS, mediacaps, NULL);
++      "mss-fragmented", "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000),
++      "media-caps", GST_TYPE_CAPS, mediacaps, NULL);
+
+   /* Send segment event* */
+   event = gst_event_new_caps (caps);
+--
+GitLab

community/gst-plugins-good/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-good
-pkgver=1.22.11
+pkgver=1.24.3
 pkgrel=0
 pkgdesc="GStreamer streaming media framework good plug-ins"
 url="https://gstreamer.freedesktop.org"
@@ -38,6 +38,7 @@ makedepends="
 	meson
 	mpg123-dev
 	nasm
+	opencore-amr-dev
 	orc-compiler
 	orc-dev
 	pulseaudio-dev
@@ -55,18 +56,9 @@ makedepends="
 ldpath="/usr/lib/gstreamer-1.0"
 source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz
 	flaky-test.patch
-	tests-fix-memory-corruption.patch
+	6804.patch
 	"
 
-case "$CARCH" in
-armhf|s390x|ppc64le)
-	# really flaky tests
-	options="$options !check"
-	;;
-*)
-	;;
-esac
-
 # secfixes:
 #   1.22.4-r0:
 #     - CVE-2023-37327
@@ -93,6 +85,13 @@ esac
 #     - CVE-2016-10199
 
 build() {
+	local qt_x11="enabled"
+	case "$CTARGET_ARCH" in
+	arm*|aarch64)
+		qt_x11="disabled"
+		;;
+	esac
+
 	# MPG123_NO_LARGENAME: fix undefined reference to
 	# `mpg123_decode_frame_64' in function
 	# `gst_mpg123_audio_dec_handle_frame'
@@ -105,6 +104,9 @@ build() {
 		-Dpackage-origin="https://alpinelinux.org" \
 		-Dpackage-name="GStreamer good plug-ins (Alpine Linux)" \
 		-Dtests="$(want_check && echo enabled || echo disabled)" \
+		-Damrnb=enabled \
+		-Damrwbdec=enabled \
+		-Dqt-x11=$qt_x11 \
 		. output
 	meson compile -C output
 }
@@ -140,9 +142,8 @@ gtk() {
 		fi
 	done
 }
-
 sha512sums="
-e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb  gst-plugins-good-1.22.11.tar.xz
+338469b7c7ed1a1570b3e734107332998b3e8eb96a1275cddc3ba92b0050e35d9e9902d0668653593cf74d14f4bb23f2eabdc61f0248df5d9cfee3e76c6cab0c  gst-plugins-good-1.24.3.tar.xz
 e471a892c511c501fdd336cd1729df4e955e266a395260db50665b4ee717d881a007ae84873c57e386931c042ce08ee8f3ab8e102ba251632f724e167b5af913  flaky-test.patch
-7779f0eee4dda158c88e19e4d0534afd5cdde393d269f88a521cda0f2106afc2a0b386cc7b13242fed8ce7f71e4d9400507e5bef19bc0374eadc81a0a5e3a14b  tests-fix-memory-corruption.patch
+ab6161070e19f9b7aca7fe69f5651b94bfb43af528569e9d9f4f0c3dde511c4459ca6dbc5141933c395ef308d530b06644984edfd99ce7e53c95f5b4a0dc4cfd  6804.patch
 "

community/gst-plugins-good/tests-fix-memory-corruption.patch

-From f6f3c1527fa799042fb0906ac221c2d01ce88d2b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Thu, 28 Mar 2024 19:49:46 +0000
-Subject: [PATCH] tests: rtpred: fix out-of-bound writes
-
-Don't write more data to the buffer than we allocated
-space for.
-
-Fixes #3312
----
- subprojects/gst-plugins-good/tests/check/elements/rtpred.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/subprojects/gst-plugins-good/tests/check/elements/rtpred.c b/subprojects/gst-plugins-good/tests/check/elements/rtpred.c
-index 99b08fdd7a0..80dd2715f56 100644
---- a/tests/check/elements/rtpred.c
-+++ b/tests/check/elements/rtpred.c
-@@ -398,7 +398,7 @@ GST_START_TEST (rtpreddec_invalid)
-   bufinp =
-       _new_rtp_buffer (FALSE, 0, PT_RED, 1, TIMESTAMP_NTH (1), 0xabe2b0b, 1);
-   fail_unless (gst_rtp_buffer_map (bufinp, GST_MAP_WRITE, &rtp));
--  memcpy (gst_rtp_buffer_get_payload (&rtp), &data, sizeof (data));
-+  memcpy (gst_rtp_buffer_get_payload (&rtp), &data, 1);
-   gst_rtp_buffer_unmap (&rtp);
-   _push_and_check_didnt_go_through (h, bufinp);
- 
-@@ -406,7 +406,7 @@ GST_START_TEST (rtpreddec_invalid)
-   bufinp =
-       _new_rtp_buffer (FALSE, 0, PT_RED, 2, TIMESTAMP_NTH (2), 0xabe2b0b, 4);
-   fail_unless (gst_rtp_buffer_map (bufinp, GST_MAP_WRITE, &rtp));
--  memcpy (gst_rtp_buffer_get_payload (&rtp), &data, sizeof (data));
-+  memcpy (gst_rtp_buffer_get_payload (&rtp), &data, 4);
-   gst_rtp_buffer_unmap (&rtp);
-   _push_and_check_didnt_go_through (h, bufinp);
- 
--- 
-GitLab
-

community/gst-plugins-ugly/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-ugly
-pkgver=1.22.11
+pkgver=1.24.3
 pkgrel=0
 pkgdesc="GStreamer streaming media framework ugly plug-ins"
 url="https://gstreamer.freedesktop.org"
@@ -16,7 +16,6 @@ makedepends="
 	libdvdread-dev
 	libmpeg2-dev
 	meson
-	opencore-amr-dev
 	orc-dev
 	x264-dev
 	"
@@ -44,8 +43,6 @@ build() {
 		-Db_lto=true \
 		-Dpackage-origin="https://alpinelinux.org" \
 		-Dpackage-name="GStreamer ugly plug-ins (Alpine Linux)" \
-		-Damrnb=enabled \
-		-Damrwbdec=enabled \
 		-Dgpl=enabled \
 		-Dcdio=disabled \
 		-Ddvdread=disabled \
@@ -68,6 +65,6 @@ doc() {
 }
 
 sha512sums="
-767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c  gst-plugins-ugly-1.22.11.tar.xz
+1964549fdb46210c2f8a918d0fd597d302e431c8585efd7824ab2fddd7c75dc0eed288436c8bc1afcdebb89610c5859fd5901495defb3a2cb6cf823a5d08cbff  gst-plugins-ugly-1.24.3.tar.xz
 730a88a20534f77d10ed1543f6e7fcc8825e75c4bba007de02017fc89569f9e5dfd3d383d3479448f687825bb27b19335c0957c360846e5e3e33735b7a7d3bf6  x264_tests.patch
 "

community/gst-vaapi/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=gst-vaapi
 # NOTE: Upgrade only to even-numbered minor versions (e.g. 1.20.x, 1.22.x)!
 #  Odd versions are unstable development releases.
-pkgver=1.22.11
+pkgver=1.24.3
 pkgrel=0
 pkgdesc="GStreamer streaming media framework VA API plug-ins"
 url="https://gstreamer.freedesktop.org/"
@@ -45,5 +45,5 @@ package() {
 }
 
 sha512sums="
-939b748fea88c94ad59c1d4610a872a794b383382096a8f5f011a21d4c8fb041c28e1aa9a8d54f519fb3e48a69ed79622b0d45be01d2d5a900738a7928401563  gstreamer-vaapi-1.22.11.tar.xz
+3f7fde68468003cc8e83abf3ad81281e475bf83dbbc7c14006bee18d6d66dfa9e7745d049aa8fa1d3147787ea7d9d47145507d9ebb2b7f576ee5e0f849edb043  gstreamer-vaapi-1.24.3.tar.xz
 "

community/gtk4.0/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com>
 pkgname=gtk4.0
-pkgver=4.14.3
+pkgver=4.14.4
 pkgrel=0
 pkgdesc="The GTK Toolkit (v4)"
 url="https://www.gtk.org/"
@@ -121,5 +121,5 @@ lang() {
 }
 
 sha512sums="
-2502fff3e98cb45f2293c94d86c32ff9b7c88d72eb7500a19fc9e589e1eda69af94c4eae78c044dcf5cf345cb99537d264250115d633034d9552cadc67f71e8e  gtk-4.14.3.tar.xz
+33a983f4ebac9088eaf9d3794a171d1619632bbcb27d9f46d894305dc15f83615a18443598b3c62a553b9596438b58226560ba17c41e539c76c3ee8a2b62c651  gtk-4.14.4.tar.xz
 "

community/gvmd/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gvmd
-pkgver=23.5.2
+pkgver=23.6.2
 #PostgreSQL version
 _pgver=16
 # match postgres clang
@@ -89,7 +89,7 @@ EOF
 }
 
 sha512sums="
-4708fe0033d5244a988560ca9cbe8b0d5be0006690cc5c943eec3cd534329d776a556766a57257a07d40132fa5239455b9f71b4d0e9a5a4ba66d63436c2bc9f4  gvmd-23.5.2.tar.gz
+935af9a842d7b82a8467ccbb9edf1c9e8ea05c4f8a4e263c3692a2d8993209312af3d760943e32c77f8c12d2220771b9731b10dba59c89d2570682a3e363767d  gvmd-23.6.2.tar.gz
 02c8acb54a765d840747156a58a126bdc2d2c7f587c71109d83404100a5b81300ca68ed8b2f7e4637581fa9bbe3016809c70f1dc5fc5099a2f173ddb0299a72f  gvmd.initd
 7c5520be5d2efdb6f9b6a4d80d00accd45d6663c184b2200f84d9394d11782f17b273037c8a42c1be8508b86c4478db0e634bf03e86054f45af70d77690f80b3  gvmd.logrotate
 4fda7d5051f9d1ca069becbcc0e82b20d76fd9f7c7abf4a4f05ab55c17fba54dbe269607ee6360b034e8a1674a38680775e2ffc4120b12c7b679564ba4c87ed4  greenbone-certdata-sync.conf

community/halloy/APKBUILD

 # Contributor: Celeste <cielesti@protonmail.com>
 # Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=halloy
-pkgver=2024.6
+pkgver=2024.7
 pkgrel=0
 pkgdesc="Rust graphical IRC client supporting IRCv3.2 capabilities"
 url="https://github.com/squidowl/halloy"
@@ -47,5 +47,5 @@ package() {
 }
 
 sha512sums="
-69786924eaf2bca2ed7323446d9573806bf6537274a9c9491825cbfd251f12bc989c69caea36355e31d26bdb4d43da204cc9f9aaacdc267096ac6cd2d9369f14  halloy-2024.6.tar.gz
+a3c178764ca1d9e80dd010eb5f1730a956f55dcde4b7498eb379db3c553666c20e70cccfe0461936a3206864a58000f4c3d6cad46f4818a89172d5ed0097ba0f  halloy-2024.7.tar.gz
 "

community/helix/APKBUILD

@@ -16,6 +16,7 @@ _tsrust_ver="0.20.4"
 source="https://github.com/helix-editor/helix/archive/$pkgver/helix-$pkgver.tar.gz
 	https://github.com/tree-sitter/tree-sitter-rust/archive/v$_tsrust_ver/tree-sitter-rust-$_tsrust_ver.tar.gz
 	runtime-dir-fhs-location.patch
+	tests-fix-pretty-print-and-textobject-tests.patch
 	"
 
 # Don't build tree-sitter languages, we provide them in standalone aports.
@@ -70,4 +71,5 @@ sha512sums="
 d9815e4dbcc897b4f6cd394a1e9060ed56832f18b2cf9542aa03b78f4d49213b2d74d748197b25df3d459dbeefb68915f67511b402504185d64908c10eb9377e  helix-24.03.tar.gz
 f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d  tree-sitter-rust-0.20.4.tar.gz
 0d72f5528106df006764a201caf7fefa860e67646198818fd744257050ac566082569b289f0a1815dd14f0b1364e344f8841e3c6757377d8452d8ebd5b022d29  runtime-dir-fhs-location.patch
+7e7b8ef4685b8458a5390b1e5a83d06e43a62404ce752f1ac191ee51db112e30c419689155ef4cfff91619ea05c084261554a3ba977dbbc6b5ca23b975e06f1e  tests-fix-pretty-print-and-textobject-tests.patch
 "

community/helix/tests-fix-pretty-print-and-textobject-tests.patch

+Url: https://github.com/helix-editor/helix/commit/0546273570710b97e9eebfff84298afbbb372f02
+
+From 0546273570710b97e9eebfff84298afbbb372f02 Mon Sep 17 00:00:00 2001
+From: Pedro Fedricci <pedromfedricci@gmail.com>
+Date: Mon, 15 Apr 2024 13:07:15 -0300
+Subject: [PATCH] chore: update tree-sitter-rust to v0.21.0 (#10365)
+
+* chore: update tree-sitter-rust to 0.21.0
+
+* fix: pretty print and textobject tests
+---
+ helix-core/src/syntax.rs            | 11 ++++++-----
+ languages.toml                      |  2 +-
+ runtime/queries/rust/highlights.scm |  2 +-
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
+index 78abc0b0a740..3cf818f60d6f 100644
+--- a/helix-core/src/syntax.rs
++++ b/helix-core/src/syntax.rs
+@@ -2765,10 +2765,10 @@ mod test {
+             )
+         };
+ 
+-        test("quantified_nodes", 1..36);
++        test("quantified_nodes", 1..37);
+         // NOTE: Enable after implementing proper node group capturing
+-        // test("quantified_nodes_grouped", 1..36);
+-        // test("multiple_nodes_grouped", 1..36);
++        // test("quantified_nodes_grouped", 1..37);
++        // test("multiple_nodes_grouped", 1..37);
+     }
+ 
+     #[test]
+@@ -2939,7 +2939,7 @@ mod test {
+ 
+     #[test]
+     fn test_pretty_print() {
+-        let source = r#"/// Hello"#;
++        let source = r#"// Hello"#;
+         assert_pretty_print("rust", source, "(line_comment)", 0, source.len());
+ 
+         // A large tree should be indented with fields:
+@@ -2958,7 +2958,8 @@ mod test {
+                 "      (macro_invocation\n",
+                 "        macro: (identifier)\n",
+                 "        (token_tree\n",
+-                "          (string_literal))))))",
++                "          (string_literal\n",
++                "            (string_content)))))))",
+             ),
+             0,
+             source.len(),
+diff --git a/languages.toml b/languages.toml
+index 1a345add9ae1..ea1607d84fe9 100644
+--- a/languages.toml
++++ b/languages.toml
+@@ -250,7 +250,7 @@ args = { attachCommands = [ "platform select remote-gdb-server", "platform conne
+ 
+ [[grammar]]
+ name = "rust"
+-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
++source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "473634230435c18033384bebaa6d6a17c2523281" }
+ 
+ [[language]]
+ name = "sway"
+diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
+index 09068b4f54f5..1c0f799b1fed 100644
+--- a/runtime/queries/rust/highlights.scm
++++ b/runtime/queries/rust/highlights.scm
+@@ -51,7 +51,7 @@
+ (lifetime
+   "'" @label
+   (identifier) @label)
+-(loop_label
++(label
+   "'" @label
+   (identifier) @label)
+ 

community/imagemagick/APKBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
 _pkgname=ImageMagick
-pkgver=7.1.1.29
+pkgver=7.1.1.32
 pkgrel=0
 _pkgver=${pkgver%.*}-${pkgver##*.}
 _abiver=7
@@ -190,7 +190,7 @@ build() {
 		--with-heic \
 		--with-modules \
 		--with-perl \
-		--with-perl-options="PREFIX=/usr INSTALLDIRS=vendor" \
+		--with-perl-options="INSTALL_BASE=/usr INSTALLDIRS=vendor" \
 		--with-png \
 		--with-rsvg \
 		--with-threads \
@@ -297,5 +297,5 @@ _perlmagick_doc() {
 }
 
 sha512sums="
-ed250188fae8225e8d32a2f4ed12d6fb3e0891fbb3ccf77c2bc027d28918c10e628c9eec0c8b83e530fe4387d2123e1b0eb576604d3b5ad6436f3cf4d1938cef  ImageMagick-7.1.1-29.tar.xz
+bbf9e3daa8f0687719aad93221682cae57afab3b9adaf47ef6ec62d26b0e40f7204f04ad9e052b6119ce16cdf3d2141d17f03396fef79ed18bd94e1e9943273e  ImageMagick-7.1.1-32.tar.xz
 "