diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch deleted file mode 100644 index 9b268bc95d3..00000000000 --- a/srcpkgs/qt6-base/patches/feenableexcept.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- qt6-base-6.4.2.orig/tests/auto/corelib/text/qlocale/tst_qlocale.cpp -+++ qt6-base-6.4.2/tests/auto/corelib/text/qlocale/tst_qlocale.cpp -@@ -1502,8 +1502,10 @@ void tst_QLocale::fpExceptions() - fenv_t envp; - fegetenv(&envp); - feclearexcept(FE_ALL_EXCEPT); -+#ifdef __GLIBC__ - feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID); - #endif -+#endif - - QString::number(1000.1245); - QString::number(1.1); diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index dfde60bdb43..26c3274641e 100644 --- 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 " 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) ;;