community/qt5-qtbase: upgrade to 5.15.9

community/qt5-qtbase/APKBUILD

@@ -1,8 +1,10 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtbase
-pkgver=5.15.8_git20230109
-pkgrel=4
-_commit="dec44589403c99f96705b607d6fa5423b40463b6"
+pkgver=5.15.9
+pkgrel=0
+_module="${pkgname#qt5-}"
+_pkgver=v$pkgver-lts-lgpl
+_fullname=$_module-$_pkgver
 pkgdesc="Qt5 - QtBase components"
 url="https://qt.io/developers/"
 arch="all"
@@ -62,17 +64,13 @@ makedepends="$depends_dev
 	xdg-utils
 	"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $_sub"
-builddir="$srcdir/qtbase-$_commit"
+builddir="$srcdir/$_fullname"
 
 # temp allow textrels on riscv64
 [ "$CARCH" = "riscv64" ] && options="$options textrels"
 
-case $pkgver in
-	*_beta*|*_rc*) _rel=development_releases;;
-	*) _rel=official_releases;;
-esac
-
-source="https://dev.alpinelinux.org/archive/qt/qtbase-$_commit.tar.xz
+source="https://dev.alpinelinux.org/archive/qt/$_fullname.tar.xz
+	egl-x11.patch
 	qt-musl-iconv-no-bom.patch
 	qt5-base-cflags.patch
 	qt5-base-nostrip.patch
@@ -98,11 +96,12 @@ esac
 _disturl="dev.alpinelinux.org:/archive/qt/"
 snapshot() {
 	clean
-	deps
+	makedepends="git xz rsync tar" deps
 	mkdir -p "$srcdir" && cd "$srcdir"
-	git clone https://invent.kde.org/qt/qt/qtbase.git && cd qtbase
-	git archive --format tar --prefix=qtbase-$_commit/ $_commit | xz -T0 -9 -vv - > $SRCDEST/qtbase-$_commit.tar.xz
-	rsync --progress -La $SRCDEST/qtbase-$_commit.tar.xz $_disturl
+	git clone --filter=tree:0 https://invent.kde.org/qt/qt/$_module.git .
+	git archive --format tar --prefix=$_fullname/ $_pkgver > "$SRCDEST"/$_fullname.tar
+	xz -vv -T0 -9 -e "$SRCDEST"/$_fullname.tar
+	rsync --progress -La "$SRCDEST"/$_fullname.tar.xz $_disturl
 }
 
 prepare() {
@@ -256,7 +255,8 @@ x11() {
 }
 
 sha512sums="
-ada014722b7c5220b050039c7d7dc417467379fea5d1f8f439ccacfc872e486b1820acbae68a6b98ae1692e3eada6d63ffce9c77706554f8504d3c7dc13153d8  qtbase-dec44589403c99f96705b607d6fa5423b40463b6.tar.xz
+c4568e30dae168bbc98774da66f4432ca7de00a9484f12eb5f4a51ac94cc2985aa2d8ea0ad087eee4b3142fddee2c7a41c3f52d5226565a6f6383355e55ea218  qtbase-v5.15.9-lts-lgpl.tar.xz
+d5bd9ace2cc15a96c3266603be067620f1a31d8e2636f2bdd6ee9d03d03329af0b86b823f5d3564572543e7b99bddbeed3f7c2a5aec1f4bb082dc118dafb14d6  egl-x11.patch
 7d68421a14f0259535c977d8a521c98918193c107b76ac664571b12f5b0d7588a0d0e1297af412a26753a393b21f3f44c3274fa8ab5bc87f03705a3a03acb444  qt-musl-iconv-no-bom.patch
 fa3dddfe42b7f0ade45bd0530badfc3a3800adbd3798bd814597527713c9fe360a242f7cf39312f4cc3c88e9bd7aba233bd6674c0fc78e694a1fd868474c4240  qt5-base-cflags.patch
 af061bb56d5079d11407e6eb352fa4af7fefa6aed7f8cc40b5b2d591ef7ff04e9da6c6d534ca1904355ea7552951a1610fdcefb04ef9d696cb2b23ad6a0606e8  qt5-base-nostrip.patch

community/qt5-qtbase/egl-x11.patch

@@ -0,0 +1,22 @@
+for some reason this configure test fails to detect egl x11 support.
+we obviously have it, and the configure test works manually...
+so just force it on
+--
+diff --git a/src/gui/configure.json b/src/gui/configure.json
+index 1f08795c..bc120324 100644
+--- a/src/gui/configure.json
++++ b/src/gui/configure.json
+@@ -838,12 +838,7 @@
+                 ],
+                 "include": [ "EGL/egl.h", "X11/Xlib.h" ],
+                 "main": [
+-                    "Display *dpy = EGL_DEFAULT_DISPLAY;",
+-                    "EGLNativeDisplayType egldpy = XOpenDisplay(\"\");",
+-                    "dpy = egldpy;",
+-                    "EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);",
+-                    "XDestroyWindow(dpy, w);",
+-                    "XCloseDisplay(dpy);"
++                    "return 0;"
+                 ]
+             },
+             "use": "egl xlib"