qt5: 5.15.7 -> 5.15.8

qt5/.signature

@@ -1,9 +1,10 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UubQRBUDQDZ2IELkLS0gobgi5bV0kMW8xA71HI1KqssYPPEmh2RTtblgRmFhzvKPSINUTroik6QxAck1nWCOw4=
-SHA256 (Pkgfile) = c667efd174259a93e10f1e66d9f379bad86bd43572ea1d8a084126c500b25921
-SHA256 (.footprint) = f1a78ee61cd1d4d09c0557a5f23e9e5b2259ca34cd81fd30e2703cdfa1c01637
-SHA256 (qt-everywhere-opensource-src-5.15.7.tar.xz) = 8a71986676a3f37a198a9113acedbfd5bc5606a459b6b85816d951458adbe9a0
-SHA256 (qt-everywhere-opensource-src-5.15.7-kf5-1.patch) = d81dd838fa6632ad71859fd3d7f6d56c9321095bb228b1664b944fd6fbd9e979
+RWSE3ohX2g5d/TgfM0bq8v+859dXiJzoqk4YxHnR62mDiNTjxBoFmLvvouVJ8dRpn5CshxG130kIFzwKIJuGqXw1TV+ecdm9TgQ=
+SHA256 (Pkgfile) = 2f0d3f7a17dc2aeafc9c7ce5ceb454c425ce338fa393e3154197d9f80f40d7cd
+SHA256 (.footprint) = 727f0fd9c0e6be2a59cddbec7686c3eb3c2ab75009fcb9fa683f079e6dd8d974
+SHA256 (qt-everywhere-opensource-src-5.15.8.tar.xz) = 776a9302c336671f9406a53bd30b8e36f825742b2ec44a57c08217bff0fa86b9
+SHA256 (qt-everywhere-opensource-src-5.15.8-kf5-1.patch) = f1e381e47fe1ebae5af62ed5d1e600646accb6160d045e1b8f150ecf69a94f25
+SHA256 (qtbase-5.15.8-fix-missing-qtsan-include.patch) = 65b435d09220fc66584f9613cdf7518367185af4e166c5b670301be6af98e8b1
 SHA256 (qt5-cflags.patch) = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
 SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e
 SHA256 (qtbase-everywhere-src-5.11.1-python3.patch) = 5218cf7651f21a865fc1d8b18753e0eb0c1c412acbac080cd9d61f95b69589e5

qt5/Pkgfile

@@ -1,14 +1,15 @@
 # Description: Qt Free Edition, version 5.x.
 # URL: http://www.qt.io/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: dbus gdk-pixbuf gst-plugins-base libepoxy libmng libxkbcommon xorg-libxcomposite xorg-libxcursor xorg-libxi xorg-libxinerama xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-xcb-util-renderutil
-# Optional: icu
+# Depends on: dbus gdk-pixbuf gst-plugins-base libepoxy libmng libwebp libxkbcommon xorg-libxcomposite xorg-libxcursor xorg-libxi xorg-libxinerama xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm
+# Optional: assimp icu
 
 name=qt5
-version=5.15.7
+version=5.15.8
 release=1
 source=(https://download.qt.io/archive/qt/5.15/$version/single/qt-everywhere-opensource-src-$version.tar.xz
 	https://www.linuxfromscratch.org/patches/blfs/svn/qt-everywhere-opensource-src-$version-kf5-1.patch
+	qtbase-5.15.8-fix-missing-qtsan-include.patch
 	qt5-cflags.patch
 	qt5-logo.png
 	qtbase-everywhere-src-5.11.1-python3.patch
@@ -25,6 +26,7 @@ build() {
 	patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.14.2-no_relocatable.patch
 	patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.15.2-libglvnd.patch
 	patch -d qtbase -p1 -i $SRC/qtbase-use-wayland-on-gnome.patch
+	patch -d qtbase -p1 -i $SRC/qtbase-5.15.8-fix-missing-qtsan-include.patch
 
 	export PYTHON='/usr/bin/python3'
 	mkdir $SRC/bin
@@ -46,6 +48,11 @@ build() {
 	sed -i '/qbytearray/a #include <limits>'  qtbase/src/corelib/text/qbytearraymatcher.h
 	sed -i '/type_traits/a #include <limits>' qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h
 
+	#pushd qtbase/src/3rdparty
+	#mv freetype libjpeg libpng zlib sqlite xcb pcre2 $SRC
+	#prt-get isinst assimp && mv assimp $SRC
+	#popd
+
 	./configure $PKGMK_QT5 \
 		-prefix /usr/ \
 		-archdatadir /usr/lib/qt5 \
@@ -59,19 +66,28 @@ build() {
 		-headerdir /usr/include/qt5 \
 		-libdir /usr/lib \
 		-sysconfdir /etc/xdg \
+		QMAKE_CFLAGS_RELEASE="$CFLAGS" \
+		QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+		QMAKE_LFLAGS_RELEASE="${LDFLAGS} -fuse-ld=gold" \
 		-confirm-license \
 		-opensource \
 		-release \
-		-system-sqlite \
-		-system-harfbuzz \
-		-openssl-linked \
 		-dbus-linked \
+		-opengl desktop \
+		-openssl-linked \
+		-system-harfbuzz \
+		-system-libjpeg \
+		-system-libpng \
+		-system-pcre \
+		-system-sqlite \
+		-system-zlib \
 		-nomake examples \
 		-no-mimetype-database \
 		-no-rpath \
 		-no-strip \
 		-no-reduce-relocations \
-		-opengl desktop \
+		-no-feature-relocatable \
+		-no-pch \
 		-skip qtwebengine \
 		-silent