void-linux · Johnnynator · Apr 3, 2023 · Apr 3, 2023 · Apr 3, 2023 · Apr 3, 2023
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=456c24c3d3840273e720b79fe8fed452fa889b54cbae6b45db1d1ded4da37341
+checksum=20b250023244f21dfbec5c007bac805d4494fa463a6dd27538afb1a81b230816
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.4.2
-revision=3
+version=6.5.0
+revision=1
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6
@@ -26,13 +26,13 @@ makedepends="zlib-devel libzstd-devel dbus-devel
  libmariadbclient-devel postgresql-libs-devel libatomic-devel
  unixodbc-devel cups-devel libproxy-devel brotli-devel
  sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel
- libXevie-devel libXcursor-devel"
+ libXevie-devel xcb-util-cursor-devel"
 short_desc="Cross-platform application and UI framework (QT6)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d
+checksum=fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
@@ -63,7 +63,9 @@ do_check() {
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
 		tst_qx11info tst_qcomplextext
-		tst_qaddpreroutine tst_qtextcursor"
+		tst_qaddpreroutine tst_qtextcursor
+		test_widgets_app_deployment tst_qnetworkinterface
+		tst_qgraphicsproxywidget"
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 	 test_static_resources test_generating_cpp_exports"
@@ -282,13 +284,13 @@ qt6-base-devel_package() {
 	pkg_install() {
 		local _f
 		vmove usr/include
-		vmove usr/lib/metatypes
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/qt6/mkspecs/modules
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 		for _f in ${DESTDIR}/usr/lib/cmake/*; do
 			case "$_f" in
 			*Tools|*HostInfo) ;;

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=a1a7c0e08c8870cf97d1c3a2eb3f37681aaed00a63b5b2f70bdf2da878d0a9aa
+checksum=fccd1d50a7f56de011f7668e0e90f022316bd4065fa7f91b078579403e2e26a8
 
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
@@ -26,11 +26,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 	}
 }
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-connectivity'
 pkgname=qt6-connectivity
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-declarative-host-tools"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtconnectivity-everywhere-src-${version}.tar.xz"
-checksum=8c9b44b239e42b4c4d6fca5f427904e688890b2a1bfb6bcbe5e6e2afcdc5d7af
+checksum=e7636653bab986361a77b23451d966c85591428c0422741890ef0fb197698f06
 
 qt6-connectivity-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}
@@ -19,11 +19,11 @@ qt6-connectivity-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 	}
 }
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DQT_BUILD_TESTS=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=a4bdd983de4e9cbca0f85b767dbdd8598711554e370a06da8f509ded4430f5bd
+checksum=f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
@@ -96,13 +96,13 @@ qt6-declarative-devel_package() {
 	replaces="qt6-quickcontrols2-devel>=0"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 		for _f in ${DESTDIR}/usr/lib/cmake/*; do
 			case "$_f" in
 			*Tools) ;;

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-base"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
-checksum=fc5f999ae0779a67d5507956d4dd315386eb81cf6ccba632de039bb9eee11707
+checksum=f9f810cd3ac7e60132c0da33f34fcfce42e3e764d6cad3020c2f3b1b42046f78
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-base qt6-declarative-host-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
-checksum=7f01baf5ba877af5b211c9d32e6075019f00d9d7a2ba81bb0f10ca759e9aef82
+checksum=0da7121ebfd9d2ba985ab1f2c8a3af70027c35732177ec0fc72ff7e82835c886
 
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
@@ -26,11 +26,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 	}
 }
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-base qt6-declarative-host-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
-checksum=accc8869c72095ce5b373a30c362d21235145a79f9e270480712f861d1de1c56
+checksum=8425ecdeb9286a6c51985bdaf3936026610d04dc31eec06fee79df6442b7e246
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DQT_BUILD_TESTS=ON"
@@ -30,10 +30,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 	}
 }
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-multimedia'
 pkgname=qt6-multimedia
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 configure_args="-DQT_FEATURE_gstreamer=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz"
-checksum=7f2b70deeada911c8e660e2801286657f297a5d1d543d1f6bfa856f28972c776
+checksum=9480d0c73abdd01aec4899e340938cec046a3f404b9f9ed945288be574dca146
 
 if [ "$XBPS_MACHINE" = "i686" ]; then
 	CXXFLAGS="-DPFFFT_SIMD_DISABLE=1"
@@ -39,7 +39,7 @@ qt6-multimedia-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.4.2
+version=6.5.0
 revision=1
 build_style=cmake
 hostmakedepends="perl qt6-base"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
-checksum=deab17bd957d0a493bd7757bc71270918147596fb9661a886b3f1d305047c2ee
+checksum=dbcc522ab2136ebe6c9be5c7f156a3bcefa92cd19a462e33a00e94068a24413e
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args="-DQT_BUILD_TESTS=ON"
@@ -22,11 +22,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/metatypes
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
-		vmove usr/share/qt6/modules
+		vmove usr/lib/qt6/modules
 	}
 }