Skip to content

Commit

Permalink
qt6-base: update to 6.7.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
sgn committed Jun 23, 2024
1 parent a26d80d commit 77ce491
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 89 deletions.
1 change: 1 addition & 0 deletions srcpkgs/qt6-base-private-devel
39 changes: 0 additions & 39 deletions srcpkgs/qt6-base/patches/libxkbcommon1.6.0.patch

This file was deleted.

6 changes: 3 additions & 3 deletions srcpkgs/qt6-base/patches/markdown.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- qt6-base-6.6.0/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp 2023-09-13 18:02:48.000000000 +0200
+++ - 2023-10-13 20:01:07.568899554 +0200
@@ -223,10 +223,12 @@
--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
@@ -225,10 +225,12 @@ void tst_QTextMarkdownImporter::lists_da
QTest::newRow("numeric lists nested in empty lists")
<< "- \n 1. a\n 2. b\n- c\n 1.\n + d\n" << 0 << 1 << 4 << false
<< "- \n 1. a\n 2. b\n- c 1. + d\n";
Expand Down
20 changes: 0 additions & 20 deletions srcpkgs/qt6-base/patches/musl-limits.patch

This file was deleted.

8 changes: 4 additions & 4 deletions srcpkgs/qt6-base/patches/musl-test-image.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- qt6-base-6.4.2.orig/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ qt6-base-6.4.2/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -1806,6 +1806,8 @@ void tst_QImage::smoothScale2()
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -1827,6 +1827,8 @@ void tst_QImage::smoothScale2()
QRgb expected = opaque ? qRgb(63, 127, 255) : qRgba(31, 63, 127, 127);
img.fill(expected);

Expand All @@ -9,7 +9,7 @@
// scale x down, y down
QImage scaled = img.scaled(QSize(1, 1), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
QRgb pixel = scaled.pixel(0, 0);
@@ -1869,6 +1871,7 @@ void tst_QImage::smoothScale2()
@@ -1890,6 +1892,7 @@ void tst_QImage::smoothScale2()
QCOMPARE(qBlue(pixel), qBlue(expected));
}
}
Expand Down
6 changes: 3 additions & 3 deletions srcpkgs/qt6-base/patches/musl-usr-path-hack.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This breaks qt6-webengine's search path for translations.
Using realpath instead would probably be a more correct solution.

---
--- qt6-base-6.4.2.orig/src/corelib/global/qlibraryinfo.cpp
+++ qt6-base-6.4.2/src/corelib/global/qlibraryinfo.cpp
@@ -358,6 +358,12 @@ static QString getRelocatablePrefix(QLib
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -383,6 +383,12 @@ static QString getRelocatablePrefix(QLib
int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
if (result > 0 && info.dli_fname)
prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- qt6-base-6.4.2.orig/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ qt6-base-6.4.2/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -592,7 +592,10 @@ void tst_QResourceEngine::lastModified()
--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -624,7 +624,10 @@ void tst_QResourceEngine::lastModified()
{
QFileInfo fi(":/");
QVERIFY(fi.exists());
Expand Down
8 changes: 4 additions & 4 deletions srcpkgs/qt6-base/patches/x86-qround-passed.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- qt6-base-6.4.2.orig/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ qt6-base-6.4.2/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -599,18 +599,14 @@ void tst_QGlobal::qRoundFloats() {
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -766,18 +766,14 @@ void tst_QGlobal::qRoundFloats() {
QFETCH(float, expected);

#if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG))
Expand All @@ -23,7 +23,7 @@
}

void tst_QGlobal::qRoundDoubles_data() {
@@ -628,18 +624,14 @@ void tst_QGlobal::qRoundDoubles() {
@@ -795,18 +791,14 @@ void tst_QGlobal::qRoundDoubles() {
QFETCH(double, expected);

#if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG))
Expand Down
17 changes: 8 additions & 9 deletions srcpkgs/qt6-base/patches/zfs-storage.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
--- qt6-base-6.4.2.orig/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+++ qt6-base-6.4.2/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
@@ -165,6 +165,8 @@ void tst_QStorageInfo::tempFile()
#ifdef Q_OS_LINUX
if (storage1.fileSystemType() == "btrfs")
QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
+ if (storage1.fileSystemType() == "zfs")
+ QSKIP("This test doesn't work on zfs");
--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
@@ -220,6 +220,7 @@ static QString suitableDirectoryForWriti
// See comment below. If we can get a tmpfs, let's try it.
"btrfs",
"xfs",
+ "zfs",
#endif
};

qint64 free = storage1.bytesFree();
37 changes: 33 additions & 4 deletions srcpkgs/qt6-base/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Template file for 'qt6-base'
#
# On update rebuild all pkg with qt6-base-private-devel
pkgname=qt6-base
version=6.6.0
revision=2
version=6.7.2
revision=1
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib${XBPS_TARGET_WORDSIZE}/qt6
Expand All @@ -13,12 +15,13 @@ configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_SYSCONFDIR=/etc/xdg
-DQT_FEATURE_openssl_linked=ON
-DQT_FEATURE_system_sqlite=ON
-DQT_FEATURE_system_xcb_xinput=ON
-DQT_FEATURE_libproxy=ON
-DQT_FEATURE_qmake=ON
-DBUILD_WITH_PCH=OFF"
hostmakedepends="perl pkg-config xmlstarlet"
makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel
double-conversion-devel glib-devel libxcb-devel
double-conversion-devel glib-devel libxcb-devel libSM-devel
xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel
MesaLib-devel pcre2-devel icu-devel mtdev-devel harfbuzz-devel
Expand All @@ -32,7 +35,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/qtbase-everywhere-src-${version}.tar.xz"
checksum=039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e
checksum=c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599
python_version=3

if [ "$CROSS_BUILD" ]; then
Expand All @@ -46,6 +49,12 @@ if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DQT_BUILD_TESTS=ON"
fi

subpackages="qt6-concurrent qt6-core qt6-dbus qt6-gui qt6-network
qt6-opengl-widgets qt6-plugin-mysql qt6-plugin-networkinformation
qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite qt6-plugin-tls-openssl
qt6-plugin-tls-qcertonly qt6-printsupport qt6-sql qt6-test qt6-widgets qt6-xml
qt6-base-private-devel qt6-base-doc qt6-base-devel"

do_check() {
cd build
export QT_QPA_PLATFORM=offscreen
Expand All @@ -70,6 +79,11 @@ do_check() {
failing_tests+=" mockplugins test_import_plugins
test_static_resources test_generating_cpp_exports"
failing_tests+=" tst_qstorageinfo"
# cmake
failing_tests+=" test_qt_add_resources_rebuild test_collecting_plugins
test_standalone_test test_qt_extract_metatypes"
# Failing readonly and out-of-memory
failing_tests+=" tst_qsharedmemory"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
# Some glibc specific DNS Lookup
failing_tests+=" tst_qdnslookup"
Expand Down Expand Up @@ -260,6 +274,21 @@ qt6-plugin-networkinformation_package() {
}
}

qt6-base-private-devel_package() {
short_desc+=" - private development files"
depends="qt6-base-devel>=${version}_${revision}"
pkg_install() {
for dir in $(cd ${DESTDIR} && pwd >&2 && find usr/include -type d -name private); do
vmove "$dir"
done
vmove "usr/lib/cmake/*Private"
vmove "usr/lib/qt6/metatypes/*private_*_metatypes.json"
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921930
# vmove "usr/lib/qt6/mkspecs/modules/*_private.pri"
vmove "usr/lib/qt6/modules/*Private.json"
}
}

qt6-base-devel_package() {
short_desc+=" - Development files"
depends="qt6-base>=${version}_${revision}
Expand Down

0 comments on commit 77ce491

Please sign in to comment.