qt6-base: update to 6.2.0.

This commit is contained in:
John 2021-06-24 20:58:41 +02:00 committed by John Zimmermann
parent ed1c8a333b
commit b145fa9992
5 changed files with 54 additions and 4 deletions

View file

@ -0,0 +1,25 @@
Source: @Johnnynator
Upsteam: No
Subject: Musl always returns /lib/libQt6Core.so.6 for Dl_info.dli_fname.
This also happens sometimes with qtwebengine on glibc.
This breaks qt6-webengine's search path for translations.
Using realpath instead would probably be a more correct solution.
---
diff --git qtbasesrc/corelib/global/qlibraryinfo.cpp qtbasesrc/corelib/global/qlibraryinfo.cpp
index 8bcf67e73d..28d7355310 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -558,6 +558,12 @@ static QString getRelocatablePrefix()
int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
if (result > 0 && info.dli_fname)
prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname));
+#if 1
+ QDir preDir(prefixPath);
+ if (preDir.isRoot()) {
+ prefixPath = QStringLiteral("/usr");
+ }
+#endif
#elif defined(Q_OS_WIN)
HMODULE hModule = getWindowsModuleHandle();
const int kBufferSize = 4096;

View file

@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.1.1
revision=2
version=6.2.0
revision=1
wrksrc="qtbase-everywhere-src-${version}"
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
@ -22,13 +22,14 @@ makedepends="zlib-devel libzstd-devel dbus-devel
libpng-devel tslib-devel libinput-devel gtk+3-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"
sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel
libXevie-devel libXcursor-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=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
checksum=fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769
python_version=3
if [ "$CROSS_BUILD" ]; then
@ -207,6 +208,27 @@ qt6-plugin-sqlite_package() {
}
}
qt6-plugin-tls-openssl_package() {
short_desc+=" - TLS plugin"
pkg_install() {
vmove usr/lib/qt6/plugins/tls/libqopensslbackend.so
}
}
qt6-plugin-tls-qcertonly_package() {
short_desc+=" - TLS plugin"
pkg_install() {
vmove usr/lib/qt6/plugins/tls/libqcertonlybackend.so
}
}
qt6-plugin-networkinformation() {
short_desc+=" - Networkinformation plugin"
pkg_install() {
vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
}
}
qt6-base-devel_package() {
short_desc+=" - Development files"
depends="qt6-base>=${version}_${revision}

View file

@ -0,0 +1 @@
qt6-base

View file

@ -0,0 +1 @@
qt6-base

View file

@ -0,0 +1 @@
qt6-base