Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake
@ 2020-12-22 13:35 Johnnynator
  2020-12-22 13:41 ` [PR PATCH] [Updated] [WIP] New packages: qt6 Johnnynator
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: Johnnynator @ 2020-12-22 13:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake
TOOD:
- [ ] Address TODOs


A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 55870 bytes --]

From fabef52d444cdf485845ecefc8f2a3a406a871ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/12] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index e1f9f18dffb..f78f10468b5 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,7 +54,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"

From f1e25b38ccb762d11a1c3431d74c993b16da3c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/12] New package: qt6-base-6.0.0

---
 common/shlibs                                 |  18 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-docs                         |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 198 +++++++++
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 21 files changed, 645 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 98fc15ee985..388cb5a5efc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2030,6 +2030,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.8 libfm-qt-0.16.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 00000000000..54f96779b31
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 00000000000..e28e75bfb0a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 00000000000..d5e11d42a07
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,198 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.0
+revision=1
+#archs="i686 x86_64"
+wrksrc="qtbase-everywhere-src-${version}"
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON
+ -GNinja"
+make_cmd=ninja
+hostmakedepends="perl pkg-config ninja"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 214178b5ddece396171cf00f435c7301a956c673 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/12] New package: qt6-wayland-6.0.0

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template

diff --git a/common/shlibs b/common/shlibs
index 388cb5a5efc..6202fe8ea9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2046,8 +2046,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 00000000000..c4dec18ea9a
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 00000000000..0a744febbe2
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 3bec20fa01d1be42a469ac98e9d44a7c54d90a6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/12] New package: qt6-declarative-6.0.0

---
 common/shlibs                    | 11 +++++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 100644 srcpkgs/qt6-declarative/template

diff --git a/common/shlibs b/common/shlibs
index 6202fe8ea9a..b7c0782378e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2048,6 +2048,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 00000000000..fd03a4809f3
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 00000000000..7842b83d720
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-devel_package() {
+        depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+        short_desc+=" - development files"
+        pkg_install() {
+                vmove usr/include
+                vmove usr/lib/cmake
+                vmove usr/lib/qt6/mkspecs
+                vmove "usr/lib/*.so"
+                vmove "usr/lib/*.prl"
+        }
+}

From f0448c161b91600118a7be19d35e7147e4e7a07f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/12] New package: qt6-qt5compat-6.0.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 00000000000..f88da3a0fe5
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 00000000000..3271557fb61
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 55d2e1d8b54e37790bc0f5838a212f3703beb9a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/12] New package: qt6-tools-6.0.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 00000000000..27de4db2225
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ee747d1aff8defb4ade0212547cb4507c136daca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/12] New package: qt6-svg-6.0.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 00000000000..69c493dbd79
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 00000000000..6959b23856f
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 532b409fb4e4de5deb9135d470bfcc1cef136f3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/12] New package: qt6-translations-6.0.0

---
 srcpkgs/qt6-translations/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 00000000000..b9b75a81988
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <johnz@posteo.net>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5

From 233e5de81f8ce47809991fea87e63a28087f7750 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/12] New package: qt6-shadertools-6.0.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template

diff --git a/common/shlibs b/common/shlibs
index b7c0782378e..3681fac335d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2059,6 +2059,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 00000000000..f1424d216cb
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 00000000000..a4cfd8f891b
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+
+qt6-shadertools-devel_package() {
+        depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+        short_desc+=" - development files"
+        pkg_install() {
+                vmove usr/include
+                vmove usr/lib/cmake
+                vmove usr/lib/qt6/mkspecs
+                vmove "usr/lib/*.so"
+                vmove "usr/lib/*.prl"
+        }
+}

From 5f5875618f96567eea941ff18d498057c7d4f4bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/12] New package: qt6-quick3d-6.0.0

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template

diff --git a/common/shlibs b/common/shlibs
index 3681fac335d..ce4db05bf10 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2060,6 +2060,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 00000000000..91ff6f03e47
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 00000000000..fba3bc4f191
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 30c80c3be8cee82c3f7c2bd96a9c11ae19eef5dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/12] New package: qt6-quickcontrols2-6.0.0

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template

diff --git a/common/shlibs b/common/shlibs
index ce4db05bf10..6f33586d2f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2064,6 +2064,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 00000000000..280bc162057
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 00000000000..b7577cd1ae6
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 90a5f09243a70e19dacf532511ad1636f13d2da4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/12] New package: qt6-quicktimeline-6.0.0

---
 srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 00000000000..4b07d8f4ac2
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
@ 2020-12-22 13:41 ` Johnnynator
  2020-12-22 18:39 ` ericonr
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2020-12-22 13:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs
- [ ] link against system libressl instead of vendored OpenSSL

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 55674 bytes --]

From fabef52d444cdf485845ecefc8f2a3a406a871ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/12] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index e1f9f18dffb..f78f10468b5 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,7 +54,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"

From f1e25b38ccb762d11a1c3431d74c993b16da3c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/12] New package: qt6-base-6.0.0

---
 common/shlibs                                 |  18 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-docs                         |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 198 +++++++++
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 21 files changed, 645 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 98fc15ee985..388cb5a5efc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2030,6 +2030,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.8 libfm-qt-0.16.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 00000000000..54f96779b31
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 00000000000..e28e75bfb0a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 00000000000..d5e11d42a07
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,198 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.0
+revision=1
+#archs="i686 x86_64"
+wrksrc="qtbase-everywhere-src-${version}"
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON
+ -GNinja"
+make_cmd=ninja
+hostmakedepends="perl pkg-config ninja"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 214178b5ddece396171cf00f435c7301a956c673 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/12] New package: qt6-wayland-6.0.0

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template

diff --git a/common/shlibs b/common/shlibs
index 388cb5a5efc..6202fe8ea9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2046,8 +2046,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 00000000000..c4dec18ea9a
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 00000000000..0a744febbe2
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 04ab379f33b1c7f9f26c5fbf94b3be1a5b9fa460 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/12] New package: qt6-declarative-6.0.0

---
 common/shlibs                    | 11 +++++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 100644 srcpkgs/qt6-declarative/template

diff --git a/common/shlibs b/common/shlibs
index 6202fe8ea9a..b7c0782378e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2048,6 +2048,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 00000000000..fd03a4809f3
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 00000000000..46e423b2ce7
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 36f19cc39a3f1520a8c6d4bc7c2099df2714e759 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/12] New package: qt6-qt5compat-6.0.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 00000000000..f88da3a0fe5
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 00000000000..3271557fb61
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f6ef579da3bdddc31ac9adcf0ac7a29d99edd1a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/12] New package: qt6-tools-6.0.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 00000000000..27de4db2225
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From edbe2631db9135943432a021d8a84be88ef92ca0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/12] New package: qt6-svg-6.0.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 00000000000..69c493dbd79
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 00000000000..6959b23856f
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 7474699211a405ac8db885ca83c9c0a99c59eb7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/12] New package: qt6-translations-6.0.0

---
 srcpkgs/qt6-translations/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 00000000000..b9b75a81988
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <johnz@posteo.net>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5

From d8a8f76141d4a5a11f0f6e564934b30b970a4825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/12] New package: qt6-shadertools-6.0.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template

diff --git a/common/shlibs b/common/shlibs
index b7c0782378e..3681fac335d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2059,6 +2059,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 00000000000..f1424d216cb
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 00000000000..056289d16b6
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From a5f671fb2e58c33c66fda0d2cf849bb5f1cda467 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/12] New package: qt6-quick3d-6.0.0

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template

diff --git a/common/shlibs b/common/shlibs
index 3681fac335d..ce4db05bf10 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2060,6 +2060,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 00000000000..91ff6f03e47
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 00000000000..fba3bc4f191
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 46e13a28085a48a0da7486351af1e6b24b48dfd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/12] New package: qt6-quickcontrols2-6.0.0

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template

diff --git a/common/shlibs b/common/shlibs
index ce4db05bf10..6f33586d2f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2064,6 +2064,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 00000000000..280bc162057
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 00000000000..b7577cd1ae6
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 7faf5696e7333d852b72b81fb9e956d6783610f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/12] New package: qt6-quicktimeline-6.0.0

---
 srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 00000000000..4b07d8f4ac2
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
  2020-12-22 13:41 ` [PR PATCH] [Updated] [WIP] New packages: qt6 Johnnynator
@ 2020-12-22 18:39 ` ericonr
  2020-12-23 23:17 ` Johnnynator
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-12-22 18:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27349#issuecomment-749711309

Comment:
Missing libatomic from armv6l. Do you know why armv6l doesn't get this error, only armv6l-musl?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
  2020-12-22 13:41 ` [PR PATCH] [Updated] [WIP] New packages: qt6 Johnnynator
  2020-12-22 18:39 ` ericonr
@ 2020-12-23 23:17 ` Johnnynator
  2020-12-23 23:19 ` [PR PATCH] [Updated] " Johnnynator
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2020-12-23 23:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/27349#issuecomment-750547990

Comment:
> Missing libatomic from armv6l. Do you know why armv6l doesn't get this error, only armv6l-musl?

armv6l does error, you just didn't see it, since CI doesn't run for armv6l

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (2 preceding siblings ...)
  2020-12-23 23:17 ` Johnnynator
@ 2020-12-23 23:19 ` Johnnynator
  2020-12-23 23:20 ` Johnnynator
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2020-12-23 23:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs
- [ ] link against system libressl instead of vendored OpenSSL

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 55820 bytes --]

From 8dbcfd6cb5da586b675b7aea4ce6d09b43f8b739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/12] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 136312ed7b4..0b393049f0d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,7 +54,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"

From d2f0d1d3776aa7973ef4b5c01b2062d120d3ef58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/12] New package: qt6-base-6.0.0

---
 common/shlibs                                 |  18 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-docs                         |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 198 +++++++++
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 21 files changed, 645 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b69c8455fc..34f47ab76cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2030,6 +2030,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.8 libfm-qt-0.16.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 00000000000..54f96779b31
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 00000000000..e28e75bfb0a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 00000000000..d5e11d42a07
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,198 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.0
+revision=1
+#archs="i686 x86_64"
+wrksrc="qtbase-everywhere-src-${version}"
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON
+ -GNinja"
+make_cmd=ninja
+hostmakedepends="perl pkg-config ninja"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From bed2ea56cebd2239e529345aed02702ebb33779d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/12] New package: qt6-wayland-6.0.0

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template

diff --git a/common/shlibs b/common/shlibs
index 34f47ab76cb..70678bfebda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2046,8 +2046,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 00000000000..c4dec18ea9a
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 00000000000..0a744febbe2
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 44775f4d8738e1154481172b8cb4a55c7156f574 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/12] New package: qt6-declarative-6.0.0

---
 common/shlibs                    | 11 +++++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 100644 srcpkgs/qt6-declarative/template

diff --git a/common/shlibs b/common/shlibs
index 70678bfebda..d792fb83c6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2048,6 +2048,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 00000000000..fd03a4809f3
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 00000000000..46e423b2ce7
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 58d92d425f8450839ccd74d626702d86a5d66926 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/12] New package: qt6-qt5compat-6.0.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 00000000000..f88da3a0fe5
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 00000000000..3271557fb61
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 8b61f0577f6437a249e6315ebbb57bf42592bd2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/12] New package: qt6-tools-6.0.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 00000000000..be224b6fe75
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From bfe712047348497955c7cf3206f1df803b56598f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/12] New package: qt6-svg-6.0.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 00000000000..69c493dbd79
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 00000000000..6959b23856f
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 5675e2b39adfdc9295a9dc1de66f13bb73492d2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/12] New package: qt6-translations-6.0.0

---
 srcpkgs/qt6-translations/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 00000000000..b9b75a81988
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <johnz@posteo.net>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5

From eb702c0e3b9420a5c3e3beda1802789441e5d333 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/12] New package: qt6-shadertools-6.0.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template

diff --git a/common/shlibs b/common/shlibs
index d792fb83c6a..ebe8c35fad8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2059,6 +2059,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 00000000000..f1424d216cb
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 00000000000..056289d16b6
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ae1448d680b37d8e91e76e38d7261eadb806dc24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/12] New package: qt6-quick3d-6.0.0

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template

diff --git a/common/shlibs b/common/shlibs
index ebe8c35fad8..bbae4e917d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2060,6 +2060,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 00000000000..91ff6f03e47
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 00000000000..fba3bc4f191
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ee010483aeff3102aa4eb61b333b0c156d761b59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/12] New package: qt6-quickcontrols2-6.0.0

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template

diff --git a/common/shlibs b/common/shlibs
index bbae4e917d8..248bde64b92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2064,6 +2064,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 00000000000..280bc162057
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 00000000000..b7577cd1ae6
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From cee8d8cc1f8388d4fa487d8381220877542303f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/12] New package: qt6-quicktimeline-6.0.0

---
 srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 00000000000..4b07d8f4ac2
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (3 preceding siblings ...)
  2020-12-23 23:19 ` [PR PATCH] [Updated] " Johnnynator
@ 2020-12-23 23:20 ` Johnnynator
  2020-12-24 11:01 ` Johnnynator
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2020-12-23 23:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs
- [ ] link against system libressl instead of vendored OpenSSL

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 35542 bytes --]

From 8dbcfd6cb5da586b675b7aea4ce6d09b43f8b739 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/12] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 136312ed7b4..0b393049f0d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,7 +54,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"

From 22a39d8d04458bcaf79f3f4b086c838cbb02c059 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/12] New package: qt6-base-6.0.0

---
 common/shlibs                              |  18 ++
 srcpkgs/qt6-base-devel                     |   1 +
 srcpkgs/qt6-base-docs                      |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch |  20 +++
 srcpkgs/qt6-base/template                  | 198 +++++++++++++++++++++
 srcpkgs/qt6-concurrent                     |   1 +
 srcpkgs/qt6-core                           |   1 +
 srcpkgs/qt6-dbus                           |   1 +
 srcpkgs/qt6-gui                            |   1 +
 srcpkgs/qt6-network                        |   1 +
 srcpkgs/qt6-opengl-widgets                 |   1 +
 srcpkgs/qt6-plugin-mysql                   |   1 +
 srcpkgs/qt6-plugin-odbc                    |   1 +
 srcpkgs/qt6-plugin-pgsql                   |   1 +
 srcpkgs/qt6-plugin-sqlite                  |   1 +
 srcpkgs/qt6-printsupport                   |   1 +
 srcpkgs/qt6-sql                            |   1 +
 srcpkgs/qt6-test                           |   1 +
 srcpkgs/qt6-widgets                        |   1 +
 srcpkgs/qt6-xml                            |   1 +
 20 files changed, 253 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b69c8455fc..34f47ab76cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2030,6 +2030,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.8 libfm-qt-0.16.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 00000000000..54f96779b31
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 00000000000..d5e11d42a07
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,198 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.0
+revision=1
+#archs="i686 x86_64"
+wrksrc="qtbase-everywhere-src-${version}"
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON
+ -GNinja"
+make_cmd=ninja
+hostmakedepends="perl pkg-config ninja"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 0dbb390d04ca411b0189f8587d9c9494495d3807 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/12] New package: qt6-wayland-6.0.0

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template

diff --git a/common/shlibs b/common/shlibs
index 34f47ab76cb..70678bfebda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2046,8 +2046,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 00000000000..c4dec18ea9a
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 00000000000..0a744febbe2
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0d1c79e486ab48382f382f4efc3e4c4edc9a5aa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/12] New package: qt6-declarative-6.0.0

---
 common/shlibs                    | 11 +++++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 100644 srcpkgs/qt6-declarative/template

diff --git a/common/shlibs b/common/shlibs
index 70678bfebda..d792fb83c6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2048,6 +2048,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 00000000000..fd03a4809f3
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 00000000000..46e423b2ce7
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 92adab2b78ac23e7d4a7662dba5bc96346558126 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/12] New package: qt6-qt5compat-6.0.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 00000000000..f88da3a0fe5
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 00000000000..3271557fb61
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 64664a171a49767824d08166eac827a1993462ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/12] New package: qt6-tools-6.0.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 00000000000..be224b6fe75
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From e4aeb125ef6c55fcaa39abec1d80f5b6dc95873f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/12] New package: qt6-svg-6.0.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 00000000000..69c493dbd79
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 00000000000..6959b23856f
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From e4f02184f0eee0da1ce8c3edc89bfc5116a54150 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/12] New package: qt6-translations-6.0.0

---
 srcpkgs/qt6-translations/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 00000000000..b9b75a81988
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <johnz@posteo.net>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5

From 83b4a18acaa52d8b3635cd3c954dc985d2298506 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/12] New package: qt6-shadertools-6.0.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template

diff --git a/common/shlibs b/common/shlibs
index d792fb83c6a..ebe8c35fad8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2059,6 +2059,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 00000000000..f1424d216cb
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 00000000000..056289d16b6
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From d26b18265dbcfdaca8cfc0ad0e9ae78843142fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/12] New package: qt6-quick3d-6.0.0

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template

diff --git a/common/shlibs b/common/shlibs
index ebe8c35fad8..bbae4e917d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2060,6 +2060,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 00000000000..91ff6f03e47
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 00000000000..fba3bc4f191
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From bb21d57373902cd5458a1c23aa65a25e2ee7db5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/12] New package: qt6-quickcontrols2-6.0.0

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template

diff --git a/common/shlibs b/common/shlibs
index bbae4e917d8..248bde64b92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2064,6 +2064,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 00000000000..280bc162057
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 00000000000..b7577cd1ae6
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0577f93b67da172701d13032a5d36c70e5c425b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/12] New package: qt6-quicktimeline-6.0.0

---
 srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 00000000000..4b07d8f4ac2
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (4 preceding siblings ...)
  2020-12-23 23:20 ` Johnnynator
@ 2020-12-24 11:01 ` Johnnynator
  2021-04-29 17:19 ` Johnnynator
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2020-12-24 11:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs
- [ ] link against system libressl instead of vendored OpenSSL

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 55820 bytes --]

From b47ef03e8a09d0ac16dcc869e61ce8a4b8daf786 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/12] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 136312ed7b4..0b393049f0d 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,7 +54,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=Release"

From 1d23e7484190ed62ad9ee3ef858410e792e2c6fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/12] New package: qt6-base-6.0.0

---
 common/shlibs                                 |  18 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-docs                         |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 198 +++++++++
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 21 files changed, 645 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b69c8455fc..34f47ab76cb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2030,6 +2030,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.8 libfm-qt-0.16.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 00000000000..54f96779b31
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 00000000000..e28e75bfb0a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 00000000000..d5e11d42a07
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,198 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.0
+revision=1
+#archs="i686 x86_64"
+wrksrc="qtbase-everywhere-src-${version}"
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON
+ -GNinja"
+make_cmd=ninja
+hostmakedepends="perl pkg-config ninja"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 00000000000..8ddee598d5e
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From b8a0cc66a310fb8bac5575844cb159e8d5c6eb9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/12] New package: qt6-wayland-6.0.0

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template

diff --git a/common/shlibs b/common/shlibs
index 34f47ab76cb..70678bfebda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2046,8 +2046,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 00000000000..c4dec18ea9a
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 00000000000..0a744febbe2
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 967717a48b66b26d6218e7a348d05a1a09866758 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/12] New package: qt6-declarative-6.0.0

---
 common/shlibs                    | 11 +++++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 100644 srcpkgs/qt6-declarative/template

diff --git a/common/shlibs b/common/shlibs
index 70678bfebda..d792fb83c6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2048,6 +2048,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 00000000000..fd03a4809f3
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 00000000000..46e423b2ce7
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 5c3b111db417b41b5ece1a5dc3fdaccfaea06ddf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/12] New package: qt6-qt5compat-6.0.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 00000000000..f88da3a0fe5
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 00000000000..3271557fb61
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=13b9d78aa698609d07376e3e9e9d1a82a96084236aba0642f8ac695c181ab25f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 077912684d18f14a0d49b85a23ce007fefedf945 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/12] New package: qt6-tools-6.0.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 00000000000..d2de59aba45
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 00000000000..be224b6fe75
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b982ccd7742ff3f76f2ea83f459520feee23ab29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/12] New package: qt6-svg-6.0.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 00000000000..69c493dbd79
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 00000000000..6959b23856f
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From e2a764605e16b5baf0525dac9c44cca29812f493 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/12] New package: qt6-translations-6.0.0

---
 srcpkgs/qt6-translations/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 00000000000..b9b75a81988
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <johnz@posteo.net>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5

From ce4fc377ec8aeee91de003c31b5bd4a1d42b40f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/12] New package: qt6-shadertools-6.0.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template

diff --git a/common/shlibs b/common/shlibs
index d792fb83c6a..ebe8c35fad8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2059,6 +2059,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 00000000000..f1424d216cb
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 00000000000..056289d16b6
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From a8f7c9876404c2a9d90e4a7b855446dcde41ef08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/12] New package: qt6-quick3d-6.0.0

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template

diff --git a/common/shlibs b/common/shlibs
index ebe8c35fad8..bbae4e917d8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2060,6 +2060,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 00000000000..91ff6f03e47
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 00000000000..fba3bc4f191
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b07e8e8425fd1ea88970cb2ac9fa3839a1f1f40c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/12] New package: qt6-quickcontrols2-6.0.0

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template

diff --git a/common/shlibs b/common/shlibs
index bbae4e917d8..248bde64b92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2064,6 +2064,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 00000000000..280bc162057
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 00000000000..b7577cd1ae6
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ab45087163c9a82e1588a70044b787cc28a50335 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/12] New package: qt6-quicktimeline-6.0.0

---
 srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 00000000000..4b07d8f4ac2
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (5 preceding siblings ...)
  2020-12-24 11:01 ` Johnnynator
@ 2021-04-29 17:19 ` Johnnynator
  2021-04-29 19:02 ` Johnnynator
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-04-29 17:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs
- [ ] link against system libressl instead of vendored OpenSSL

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 71682 bytes --]

From 3726d341bd3485f21d612f7da047e18522017b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/22] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..1ca5983760f1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 64a8a4b7a90015cfe2343e4232d175ee0f750e33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/22] New package: qt6-base-6.0.0

---
 common/shlibs                                 |  18 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-docs                         |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 198 +++++++++
 srcpkgs/qt6-base/update                       |   1 +
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 22 files changed, 646 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index d6f8690fe6a7..19c0020c19ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1983,6 +1983,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 000000000000..e28e75bfb0a1
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..d5e11d42a070
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,198 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.0
+revision=1
+#archs="i686 x86_64"
+wrksrc="qtbase-everywhere-src-${version}"
+#create_wrksrc=yes
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON
+ -GNinja"
+make_cmd=ninja
+hostmakedepends="perl pkg-config ninja"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 2795f09207cec442f1cda70230d8e3775a450635 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/22] New package: qt6-wayland-6.0.0

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 19c0020c19ac..5b923c0830ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1999,8 +1999,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..0a744febbe23
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 91098f6c6e74e53aef699dce1c97323c22b433ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/22] New package: qt6-declarative-6.0.0

---
 common/shlibs                    | 11 +++++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative/template | 33 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 4 files changed, 46 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 5b923c0830ed..89749959456f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2001,6 +2001,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..46e423b2ce73
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 0a7305ad7c090e16c5032eee0c9aa890e00308e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/22] New package: qt6-qt5compat-6.0.3

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 28 ++++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..d11b779ac34b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.3
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 57205ca493f6522ed696a97415ef93a93023d111 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/22] New package: qt6-tools-6.0.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..be224b6fe753
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 359c02e31279bec42ebc3ede92f8dac17f93b9b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/22] New package: qt6-svg-6.0.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 28 ++++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..6959b23856fc
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 80812ee88f6cf85efe946c0805b0ea7ce4097dde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/22] New package: qt6-translations-6.0.0

---
 srcpkgs/qt6-translations/template | 16 ++++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..b9b75a819886
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <johnz@posteo.net>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From da7d02106a569e1144c98f9c5ace862ce5f9bcf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/22] New package: qt6-shadertools-6.0.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 28 ++++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index 89749959456f..ea5bb48a9d05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..056289d16b6e
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From bd21e66fd4833cb125739ff19228db7bce6edbdc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/22] New package: qt6-quick3d-6.0.0

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index ea5bb48a9d05..cd2e42dffa59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2013,6 +2013,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..fba3bc4f1914
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From b93080072b09187a09aa466e0ad17cd6e0af85a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/22] New package: qt6-quickcontrols2-6.0.0

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 28 ++++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 4 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index cd2e42dffa59..e46d485283ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2017,6 +2017,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..b7577cd1ae6e
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 0b0b26884b74030e08918e2eebf82311873eddfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/22] New package: qt6-quicktimeline-6.0.0

---
 srcpkgs/qt6-quicktimeline/template | 16 ++++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..4b07d8f4ac2c
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,16 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON -GNinja"
+make_cmd=ninja
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <johnz@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e3b58792b8c5dc2c25f65e59ed3463e979f2fd12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:10:14 +0200
Subject: [PATCH 13/22] qt6-base: update to 6.0.3.

---
 srcpkgs/qt6-base/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index d5e11d42a070..7a7ca6a9c92d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,10 +1,8 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.0.0
+version=6.0.3
 revision=1
-#archs="i686 x86_64"
 wrksrc="qtbase-everywhere-src-${version}"
-#create_wrksrc=yes
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6
@@ -12,10 +10,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
  -DINSTALL_SYSCONFDIR=/etc/xdg
- -DQT_USE_CCACHE=ON
- -GNinja"
-make_cmd=ninja
-hostmakedepends="perl pkg-config ninja"
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="perl pkg-config xmlstarlet"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel 
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -30,7 +26,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=ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
+checksum=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
 python_version=3
 
 # TODO: fix usage of ccache

From 6edd9eca52542143bd81ea698eea9452a1d80b2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:10:24 +0200
Subject: [PATCH 14/22] qt6-wayland: update to 6.0.3.

---
 srcpkgs/qt6-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index 0a744febbe23..b3ccb994a0cc 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -16,7 +16,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/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=fa3a3110d5a584213fa7f12ee1f6abc19d31907433925b9e2449dee8fba1c588
+checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-wayland-devel"

From 2841e5af4bef5a9fd8c5e80cfd036e0d080d8f6a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:10:36 +0200
Subject: [PATCH 15/22] qt6-declarative: update to 6.0.3.

---
 srcpkgs/qt6-declarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index 46e423b2ce73..bb9023775f76 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,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=8535fe31fa3e876b8f2d3954efcdca47b3813adf228c1640608fb9f4c7b2c1a6
+checksum=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-declarative-devel"

From 6f8658d7689053023c9995bc84658b96e82ecae8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:18 +0200
Subject: [PATCH 16/22] qt6-tools: update to 6.0.3.

---
 srcpkgs/qt6-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index be224b6fe753..7e8fbe6e9e0d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=b6dc559db447bf394d09dfb238d5c09108f834139a183888179e855c6566bfae
+checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 3b6418fbd3fead80c8692dfbd2fb4856ac2b83d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:24 +0200
Subject: [PATCH 17/22] qt6-svg: update to 6.0.3.

---
 srcpkgs/qt6-svg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 6959b23856fc..7e38dc4046ba 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=9703c9a69e21ad373fb52d0107338da7ef0a46966f69107b0d879e9c366dd91b
+checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
 
 qt6-svg-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 061bb7d95e58f75acba120ecd7baa2be382c2662 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:31 +0200
Subject: [PATCH 18/22] qt6-translations: update to 6.0.3.

---
 srcpkgs/qt6-translations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index b9b75a819886..47c38075c6fe 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="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/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=ed6487425c17e88531e825c44820c1f47c9b7dc0918125e5d45ccc36fdc679d5
+checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933

From 10035f42ddda8c5fec1d2fcf1819d79b5298a10b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:38 +0200
Subject: [PATCH 19/22] qt6-shadertools: update to 6.0.3.

---
 srcpkgs/qt6-shadertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 056289d16b6e..632359d58f08 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=201b1376b65ef9f7fd19789781e0378ea813385217cd392c5c896699e6108e6c
+checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From b034fc67618f4ba36704e0c65151685d6bc6f0fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:51 +0200
Subject: [PATCH 20/22] qt6-quick3d: update to 6.0.3.

---
 srcpkgs/qt6-quick3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index fba3bc4f1914..93b5beaf51d7 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=0a9a3e765c343b55511900b173f9591df88b0787f67b9ecfb8f25203bfdb0aa8
+checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
 
 qt6-quick3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From d65c45e6095217bfd050e4b70d2e21fe7cdfc096 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:56 +0200
Subject: [PATCH 21/22] qt6-quickcontrols2: update to 6.0.3.

---
 srcpkgs/qt6-quickcontrols2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
index b7577cd1ae6e..3defa43d1595 100644
--- a/srcpkgs/qt6-quickcontrols2/template
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quickcontrols2'
 pkgname=qt6-quickcontrols2
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtquickcontrols2-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
-checksum=03fd2dbf030bf859e8069144bb6a282517063589c9d4025293eb89bcc580253b
+checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
 
 qt6-quickcontrols2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From ddea198816151a0d57a9759a735892c8602eb1a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 19:11:59 +0200
Subject: [PATCH 22/22] qt6-quicktimeline: update to 6.0.3.

---
 srcpkgs/qt6-quicktimeline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 4b07d8f4ac2c..a2aecc90a1db 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.0.0
+version=6.0.3
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
-checksum=7a71495c07a98279a852d518bc9ca0f07b49b495ceb65bfdd000c826ee156b0c
+checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (6 preceding siblings ...)
  2021-04-29 17:19 ` Johnnynator
@ 2021-04-29 19:02 ` Johnnynator
  2021-04-29 19:44 ` Johnnynator
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-04-29 19:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs
- [ ] link against system libressl instead of vendored OpenSSL

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 79864 bytes --]

From 3726d341bd3485f21d612f7da047e18522017b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/13] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..1ca5983760f1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 380bf152d2427689d14b2ae0089b5f0c69c43bae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/13] New package: qt6-base-6.0.3

---
 common/shlibs                                 |  18 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-docs                         |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 194 +++++++++
 srcpkgs/qt6-base/update                       |   1 +
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 22 files changed, 642 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-docs
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index d6f8690fe6a7..19c0020c19ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1983,6 +1983,24 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0alpha_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-docs b/srcpkgs/qt6-base-docs
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-docs
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 000000000000..e28e75bfb0a1
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..7a7ca6a9c92d
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,194 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.3
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="perl pkg-config xmlstarlet"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel libmysqlclient-devel
+ postgresql-libs-devel unixodbc-devel cups-devel
+ libproxy-devel brotli-devel sqlite-devel
+ Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-docs_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 81a67c5beab0be570f32272db429e679a455610b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/13] New package: qt6-wayland-6.0.3

---
 common/shlibs                |  4 ++--
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 19c0020c19ac..5b923c0830ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1999,8 +1999,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
-libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0alpha_1
-libQt6WaylandClient.so.6 qt6-wayland-6.0.0alpha_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..256f575fd568
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.3
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON" 
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework (QT6) - Wayland component"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e4efa878a566154bfe8d7862a3d9adc8f95b6d72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/13] New package: qt6-declarative-6.0.3

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 46 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 60 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 5b923c0830ed..89749959456f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2001,6 +2001,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..e5d57f14232d
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,46 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.3
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework (QT6) - Declarative component"
+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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-declarative-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install () {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ee1ae39c0b5e8181cc1b59fc7b597f46b6257464 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/13] New package: qt6-qt5compat-6.0.3

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..0636bfa2b67a
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.3
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-qt5compat component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 1b638e46bd85d753db004fdd785c3f713f4fcc4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/13] New package: qt6-tools-6.0.3

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..f1bd70ad3094
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.3
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From b8f733e2f6346c24d1bffacc1f0f8d2e295b142a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/13] New package: qt6-svg-6.0.3

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..b2ec9ff162ad
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.3
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 05a8573044f46709e7a9aeda996e27f20509aba7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/13] New package: qt6-translations-6.0.3

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..0849abf903d1
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.3
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-translations component"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 23dd223970a3991277f5c1f7bba2a6c2571853fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/13] New package: qt6-shadertools-6.0.3

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index 89749959456f..ea5bb48a9d05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..c5953a5261dc
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.3
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-shadertools component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 73884c6e2be2991c249e5033b92c7ba000532c68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/13] New package: qt6-quick3d-6.0.3

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index ea5bb48a9d05..cd2e42dffa59 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2013,6 +2013,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..adc2f33bc99d
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.3
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quick3d component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 719236f1c78ddff95d4829e40fccaac71ac13f61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/13] New package: qt6-quickcontrols2-6.0.3

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 4 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index cd2e42dffa59..e46d485283ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2017,6 +2017,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..aa40e67bd65b
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.3
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quickcontrols2 component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 758e5ee0fe720f7af2bc017eb3eb23620b208967 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/13] New package: qt6-quicktimeline-6.0.3

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..87f2405ca636
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.3
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-quicktimeline component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 87c66ca0fc0a7b6d3fa10cb0c78e763d9eeaddcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 13/13] strawberry: update to 0.9.3.

---
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  15 +-
 2 files changed, 8 insertions(+), 354 deletions(-)
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..cef6422c94a9 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,19 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+configure_args="-DBUILD_WITH_QT6=ON"
+hostmakedepends="pkg-config qt6-base protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel qt6-tools-devel qt6-plugin-mysql
+ qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ taglib-devel"
+depends="qt6-plugin-sqlite desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (7 preceding siblings ...)
  2021-04-29 19:02 ` Johnnynator
@ 2021-04-29 19:44 ` Johnnynator
  2021-05-01  9:59 ` Johnnynator
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-04-29 19:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs

the cmake part does not use the host version of some tools e.g. a problem with lconvert

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 79434 bytes --]

From 3726d341bd3485f21d612f7da047e18522017b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/13] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..1ca5983760f1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 09a531c3788af3a750abe7f967b6810366ec7031 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/13] New package: qt6-base-6.0.3

---
 common/shlibs                                 |  16 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-doc                          |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 194 +++++++++
 srcpkgs/qt6-base/update                       |   1 +
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 22 files changed, 640 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index d6f8690fe6a7..311764ff49ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1983,6 +1983,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 000000000000..e28e75bfb0a1
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..77bee6a63163
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,194 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.3
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="perl pkg-config xmlstarlet"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel
+ libmariadbclient-devel postgresql-libs-devel
+ unixodbc-devel cups-devel libproxy-devel brotli-devel
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 42e054e90cc989b04697fca7b13e62886b0b4d3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/13] New package: qt6-wayland-6.0.3

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 311764ff49ed..9c258b2840de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1999,6 +1999,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..f74015b50c04
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.3
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From f72bedb941f7246c3ba38fe867f304e33a924f50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/13] New package: qt6-declarative-6.0.3

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 9c258b2840de..988d0afa466e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2001,6 +2001,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..ebdf4ad6e18e
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.3
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 257cbf71b3f55cd624f870c09eba0308456385f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/13] New package: qt6-qt5compat-6.0.3

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..922cf9e2ed18
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.3
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 8c947e50642b42f4204baea8427a1dee23df0fce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/13] New package: qt6-tools-6.0.3

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..f1bd70ad3094
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.3
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 4cf6333c74cd4b32edbecb0038bfdcf33acf1ced Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/13] New package: qt6-svg-6.0.3

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..b2ec9ff162ad
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.3
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From f0d6c8d6063cdd0cbc3ad0d0552645cb209bed64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/13] New package: qt6-translations-6.0.3

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..c5faea9e526a
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.3
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From c9fde85b0b7be6153d26d5141292167d479fb5b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/13] New package: qt6-shadertools-6.0.3

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index 988d0afa466e..a442682515e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..44ad3578b6b9
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.3
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 55adb0f010bbedb5117fcb6e62f448acde559851 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/13] New package: qt6-quick3d-6.0.3

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index a442682515e6..3817a6ac111e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2013,6 +2013,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..da89b64bdf02
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.3
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 96831026dd1a9c0b5ac02dccfeeeb5cf2023a0c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/13] New package: qt6-quickcontrols2-6.0.3

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 4 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index 3817a6ac111e..36092ba8fb0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2017,6 +2017,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..3f7db62636a2
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.3
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 64cfa80765a85e2365e386f88a22750e569b37e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/13] New package: qt6-quicktimeline-6.0.3

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..04f4690a1798
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.3
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 2756db7f4bce9252cd900513c57a78ac059acf41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 13/13] strawberry: update to 0.9.3.

---
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  15 +-
 2 files changed, 8 insertions(+), 354 deletions(-)
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..99639a2ae71e 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,19 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+hostmakedepends="pkg-config qt6-base-devel protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel qt6-tools-devel qt6-plugin-mysql
+ qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ taglib-devel"
+depends="qt6-plugin-sqlite desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (8 preceding siblings ...)
  2021-04-29 19:44 ` Johnnynator
@ 2021-05-01  9:59 ` Johnnynator
  2021-05-01 18:10 ` [PR REVIEW] " yopito
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-01  9:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs

the cmake part does not use the host version of some tools e.g. a problem with lconvert

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 133739 bytes --]

From 5ece456234ecb27e74d02ef4686df33fc624b056 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/31] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..1ca5983760f1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From f6db49403795408fe59e4f8174b45db8f52ad70d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/31] New package: qt6-base-6.0.3

---
 common/shlibs                                 |  16 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-doc                          |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 194 +++++++++
 srcpkgs/qt6-base/update                       |   1 +
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 22 files changed, 640 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index c39878238889..b7ac466aa3f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 000000000000..e28e75bfb0a1
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..77bee6a63163
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,194 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.3
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="perl pkg-config xmlstarlet"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel
+ libmariadbclient-devel postgresql-libs-devel
+ unixodbc-devel cups-devel libproxy-devel brotli-devel
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From e78f8ce99132c125b798d91d45fb1931b6228ed4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/31] New package: qt6-wayland-6.0.3

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index b7ac466aa3f2..fc14f4d0e309 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..f74015b50c04
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.3
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 0306ee341ab1f0a3247f06bbd2f1ce16e789deb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/31] New package: qt6-declarative-6.0.3

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index fc14f4d0e309..a4d46ec0d107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..ebdf4ad6e18e
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.3
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 1ea8a692ba1723774d120486d6c0cb234802383a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/31] New package: qt6-qt5compat-6.0.3

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..922cf9e2ed18
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.3
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 627a686243344d930323c7f1e32a2aba7a84421f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/31] New package: qt6-tools-6.0.3

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..f1bd70ad3094
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.3
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 91509f8efccebf07b339eb68b7a3409dac14c031 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/31] New package: qt6-svg-6.0.3

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..b2ec9ff162ad
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.3
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 365bc8b999a38c3bde962248389828e432ed51ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/31] New package: qt6-translations-6.0.3

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..c5faea9e526a
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.3
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 7367f835c39ff35ad88f98797adcdd7428b5ea4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/31] New package: qt6-shadertools-6.0.3

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index a4d46ec0d107..6217cfc81275 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..44ad3578b6b9
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.3
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From b185ce7f2bddb2c1cf66b0386817d05f11a40f8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/31] New package: qt6-quick3d-6.0.3

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6217cfc81275..d811145a85ca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..da89b64bdf02
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.3
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From f01d2debacce9e2e4e341e3ed3d48ac2ea845299 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/31] New package: qt6-quickcontrols2-6.0.3

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 4 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index d811145a85ca..07c8e7e9056d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2016,6 +2016,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..3f7db62636a2
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.3
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From fa5cb97381d4d5982c775127f201ce2c6e5425d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/31] New package: qt6-quicktimeline-6.0.3

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..04f4690a1798
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.3
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e92d4a84a3e4323c7c17aae0329293e8b7376a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 13/31] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  15 +-
 3 files changed, 18 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..0de6fffbde2a 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,19 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+hostmakedepends="pkg-config qt6-base-devel qt6-tools-devel protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel qt6-base-devel qt6-plugin-mysql
+ qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ taglib-devel"
+depends="qt6-plugin-sqlite desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e

From a7f585ab5f63c8a0fea0cacaf5619bea6dbe6c53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:23 +0200
Subject: [PATCH 14/31] qt6-base: update to 6.1.0rc2.

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ------------------
 srcpkgs/qt6-base/template                     |   8 +-
 2 files changed, 4 insertions(+), 396 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index e28e75bfb0a1..000000000000
--- a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
- .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
- 6 files changed, 93 insertions(+), 3 deletions(-)
-
-diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- src/network/ssl/qsslcertificate_openssl.cpp
-+++ src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
-index abc398b209..c2f90be009 100644
---- src/network/ssl/qsslcontext_openssl.cpp
-+++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -397,16 +397,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- src/network/ssl/qsslcontext_openssl_p.h
-+++ src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- src/network/ssl/qsslkey_openssl.cpp
-+++ src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 2f57998cea..a3eb363385 100644
---- src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- #ifdef TLS1_3_VERSION
-@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
- 
-@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
-index 018962bcc1..8977f428e0 100644
---- src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 77bee6a63163..ea60021461c8 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtbase-everywhere-src-${version}"
+wrksrc="qtbase-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6
@@ -25,8 +25,8 @@ 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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtbase-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=3884c64750a9b6ef544ee2fb72a2bf5e5e167501d6ea11ab1a55105e354a506e
 python_version=3
 
 # TODO: fix usage of ccache

From 33a9df8e9aef5580162d92dee6629a180ec8e30e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:28 +0200
Subject: [PATCH 15/31] qt6-declarative: update to 6.1.0rc2.

---
 srcpkgs/qt6-declarative/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index ebdf4ad6e18e..fc30a40a3b9b 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtdeclarative-everywhere-src-${version}"
+wrksrc="qtdeclarative-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
  -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
@@ -13,8 +13,8 @@ short_desc="Cross-platform application and UI framework - Declarative"
 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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtdeclarative-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=b08c2e23b13a63c0bc70e302e3921fb1fde97fc3a0246169bd69863615363f69
 
 qt6-declarative-tools_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a3fae544a308967d5e1ac7e820bfd9e2afb291a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:32 +0200
Subject: [PATCH 16/31] qt6-qt5compat: update to 6.1.0rc2.

---
 srcpkgs/qt6-qt5compat/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 922cf9e2ed18..93e001794de9 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qt5compat-everywhere-src-${version}"
+wrksrc="qt5compat-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="qt6-base-devel ninja perl"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Compo
 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://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qt5compat-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=85c8c6c0e1d1e26489f486cd2855ea3ffa219f3c875ea66f0083c0da3b74c7f1
 
 qt6-qt5compat-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 351875b35659cbfe2a4f929e7d47746519fcdc0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:41 +0200
Subject: [PATCH 17/31] qt6-quick3d: update to 6.1.0rc2.

---
 common/shlibs                |  1 +
 srcpkgs/qt6-quick3d/template | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 07c8e7e9056d..177fd265c015 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2016,6 +2016,7 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index da89b64bdf02..0079348f45a8 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,19 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquick3d-everywhere-src-${version}"
+wrksrc="qtquick3d-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
-hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquick3d-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=0f0bb681b3751093ca1c41acbe42a060c54fed54ed712b54dfaeb8c087d6efea
 
 qt6-quick3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 8d122727e5fe53ceccfc1f6751af9b55a80fa2b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:45 +0200
Subject: [PATCH 18/31] qt6-quickcontrols2: update to 6.1.0rc2.

---
 srcpkgs/qt6-quickcontrols2/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
index 3f7db62636a2..b3207a112d21 100644
--- a/srcpkgs/qt6-quickcontrols2/template
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-quickcontrols2'
 pkgname=qt6-quickcontrols2
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquickcontrols2-everywhere-src-${version}"
+wrksrc="qtquickcontrols2-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework - quickcontrols2"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
-checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquickcontrols2-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=f8781455b4962c7fc9469c69f2343c2928c8271355c215bbca7e9793997ccea0
 
 qt6-quickcontrols2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 68e9788ed84216d5cad51ecb485733078871b19f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:47 +0200
Subject: [PATCH 19/31] qt6-quicktimeline: update to 6.1.0rc2.

---
 srcpkgs/qt6-quicktimeline/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 04f4690a1798..e614136bb62c 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquicktimeline-everywhere-src-${version}"
+wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
@@ -11,5 +11,5 @@ short_desc="Cross-platform application and UI framework - quicktimeline"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
-checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=6ad8af7d8473f1e4d28b558adbb6191c7584fb16b75bafbaf5fc74979a7d2fd5

From c9157e63bad11c24990f96570034f66c1f91f63e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:50 +0200
Subject: [PATCH 20/31] qt6-shadertools: update to 6.1.0rc2.

---
 srcpkgs/qt6-shadertools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 44ad3578b6b9..0fef5e6a1285 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtshadertools-everywhere-src-${version}"
+wrksrc="qtshadertools-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="ninja perl qt6-base-devel"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework - shadertools"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtshadertools-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=5e5eea9e19899034e18847443633aab8c522d88c222ad2eb381bc52edc9a5534
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 230f33a3c3c49e3980506b67c38e24ddeff5e2e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:52 +0200
Subject: [PATCH 21/31] qt6-svg: update to 6.1.0rc2.

---
 srcpkgs/qt6-svg/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index b2ec9ff162ad..c62e8f12db85 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtsvg-everywhere-src-${version}"
+wrksrc="qtsvg-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="ninja qt6-base-devel perl"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework (QT6) - qt6-svg componen
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtsvg-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=2b8a03379a3af71d436fec6b14341dfc5105acd41edd27386c7dfc784b6433da
 
 qt6-svg-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From d4d17b207e7488c9602575c3534bfbebdfb08ae6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:56 +0200
Subject: [PATCH 22/31] qt6-tools: update to 6.1.0rc2.

---
 srcpkgs/qt6-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f1bd70ad3094..cc045d1b7fb9 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qttools-everywhere-src-${version}"
+wrksrc="qttools-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="qt6-base-devel ninja perl"
@@ -11,8 +11,8 @@ short_desc="Cross-platform application and UI framework (QT6) - qt6-tools compon
 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://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qttools-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=557472d76c58cc62ef58a9a373eafa35f0aa8c28a002f824bb6401a3490a1e5b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 7149144805bb4434cc774deb93f91f57c48dd20c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:58 +0200
Subject: [PATCH 23/31] qt6-translations: update to 6.1.0rc2.

---
 srcpkgs/qt6-translations/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index c5faea9e526a..3c7ec22faf3c 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qttranslations-everywhere-src-${version}"
+wrksrc="qttranslations-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
 hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
@@ -11,5 +11,5 @@ short_desc="Cross-platform application and UI framework - translations"
 maintainer="John <me@johnnynator.dev>"
 license="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/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qttranslations-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=40db0a83e50067df9808e03eff40059e82382b091b5a421a089b3986f045ea47

From 2b1e2d99246ed0220b26fbb660b16ec83e7bd1af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:18:00 +0200
Subject: [PATCH 24/31] qt6-wayland: update to 6.1.0rc2.

---
 srcpkgs/qt6-wayland/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index f74015b50c04..ee61d5e0ad66 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtwayland-everywhere-src-${version}"
+wrksrc="qtwayland-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
  -DQT_USE_CCACHE=ON"
@@ -14,8 +14,8 @@ short_desc="Cross-platform application and UI framework - Wayland"
 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/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtwayland-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=60aa224ac3565691b2fbe698e3eb01b7b5aee31e4a52c5b56d21af542f1e7422
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-wayland-devel"

From 6d98da96f132ca322dd2cffe9820b310ce09a685 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 25/31] New package: qt6-virtualkeyboard-6.1.0rc2

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..cb51edc6c2db
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0rc2
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtvirtualkeyboard-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=9297d7c0a2ebfc3f8fc5459a165d52234ec142638f2f6c40dcc04fe65e309e35
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 24a5cf23ec98ccfcb7c9e26a8a3b572d430d1d07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 26/31] New package: qt6-networkauth-6.1.0rc2

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index 177fd265c015..b82c238eb71c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..6131ad24eb13
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0rc2
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtnetworkauth-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=100b6953b25bb2f87219d2dd5cf15410fbb0c641be20c4533ff8108da712ee99
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 8f0d46cd55b48461e2627edf40f4f54393d08e47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 27/31] New package: qt6-scxml-6.1.0rc2

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index b82c238eb71c..e3047cdff2da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..e306dc05acef
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0rc2
+revision=1
+wrksrc="qtscxml-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtscxml-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=9d9e51bde471bb1cb363a2972e32cdcdacca30e44dfec5176436059cb54b857d
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From da6b9db9dd07b14f5a0a64f9365ed3ab134b7b69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 28/31] New package: qt6-imageformats-6.1.0rc2

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..8aa1bab4e4ee
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0rc2
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtimageformats-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=3bd902a28e7cb0a17d4dee6fe15bdcb1866dd99784556d046aca5fc129792ec1

From 70f94934f5b9a059dd11d89b76710126184248b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 29/31] New package: qt6-lottie-6.1.0rc2

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index e3047cdff2da..6d00d745f809 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..67c1d600e1cf
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0rc2
+revision=1
+wrksrc="qtlottie-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+depends=""
+short_desc="Cross-platform application and UI framework - lottie"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtlottie-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=721111c473a95db76e42b937c8d33b3219d377fd46acc4413dcdcedee062aa1a
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From a4560970e3381dd3109f4494b5f981527625f343 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 30/31] New package: qt6-3d-6.1.0rc2

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 27 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 6d00d745f809..fba2ce941517 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..ddbae3d18592
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0rc2
+revision=1
+wrksrc="qt3d-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qt3d-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=30816b9b47138e9839d4dc2a855e0cde37f8100ed70b3ae18b25c7c4d621a24a
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 3376405ae43ac09366dea16a813f10e9250d2312 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 31/31] New package: qt6-charts-6.1.0rc2

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index fba2ce941517..a5108244d439 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..45031e51f7c4
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0rc2
+revision=1
+wrksrc="qtcharts-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtcharts-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=50fe67d3ebd49cd10fa5dc5251726d8bf2f1bdb48ab5f91aa4d912745704be5d
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (9 preceding siblings ...)
  2021-05-01  9:59 ` Johnnynator
@ 2021-05-01 18:10 ` yopito
  2021-05-01 18:10 ` yopito
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: yopito @ 2021-05-01 18:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/27349#discussion_r624544817

Comment:
I had a look on qt6-base and cmake. here my points:

"`-D-DQT_USE_CCACHE`" has no effect if ccache is enabled from xbps-src  : ccache will be used.
I think "`-DQT_USE_CCACHE=OFF`" might be a better idea (similar to other packages)

qt6-base build uses precompiled headers (pch) when working with automoc. ccache does not handle pch until some additional configuration (see https://ccache.dev/manual/4.2.1.html#_precompiled_headers).
 => so ccache is rather useless in this case: about 150/1160 "objects" are stored in ccache
workarounds:
* hope that packagers will enable pch support in ccache. IMHO, this support is somewhat imprecise, afraid of false positive
* disable use of pch for building qt6-base with "`-DBUILD_WITH_PCH=OFF`" : some overhead (not that much) on first build, but ccache efficiency after (about 70 minutes on 1st run, 6 minutes  then to build+package qt6-base). And no particular settings

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (10 preceding siblings ...)
  2021-05-01 18:10 ` [PR REVIEW] " yopito
@ 2021-05-01 18:10 ` yopito
  2021-05-01 18:11 ` yopito
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: yopito @ 2021-05-01 18:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/27349#discussion_r624544817

Comment:
I had a look on qt6-base and cmake and ccache. here my points:

"`-D-DQT_USE_CCACHE`" has no effect if ccache is enabled from xbps-src  : ccache will be used.
I think "`-DQT_USE_CCACHE=OFF`" might be a better idea (similar to other packages)

qt6-base build uses precompiled headers (pch) when working with automoc. ccache does not handle pch until some additional configuration (see https://ccache.dev/manual/4.2.1.html#_precompiled_headers).
 => so ccache is rather useless in this case: about 150/1160 "objects" are stored in ccache
workarounds:
* hope that packagers will enable pch support in ccache. IMHO, this support is somewhat imprecise, afraid of false positive
* disable use of pch for building qt6-base with "`-DBUILD_WITH_PCH=OFF`" : some overhead (not that much) on first build, but ccache efficiency after (about 70 minutes on 1st run, 6 minutes  then to build+package qt6-base). And no particular settings

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (11 preceding siblings ...)
  2021-05-01 18:10 ` yopito
@ 2021-05-01 18:11 ` yopito
  2021-05-01 22:06 ` [PR PATCH] [Updated] " Johnnynator
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: yopito @ 2021-05-01 18:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/27349#discussion_r624544817

Comment:
I had a look on qt6-base and cmake and ccache. here my points:

"`-D-DQT_USE_CCACHE`" has no effect if ccache is enabled from xbps-src  : ccache will be used.
I think "`-DQT_USE_CCACHE=OFF`" might be a better idea (similar to other packages)

qt6-base build uses precompiled headers (pch) when working with automoc. ccache does not handle pch until some additional configuration (see https://ccache.dev/manual/4.2.1.html#_precompiled_headers).
 => so ccache is rather useless in this case: about 150/1160 "objects" are stored in ccache
workarounds:
* hope that packagers will enable pch support in ccache. IMHO, this support is somewhat imprecise, afraid of false positive
* disable use of pch for building qt6-base with "`-DBUILD_WITH_PCH=OFF`" : some overhead (not that much) on first build, but ccache efficiency after (about 70 minutes on 1st run, 6 minutes  then to build+package qt6-base). And no specific ccache settings is needed

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (12 preceding siblings ...)
  2021-05-01 18:11 ` yopito
@ 2021-05-01 22:06 ` Johnnynator
  2021-05-05 14:44 ` Johnnynator
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-01 22:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 135535 bytes --]

From 1b6463115344aa9c68f146b9e70fd1d8083fa90d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/31] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..1ca5983760f1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 19dbe023ff1c733bf75baa66242448659efc087a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/31] New package: qt6-base-6.0.3

---
 common/shlibs                                 |  16 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-doc                          |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 194 +++++++++
 srcpkgs/qt6-base/update                       |   1 +
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 22 files changed, 640 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index c39878238889..b7ac466aa3f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 000000000000..e28e75bfb0a1
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..77bee6a63163
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,194 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.3
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="perl pkg-config xmlstarlet"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel
+ libmariadbclient-devel postgresql-libs-devel
+ unixodbc-devel cups-devel libproxy-devel brotli-devel
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From f9cce50992d0c98b152056a5ba8d58e350320d7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/31] New package: qt6-wayland-6.0.3

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index b7ac466aa3f2..fc14f4d0e309 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..f74015b50c04
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.3
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d3d0551c33ab698ebf4d601a21fc12360d871648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/31] New package: qt6-declarative-6.0.3

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index fc14f4d0e309..a4d46ec0d107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..ebdf4ad6e18e
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.3
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e9b6a61937c752375d8b99af8465c501668b9370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/31] New package: qt6-qt5compat-6.0.3

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..922cf9e2ed18
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.3
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 2f53cefe91a9c98f590f435d069796090a34d873 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/31] New package: qt6-tools-6.0.3

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..f1bd70ad3094
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.3
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 6004a645981764d0a30f48c0b052c512b46fadcd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/31] New package: qt6-svg-6.0.3

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..b2ec9ff162ad
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.3
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 4a656186f5f8f8a80257aade6c814e73830d4b78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/31] New package: qt6-translations-6.0.3

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..c5faea9e526a
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.3
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 49deca14a5e7c017dd499afbf0ab1f5ac6a6c193 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/31] New package: qt6-shadertools-6.0.3

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index a4d46ec0d107..6217cfc81275 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..44ad3578b6b9
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.3
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 38d6b673ec020947f36a64c5eb58b180bbd60d33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/31] New package: qt6-quick3d-6.0.3

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6217cfc81275..d811145a85ca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..da89b64bdf02
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.3
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From f1bfceeba296fa57b8f4604e344864d85b62e9fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/31] New package: qt6-quickcontrols2-6.0.3

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 4 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index d811145a85ca..07c8e7e9056d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2016,6 +2016,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..3f7db62636a2
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.3
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 5c6086256cad865addca15f0ec5b1f8040f56637 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/31] New package: qt6-quicktimeline-6.0.3

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..04f4690a1798
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.3
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ccef92af18d359299754652e5c5d318cf0ea429a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 13/31] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  15 +-
 3 files changed, 18 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..0de6fffbde2a 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,19 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+hostmakedepends="pkg-config qt6-base-devel qt6-tools-devel protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel qt6-base-devel qt6-plugin-mysql
+ qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ taglib-devel"
+depends="qt6-plugin-sqlite desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e

From 764d546a65dba21dd09dd2cc003fc650f908f387 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:23 +0200
Subject: [PATCH 14/31] qt6-base: update to 6.1.0rc2.

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ------------------
 srcpkgs/qt6-base/template                     |  22 +-
 2 files changed, 8 insertions(+), 406 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index e28e75bfb0a1..000000000000
--- a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
- .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
- 6 files changed, 93 insertions(+), 3 deletions(-)
-
-diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- src/network/ssl/qsslcertificate_openssl.cpp
-+++ src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
-index abc398b209..c2f90be009 100644
---- src/network/ssl/qsslcontext_openssl.cpp
-+++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -397,16 +397,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- src/network/ssl/qsslcontext_openssl_p.h
-+++ src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- src/network/ssl/qsslkey_openssl.cpp
-+++ src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 2f57998cea..a3eb363385 100644
---- src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- #ifdef TLS1_3_VERSION
-@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
- 
-@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
-index 018962bcc1..8977f428e0 100644
---- src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 77bee6a63163..b0cc1e70457e 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtbase-everywhere-src-${version}"
+wrksrc="qtbase-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6
@@ -10,8 +10,10 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
  -DINSTALL_SYSCONFDIR=/etc/xdg
- -DQT_USE_CCACHE=ON"
-hostmakedepends="perl pkg-config xmlstarlet"
+ -DQT_HOST_PATH=/usr
+ -DBUILD_WITH_PCH=OFF
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -25,21 +27,13 @@ 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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtbase-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=3884c64750a9b6ef544ee2fb72a2bf5e5e167501d6ea11ab1a55105e354a506e
 python_version=3
 
-# TODO: fix usage of ccache
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
-	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-fi
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	# XXX: This should be fixed properly in the build system,
-	# it alread
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 

From 89cc9d838cfdf708e2e5b6eb608797fbb7aceedd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:28 +0200
Subject: [PATCH 15/31] qt6-declarative: update to 6.1.0rc2.

---
 srcpkgs/qt6-declarative/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index ebdf4ad6e18e..ef3b57a9e805 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtdeclarative-everywhere-src-${version}"
+wrksrc="qtdeclarative-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
+configure_args=" -DQT_HOST_PATH=/usr
  -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-declarative-devel"
@@ -13,8 +13,8 @@ short_desc="Cross-platform application and UI framework - Declarative"
 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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtdeclarative-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=b08c2e23b13a63c0bc70e302e3921fb1fde97fc3a0246169bd69863615363f69
 
 qt6-declarative-tools_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2c2801bc6581a15bb3f8be65c54ff8cdc66f5070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:32 +0200
Subject: [PATCH 16/31] qt6-qt5compat: update to 6.1.0rc2.

---
 srcpkgs/qt6-qt5compat/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 922cf9e2ed18..d0d382c9ce49 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qt5compat-everywhere-src-${version}"
+wrksrc="qt5compat-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel ninja perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
 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://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qt5compat-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=85c8c6c0e1d1e26489f486cd2855ea3ffa219f3c875ea66f0083c0da3b74c7f1
 
 qt6-qt5compat-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From cd7957b06a93fe3c598dcf9738c3ab3f9649b16c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:41 +0200
Subject: [PATCH 17/31] qt6-quick3d: update to 6.1.0rc2.

---
 common/shlibs                |  1 +
 srcpkgs/qt6-quick3d/template | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 07c8e7e9056d..177fd265c015 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2016,6 +2016,7 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index da89b64bdf02..fd7ddf81aacb 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,19 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquick3d-everywhere-src-${version}"
+wrksrc="qtquick3d-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
-hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquick3d-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=0f0bb681b3751093ca1c41acbe42a060c54fed54ed712b54dfaeb8c087d6efea
 
 qt6-quick3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From c7efc278cd4f513c2561286dccc32961d12133bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:45 +0200
Subject: [PATCH 18/31] qt6-quickcontrols2: update to 6.1.0rc2.

---
 srcpkgs/qt6-quickcontrols2/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
index 3f7db62636a2..ae4d1e6ab50c 100644
--- a/srcpkgs/qt6-quickcontrols2/template
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-quickcontrols2'
 pkgname=qt6-quickcontrols2
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquickcontrols2-everywhere-src-${version}"
+wrksrc="qtquickcontrols2-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quickcontrols2"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
-checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquickcontrols2-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=f8781455b4962c7fc9469c69f2343c2928c8271355c215bbca7e9793997ccea0
 
 qt6-quickcontrols2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 729d2e497f73103933e80edf42f21b12171f017c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:47 +0200
Subject: [PATCH 19/31] qt6-quicktimeline: update to 6.1.0rc2.

---
 srcpkgs/qt6-quicktimeline/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 04f4690a1798..c8b430eba8d4 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,15 +1,15 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquicktimeline-everywhere-src-${version}"
+wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
-checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=6ad8af7d8473f1e4d28b558adbb6191c7584fb16b75bafbaf5fc74979a7d2fd5

From b7d1c9e5de77e308504e49480dd8f59e226d88bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:50 +0200
Subject: [PATCH 20/31] qt6-shadertools: update to 6.1.0rc2.

---
 srcpkgs/qt6-shadertools/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 44ad3578b6b9..c9795985a95b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtshadertools-everywhere-src-${version}"
+wrksrc="qtshadertools-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtshadertools-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=5e5eea9e19899034e18847443633aab8c522d88c222ad2eb381bc52edc9a5534
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 51bc28ff804fcfea58fdf287d60c90cb1f9d86bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:52 +0200
Subject: [PATCH 21/31] qt6-svg: update to 6.1.0rc2.

---
 srcpkgs/qt6-svg/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index b2ec9ff162ad..a682e0c7299b 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtsvg-everywhere-src-${version}"
+wrksrc="qtsvg-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtsvg-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=2b8a03379a3af71d436fec6b14341dfc5105acd41edd27386c7dfc784b6433da
 
 qt6-svg-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 890de7dcdd26f058937ece5c30aa976d848deba5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:56 +0200
Subject: [PATCH 22/31] qt6-tools: update to 6.1.0rc2.

---
 srcpkgs/qt6-tools/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f1bd70ad3094..b931a0763927 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qttools-everywhere-src-${version}"
+wrksrc="qttools-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel ninja perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 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://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qttools-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=557472d76c58cc62ef58a9a373eafa35f0aa8c28a002f824bb6401a3490a1e5b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 70bffb85a2001f2c8aa2f5f4a6f02c4dc8ef8f1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:58 +0200
Subject: [PATCH 23/31] qt6-translations: update to 6.1.0rc2.

---
 srcpkgs/qt6-translations/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index c5faea9e526a..5905f13edd52 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,15 +1,15 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qttranslations-everywhere-src-${version}"
+wrksrc="qttranslations-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
 maintainer="John <me@johnnynator.dev>"
 license="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/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qttranslations-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=40db0a83e50067df9808e03eff40059e82382b091b5a421a089b3986f045ea47

From ba521241ccf6870d9c3083754f568d3f4d23bf28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:18:00 +0200
Subject: [PATCH 24/31] qt6-wayland: update to 6.1.0rc2.

---
 srcpkgs/qt6-wayland/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index f74015b50c04..f51687022189 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,11 +1,10 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtwayland-everywhere-src-${version}"
+wrksrc="qtwayland-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
- -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
@@ -14,8 +13,8 @@ short_desc="Cross-platform application and UI framework - Wayland"
 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/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtwayland-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=60aa224ac3565691b2fbe698e3eb01b7b5aee31e4a52c5b56d21af542f1e7422
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-wayland-devel"

From 06b870b6ceb509bc9b9fccbbc14f2903bb99b64a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 25/31] New package: qt6-virtualkeyboard-6.1.0rc2

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..cb51edc6c2db
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0rc2
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtvirtualkeyboard-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=9297d7c0a2ebfc3f8fc5459a165d52234ec142638f2f6c40dcc04fe65e309e35
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From fd31e3534537636decd3535006d0157c19934d58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 26/31] New package: qt6-networkauth-6.1.0rc2

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index 177fd265c015..b82c238eb71c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..6131ad24eb13
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0rc2
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtnetworkauth-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=100b6953b25bb2f87219d2dd5cf15410fbb0c641be20c4533ff8108da712ee99
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f84006e0bac2d664740a72fff4c5f3082e80c279 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 27/31] New package: qt6-scxml-6.1.0rc2

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index b82c238eb71c..e3047cdff2da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..e306dc05acef
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0rc2
+revision=1
+wrksrc="qtscxml-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtscxml-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=9d9e51bde471bb1cb363a2972e32cdcdacca30e44dfec5176436059cb54b857d
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 50cfab27ef9f50ae525f9aaeb807b493fa051c62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 28/31] New package: qt6-imageformats-6.1.0rc2

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..8aa1bab4e4ee
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0rc2
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtimageformats-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=3bd902a28e7cb0a17d4dee6fe15bdcb1866dd99784556d046aca5fc129792ec1

From e4dd15b762887958138ce033aef0cd5cdec2f765 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 29/31] New package: qt6-lottie-6.1.0rc2

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index e3047cdff2da..6d00d745f809 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..67c1d600e1cf
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0rc2
+revision=1
+wrksrc="qtlottie-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+depends=""
+short_desc="Cross-platform application and UI framework - lottie"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtlottie-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=721111c473a95db76e42b937c8d33b3219d377fd46acc4413dcdcedee062aa1a
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ba74d2989e5aabba5bb6e5466a669f690c6925a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 30/31] New package: qt6-3d-6.1.0rc2

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 27 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 6d00d745f809..fba2ce941517 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..ddbae3d18592
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0rc2
+revision=1
+wrksrc="qt3d-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qt3d-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=30816b9b47138e9839d4dc2a855e0cde37f8100ed70b3ae18b25c7c4d621a24a
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 06ef7aac991d7b98096323896985967ad8a528b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 31/31] New package: qt6-charts-6.1.0rc2

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index fba2ce941517..a5108244d439 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..45031e51f7c4
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0rc2
+revision=1
+wrksrc="qtcharts-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtcharts-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=50fe67d3ebd49cd10fa5dc5251726d8bf2f1bdb48ab5f91aa4d912745704be5d
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (13 preceding siblings ...)
  2021-05-01 22:06 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-05 14:44 ` Johnnynator
  2021-05-05 22:06 ` [PR REVIEW] " yopito
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-05 14:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 135939 bytes --]

From 1114dc7bd669771616bdfb3751a092e35eb34501 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/31] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..1ca5983760f1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 2b44815c24288ea4bb3ba37e786c919afde5084e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/31] New package: qt6-base-6.0.3

---
 common/shlibs                                 |  16 +
 srcpkgs/qt6-base-devel                        |   1 +
 srcpkgs/qt6-base-doc                          |   1 +
 srcpkgs/qt6-base/patches/musl-limits.patch    |  20 +
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ++++++++++++++++++
 srcpkgs/qt6-base/template                     | 194 +++++++++
 srcpkgs/qt6-base/update                       |   1 +
 srcpkgs/qt6-concurrent                        |   1 +
 srcpkgs/qt6-core                              |   1 +
 srcpkgs/qt6-dbus                              |   1 +
 srcpkgs/qt6-gui                               |   1 +
 srcpkgs/qt6-network                           |   1 +
 srcpkgs/qt6-opengl-widgets                    |   1 +
 srcpkgs/qt6-plugin-mysql                      |   1 +
 srcpkgs/qt6-plugin-odbc                       |   1 +
 srcpkgs/qt6-plugin-pgsql                      |   1 +
 srcpkgs/qt6-plugin-sqlite                     |   1 +
 srcpkgs/qt6-printsupport                      |   1 +
 srcpkgs/qt6-sql                               |   1 +
 srcpkgs/qt6-test                              |   1 +
 srcpkgs/qt6-widgets                           |   1 +
 srcpkgs/qt6-xml                               |   1 +
 22 files changed, 640 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b284ac33ef2..3ba44093b45d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
new file mode 100644
index 000000000000..e28e75bfb0a1
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
@@ -0,0 +1,392 @@
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 5 Feb 2020 03:49:35 +0200
+Subject: [PATCH] QSslSocket - add LibreSSL support
+
+Upstream-Status: Inappropriate
+[Upstream is not willing to accept any patches for LibreSSL support]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
+ src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
+ src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
+ src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
+ .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
+ .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
+ 6 files changed, 93 insertions(+), 3 deletions(-)
+
+diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
+index ca9d61ccb1..19774432ce 100644
+--- src/network/ssl/qsslcertificate_openssl.cpp
++++ src/network/ssl/qsslcertificate_openssl.cpp
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+         unsigned char *data = nullptr;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info.insert(name, QString::fromUtf8((char*)data, size));
+-#if QT_CONFIG(opensslv11)
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
+         q_CRYPTO_free(data, nullptr, 0);
+ #else
+         q_CRYPTO_free(data);
+diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
+index abc398b209..c2f90be009 100644
+--- src/network/ssl/qsslcontext_openssl.cpp
++++ src/network/ssl/qsslcontext_openssl.cpp
+@@ -397,16 +397,28 @@ init_context:
+         maxVersion = DTLS1_VERSION;
+         break;
+     case QSsl::DtlsV1_0OrLater:
++#ifdef DTLS_MAX_VERSION
+         minVersion = DTLS1_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS_MAX_VERSION
+         break;
+     case QSsl::DtlsV1_2:
++#ifdef DTLS1_2_VERSION
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS1_2_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION
+         break;
+     case QSsl::DtlsV1_2OrLater:
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
+         minVersion = DTLS1_2_VERSION;
+         maxVersion = DTLS_MAX_VERSION;
++#else
++        Q_UNREACHABLE();
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
+         break;
+     case QSsl::TlsV1_3OrLater:
+ #ifdef TLS1_3_VERSION
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+     }
+ #endif // ocsp
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
+     if (cctx) {
+         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
+             sslContext->errorCode = QSslError::UnspecifiedError;
+         }
+-    } else {
++    } else
++#endif // LIBRESSL_VERSION_NUMBER
++    {
+         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
+         sslContext->errorCode = QSslError::UnspecifiedError;
+     }
+diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
+index 70cb97aad8..01a61cf535 100644
+--- src/network/ssl/qsslcontext_openssl_p.h
++++ src/network/ssl/qsslcontext_openssl_p.h
+@@ -61,6 +61,13 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++#ifndef DTLS_ANY_VERSION
++#define DTLS_ANY_VERSION 0x1FFFF
++#endif
++#ifndef TLS_ANY_VERSION
++#define TLS_ANY_VERSION 0x10000
++#endif
++
+ #ifndef QT_NO_SSL
+ 
+ class QSslContextPrivate;
+diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- src/network/ssl/qsslkey_openssl.cpp
++++ src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
+diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
+index 277037e59c..f599498df5 100644
+--- src/network/ssl/qsslsocket_openssl.cpp
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+     else if (mode == QSslSocket::SslServerMode)
+         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
+     // Set the client callback for TLSv1.3 PSK
+     if (mode == QSslSocket::SslClientMode
+         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
+diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
+index 2f57998cea..a3eb363385 100644
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
+ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
++#else
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
++#endif // LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
+ #ifdef TLS1_3_VERSION
+@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
++#else
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#endif
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
+@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
+             return 0, return)
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
++#endif
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
+             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
+@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
+ DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
+ DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
+ #ifndef OPENSSL_NO_DES
+ DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
+@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
++#endif
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
+     RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+     RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+     RESOLVEFUNC(OPENSSL_sk_free)
+     RESOLVEFUNC(OPENSSL_sk_num)
+     RESOLVEFUNC(OPENSSL_sk_pop_free)
+     RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(DH_get0_pqg)
+     RESOLVEFUNC(SSL_CTX_set_options)
+ 
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
+ 
+     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
+     RESOLVEFUNC(DH_bits)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(DSA_bits)
++#endif
+ 
+ #if QT_CONFIG(dtls)
+     RESOLVEFUNC(DTLSv1_listen)
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(OCSP_check_validity)
+     RESOLVEFUNC(OCSP_cert_to_id)
+     RESOLVEFUNC(OCSP_id_get0_info)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(OCSP_resp_get0_certs)
++#endif
+     RESOLVEFUNC(OCSP_basic_sign)
+     RESOLVEFUNC(OCSP_response_create)
+     RESOLVEFUNC(i2d_OCSP_RESPONSE)
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+     RESOLVEFUNC(SSL_CTX_get_cert_store);
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(SSL_CONF_CTX_new);
+     RESOLVEFUNC(SSL_CONF_CTX_free);
+     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
+     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
+     RESOLVEFUNC(SSL_CONF_CTX_finish);
+     RESOLVEFUNC(SSL_CONF_cmd);
++#endif
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
+index 018962bcc1..8977f428e0 100644
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h
++++ src/network/ssl/qsslsocket_openssl_symbols_p.h
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+ 
+ #define DUMMYARG
+ 
++#ifdef LIBRESSL_VERSION_NUMBER
++typedef _STACK STACK;
++typedef STACK OPENSSL_STACK;
++typedef void OPENSSL_INIT_SETTINGS;
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
++#endif
++
+ #if !defined QT_LINKED_OPENSSL
+ // **************** Shared declarations ******************
+ // ret func(arg)
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ int q_DSA_bits(DSA *a);
++#else
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
++#endif
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_base_id(EVP_PKEY *a);
+ int q_RSA_bits(RSA *a);
++
++#ifndef LIBRESSL_VERSION_NUMBER
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
++#else // LIBRESSL_VERSION_NUMBER
++int q_sk_num(STACK *a);
++#define q_OPENSSL_sk_num(a) q_sk_num(a)
++void q_sk_pop_free(STACK *a, void (*b)(void *));
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
++STACK *q_sk_new_null();
++#define q_OPENSSL_sk_new_null() q_sk_new_null()
++void q_sk_push(STACK *st, void *data);
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
++void q_sk_free(STACK *a);
++#define q_OPENSSL_sk_free q_sk_free
++void *q_sk_value(STACK *a, int b);
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
++#endif // LIBRESSL_VERSION_NUMBER
++
+ int q_SSL_session_reused(SSL *a);
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
++#else
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
++#endif // LIBRESSL_VERSION_NUMBER
+ 
+ #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
+                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
+                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+ 
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#ifndef LIBRESSL_VERSION_NUMBER
+ void q_CRYPTO_free(void *str, const char *file, int line);
++#else
++void q_CRYPTO_free(void *a);
++#endif
+ 
+ long q_OpenSSL_version_num();
+ const char *q_OpenSSL_version(int type);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
++#ifndef LIBRESSL_VERSION_NUMBER
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new();
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
++#endif
+ void q_SSL_free(SSL *a);
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
+                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
++#else
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
++#endif
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..77bee6a63163
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,194 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.0.3
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="perl pkg-config xmlstarlet"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ libpng-devel tslib-devel libinput-devel gtk+3-devel
+ libmariadbclient-devel postgresql-libs-devel
+ unixodbc-devel cups-devel libproxy-devel brotli-devel
+ sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader"
+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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+python_version=3
+
+# TODO: fix usage of ccache
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-base-devel"
+	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	# XXX: This should be fixed properly in the build system,
+	# it alread
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 05f98e77b6a81f4f4b6efb52c989a3035b308da3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/31] New package: qt6-wayland-6.0.3

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 35 +++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 3ba44093b45d..569d4d2237e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..f74015b50c04
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.0.3
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 84a915977c1e2a446aca37825ef03fd039848dc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/31] New package: qt6-declarative-6.0.3

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 569d4d2237e5..ba39775b36c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..ebdf4ad6e18e
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.0.3
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 817047bbea10f75ad8d984a7c6371594771a6ae8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/31] New package: qt6-qt5compat-6.0.3

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..922cf9e2ed18
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.0.3
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ec672ef946878f4b5d2712f8c90c1198ed45f3f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/31] New package: qt6-tools-6.0.3

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..f1bd70ad3094
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.0.3
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d9c388505f8b79ef944da82f7e3c55aac53f06c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/31] New package: qt6-svg-6.0.3

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..b2ec9ff162ad
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.0.3
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ca37ddb20f332bca858689d32e53e4b1591b19f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/31] New package: qt6-translations-6.0.3

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..c5faea9e526a
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.0.3
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 54a3f45e53e34e80dcdb637db7228de0fb94a525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/31] New package: qt6-shadertools-6.0.3

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index ba39775b36c9..6b6aa8a9cf6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..44ad3578b6b9
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.0.3
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From a863c8f920b7cfbe7ab5f49dc0710f64d8f99d1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/31] New package: qt6-quick3d-6.0.3

---
 common/shlibs                |  4 ++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6b6aa8a9cf6f..22b217b6b32b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,10 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..da89b64bdf02
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.0.3
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 3cb3f3328d422f1b674c1ff7aadbfc035b77a1d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/31] New package: qt6-quickcontrols2-6.0.3

---
 common/shlibs                       |  3 +++
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 4 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/common/shlibs b/common/shlibs
index 22b217b6b32b..741993ced25c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2016,6 +2016,9 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..3f7db62636a2
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.0.3
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e84812de228b572da3c5e6e10cd5cd1b5dd0b4e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/31] New package: qt6-quicktimeline-6.0.3

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..04f4690a1798
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.0.3
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 2889dffcce3e27a8bdd38687bd619a982e258660 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 13/31] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  29 +-
 3 files changed, 32 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..ac2096d495ca 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,33 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
+depends="desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e
+
+build_options="qt6"
+build_options_default=""
+
+if [ "$build_option_qt6" ]; then
+	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	makedepends+=" qt6-base-devel qt6-plugin-mysql
+	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+	depends+=" qt6-plugin-sqlite"
+else
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+	makedepends+=" qt5-tools-devel qt5-plugin-mysql
+	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+	 qt5-plugin-tds qt5-x11extras-devel"
+	depends+=" qt5-plugin-sqlite"
+fi

From 97a3622227fe9d8d81168172e035152db7145598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:23 +0200
Subject: [PATCH 14/31] qt6-base: update to 6.1.0rc2.

---
 .../patches/qtnetwork-5.15.0-libressl.patch   | 392 ------------------
 srcpkgs/qt6-base/template                     |  23 +-
 2 files changed, 9 insertions(+), 406 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch

diff --git a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index e28e75bfb0a1..000000000000
--- a/srcpkgs/qt6-base/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
- .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
- 6 files changed, 93 insertions(+), 3 deletions(-)
-
-diff --git src/network/ssl/qsslcertificate_openssl.cpp src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- src/network/ssl/qsslcertificate_openssl.cpp
-+++ src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git src/network/ssl/qsslcontext_openssl.cpp src/network/ssl/qsslcontext_openssl.cpp
-index abc398b209..c2f90be009 100644
---- src/network/ssl/qsslcontext_openssl.cpp
-+++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -397,16 +397,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git src/network/ssl/qsslcontext_openssl_p.h src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- src/network/ssl/qsslcontext_openssl_p.h
-+++ src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git src/network/ssl/qsslkey_openssl.cpp src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- src/network/ssl/qsslkey_openssl.cpp
-+++ src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
-diff --git src/network/ssl/qsslsocket_openssl.cpp src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 2f57998cea..a3eb363385 100644
---- src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- #ifdef TLS1_3_VERSION
-@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
-     RESOLVEFUNC(EVP_PKEY_CTX_free)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
- 
-@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
-@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git src/network/ssl/qsslsocket_openssl_symbols_p.h src/network/ssl/qsslsocket_openssl_symbols_p.h
-index 018962bcc1..8977f428e0 100644
---- src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 77bee6a63163..a8e5f1fb2f7c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,8 +1,8 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtbase-everywhere-src-${version}"
+wrksrc="qtbase-everywhere-src-${version/rc/-rc}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_ARCHDATADIR=lib/qt6
@@ -10,8 +10,11 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
  -DINSTALL_SYSCONFDIR=/etc/xdg
- -DQT_USE_CCACHE=ON"
-hostmakedepends="perl pkg-config xmlstarlet"
+ -DQT_HOST_PATH=/usr
+ -DQT_FEATURE_openssl_linked=ON
+ -DBUILD_WITH_PCH=OFF
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
 makedepends="zlib-devel libzstd-devel dbus-devel
  double-conversion-devel glib-devel libxcb-devel
  xcb-util-image-devel xcb-util-keysyms-devel
@@ -25,21 +28,13 @@ 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=1a45b61c2a349964625c50e3ea40cbb309e269762dd0786397e0e18e7e10d394
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtbase-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=3884c64750a9b6ef544ee2fb72a2bf5e5e167501d6ea11ab1a55105e354a506e
 python_version=3
 
-# TODO: fix usage of ccache
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-base-devel"
-	configure_args+=" -DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-fi
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	# XXX: This should be fixed properly in the build system,
-	# it alread
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 

From 6a69fb44ce47f87d0768165bbd6a6d89fcaa3685 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:28 +0200
Subject: [PATCH 15/31] qt6-declarative: update to 6.1.0rc2.

---
 srcpkgs/qt6-declarative/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index ebdf4ad6e18e..ef3b57a9e805 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtdeclarative-everywhere-src-${version}"
+wrksrc="qtdeclarative-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_USE_CCACHE=ON -DQT_HOST_PATH=/usr
+configure_args=" -DQT_HOST_PATH=/usr
  -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-declarative-devel"
@@ -13,8 +13,8 @@ short_desc="Cross-platform application and UI framework - Declarative"
 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=f2987fb4c698c5930bbb58e75f7c3de16592f2e79696ed348d77556743db30bd
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtdeclarative-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=b08c2e23b13a63c0bc70e302e3921fb1fde97fc3a0246169bd69863615363f69
 
 qt6-declarative-tools_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From d1c856c1a2d18998fd067b589b7622357558ebaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:32 +0200
Subject: [PATCH 16/31] qt6-qt5compat: update to 6.1.0rc2.

---
 srcpkgs/qt6-qt5compat/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 922cf9e2ed18..d0d382c9ce49 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qt5compat-everywhere-src-${version}"
+wrksrc="qt5compat-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel ninja perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
 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://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=b0e32cd9f3ca9028f5882dc18dafacfd50d723efbc9c0570e85600f13293b90f
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qt5compat-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=85c8c6c0e1d1e26489f486cd2855ea3ffa219f3c875ea66f0083c0da3b74c7f1
 
 qt6-qt5compat-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 6de126fb39786c5eb83855448f44557114e573d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:41 +0200
Subject: [PATCH 17/31] qt6-quick3d: update to 6.1.0rc2.

---
 common/shlibs                |  1 +
 srcpkgs/qt6-quick3d/template | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 741993ced25c..ba192c561b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2016,6 +2016,7 @@ libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index da89b64bdf02..fd7ddf81aacb 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,19 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquick3d-everywhere-src-${version}"
+wrksrc="qtquick3d-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
-hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=48a2494e9bbbf6448f4e2598358b517d876b86cff88fd695bdad15a0eb6b82f1
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquick3d-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=0f0bb681b3751093ca1c41acbe42a060c54fed54ed712b54dfaeb8c087d6efea
 
 qt6-quick3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 8cf5d90d038d78527ea5443e2d5e0938fae566b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:45 +0200
Subject: [PATCH 18/31] qt6-quickcontrols2: update to 6.1.0rc2.

---
 srcpkgs/qt6-quickcontrols2/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
index 3f7db62636a2..ae4d1e6ab50c 100644
--- a/srcpkgs/qt6-quickcontrols2/template
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-quickcontrols2'
 pkgname=qt6-quickcontrols2
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquickcontrols2-everywhere-src-${version}"
+wrksrc="qtquickcontrols2-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quickcontrols2"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
-checksum=511bdfbf6f573b0460424bf582fe935382e870812f8b47aebf2b80fd54e48b85
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquickcontrols2-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=f8781455b4962c7fc9469c69f2343c2928c8271355c215bbca7e9793997ccea0
 
 qt6-quickcontrols2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 45135a977fcab9db7f2fa8dd97c62d37c22eb7ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:47 +0200
Subject: [PATCH 19/31] qt6-quicktimeline: update to 6.1.0rc2.

---
 srcpkgs/qt6-quicktimeline/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 04f4690a1798..c8b430eba8d4 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,15 +1,15 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtquicktimeline-everywhere-src-${version}"
+wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
-checksum=9b224e076e1a99f7a1ef2da81c1b43835508c20f69c7d22ff66559cb499b798b
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=6ad8af7d8473f1e4d28b558adbb6191c7584fb16b75bafbaf5fc74979a7d2fd5

From 49d9f086e419b53107156e539b5ba50b492458d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:50 +0200
Subject: [PATCH 20/31] qt6-shadertools: update to 6.1.0rc2.

---
 srcpkgs/qt6-shadertools/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 44ad3578b6b9..c9795985a95b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtshadertools-everywhere-src-${version}"
+wrksrc="qtshadertools-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=3649696a5148bdebff1917ed49b9fe2a7c1533d9351cbe371aa7e6ae303e00c1
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtshadertools-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=5e5eea9e19899034e18847443633aab8c522d88c222ad2eb381bc52edc9a5534
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 181d7235b9f1772b984d2d841699c049d98dc5bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:52 +0200
Subject: [PATCH 21/31] qt6-svg: update to 6.1.0rc2.

---
 srcpkgs/qt6-svg/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index b2ec9ff162ad..a682e0c7299b 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtsvg-everywhere-src-${version}"
+wrksrc="qtsvg-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=b87043ea14fb69ba65717e5cf7ad802b8b529112b4972dd8c912749bc231c87d
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtsvg-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=2b8a03379a3af71d436fec6b14341dfc5105acd41edd27386c7dfc784b6433da
 
 qt6-svg-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"

From 1fa59528446105f1e773d0cbe9d0c065f0d358da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:56 +0200
Subject: [PATCH 22/31] qt6-tools: update to 6.1.0rc2.

---
 srcpkgs/qt6-tools/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f1bd70ad3094..b931a0763927 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,18 +1,18 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qttools-everywhere-src-${version}"
+wrksrc="qttools-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel ninja perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 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://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=632f12f767b4cdd6943c04b37cc718044bc5a5f811aabd7198fd66ff6c072b27
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qttools-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=557472d76c58cc62ef58a9a373eafa35f0aa8c28a002f824bb6401a3490a1e5b
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 1809fbc7e7082427e85477095404fce3dc8d038e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:17:58 +0200
Subject: [PATCH 23/31] qt6-translations: update to 6.1.0rc2.

---
 srcpkgs/qt6-translations/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index c5faea9e526a..5905f13edd52 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,15 +1,15 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qttranslations-everywhere-src-${version}"
+wrksrc="qttranslations-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
 maintainer="John <me@johnnynator.dev>"
 license="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/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=f58fdd4ce05a6f1e0530a28b1dcb2d2269497ee27dfd6a73584a5920b0ad9933
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qttranslations-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=40db0a83e50067df9808e03eff40059e82382b091b5a421a089b3986f045ea47

From c80e1de79bc0c98738d1bfd90576cd1f974b98ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 30 Apr 2021 20:18:00 +0200
Subject: [PATCH 24/31] qt6-wayland: update to 6.1.0rc2.

---
 srcpkgs/qt6-wayland/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index f74015b50c04..f51687022189 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,11 +1,10 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.0.3
+version=6.1.0rc2
 revision=1
-wrksrc="qtwayland-everywhere-src-${version}"
+wrksrc="qtwayland-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
- -DQT_USE_CCACHE=ON"
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
@@ -14,8 +13,8 @@ short_desc="Cross-platform application and UI framework - Wayland"
 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/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=4642a8bfe4ab6dfeeebf9275d024d7cfa13844e4786857205ae190e2e579b9dd
+distfiles="https://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtwayland-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=60aa224ac3565691b2fbe698e3eb01b7b5aee31e4a52c5b56d21af542f1e7422
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-wayland-devel"

From 99914b7ea407b2b18e8417e33deecea29a8af4c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 25/31] New package: qt6-virtualkeyboard-6.1.0rc2

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..cb51edc6c2db
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0rc2
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtvirtualkeyboard-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=9297d7c0a2ebfc3f8fc5459a165d52234ec142638f2f6c40dcc04fe65e309e35
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 5b88b5b1bcb3c9506b6d54753efe55bcd6324d3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 26/31] New package: qt6-networkauth-6.1.0rc2

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index ba192c561b5d..5b7622e48ccc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..6131ad24eb13
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0rc2
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtnetworkauth-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=100b6953b25bb2f87219d2dd5cf15410fbb0c641be20c4533ff8108da712ee99
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 458b354dc091dc83db909e084c9b104afaa23e2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 27/31] New package: qt6-scxml-6.1.0rc2

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index 5b7622e48ccc..f98b1e473be7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..e306dc05acef
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0rc2
+revision=1
+wrksrc="qtscxml-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtscxml-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=9d9e51bde471bb1cb363a2972e32cdcdacca30e44dfec5176436059cb54b857d
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 5d63fff354ff7bd83ed1ab0224027e499a9f8659 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 28/31] New package: qt6-imageformats-6.1.0rc2

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..8aa1bab4e4ee
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0rc2
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtimageformats-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=3bd902a28e7cb0a17d4dee6fe15bdcb1866dd99784556d046aca5fc129792ec1

From 94dc84ea3c345d602e91f894a402bf661a99dcb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 29/31] New package: qt6-lottie-6.1.0rc2

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index f98b1e473be7..38ed206a6396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..67c1d600e1cf
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0rc2
+revision=1
+wrksrc="qtlottie-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+depends=""
+short_desc="Cross-platform application and UI framework - lottie"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtlottie-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=721111c473a95db76e42b937c8d33b3219d377fd46acc4413dcdcedee062aa1a
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From d31046498af271cca4ed38a75f2927ed6a99a77d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 30/31] New package: qt6-3d-6.1.0rc2

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 27 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 38ed206a6396..111b048e3ff7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..ddbae3d18592
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0rc2
+revision=1
+wrksrc="qt3d-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qt3d-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=30816b9b47138e9839d4dc2a855e0cde37f8100ed70b3ae18b25c7c4d621a24a
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From daa995890fbea33fd759c14db8974eca8d9d8331 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 31/31] New package: qt6-charts-6.1.0rc2

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index 111b048e3ff7..2ced94d7831f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..45031e51f7c4
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0rc2
+revision=1
+wrksrc="qtcharts-everywhere-src-${version/rc/-rc}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/development_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtcharts-everywhere-src-${version/rc/-rc}.tar.xz"
+checksum=50fe67d3ebd49cd10fa5dc5251726d8bf2f1bdb48ab5f91aa4d912745704be5d
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (14 preceding siblings ...)
  2021-05-05 14:44 ` Johnnynator
@ 2021-05-05 22:06 ` yopito
  2021-05-06 14:14 ` [PR PATCH] [Updated] " Johnnynator
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: yopito @ 2021-05-05 22:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/27349#discussion_r626951225

Comment:
```suggestion
		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
```

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (15 preceding siblings ...)
  2021-05-05 22:06 ` [PR REVIEW] " yopito
@ 2021-05-06 14:14 ` Johnnynator
  2021-05-06 14:25 ` [PR PATCH] [Updated] " Johnnynator
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-06 14:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

[WIP] New packages: qt6
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 75681 bytes --]

From cf70835dde57be94a7d4a6cba1a2281492206d8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/20] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..0fb985631ba1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From e39a33f1231f2224029ca54aa356c69e7a1e9228 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/20] New package: qt6-base-6.1.0

---
 common/shlibs                              |  16 ++
 srcpkgs/qt6-base-devel                     |   1 +
 srcpkgs/qt6-base-doc                       |   1 +
 srcpkgs/qt6-base/patches/add-the-D.patch   |  15 ++
 srcpkgs/qt6-base/patches/musl-limits.patch |  20 +++
 srcpkgs/qt6-base/template                  | 188 +++++++++++++++++++++
 srcpkgs/qt6-base/update                    |   1 +
 srcpkgs/qt6-concurrent                     |   1 +
 srcpkgs/qt6-core                           |   1 +
 srcpkgs/qt6-dbus                           |   1 +
 srcpkgs/qt6-gui                            |   1 +
 srcpkgs/qt6-network                        |   1 +
 srcpkgs/qt6-opengl-widgets                 |   1 +
 srcpkgs/qt6-plugin-mysql                   |   1 +
 srcpkgs/qt6-plugin-odbc                    |   1 +
 srcpkgs/qt6-plugin-pgsql                   |   1 +
 srcpkgs/qt6-plugin-sqlite                  |   1 +
 srcpkgs/qt6-printsupport                   |   1 +
 srcpkgs/qt6-sql                            |   1 +
 srcpkgs/qt6-test                           |   1 +
 srcpkgs/qt6-widgets                        |   1 +
 srcpkgs/qt6-xml                            |   1 +
 22 files changed, 257 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b284ac33ef2..3ba44093b45d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch
new file mode 100644
index 000000000000..94d2fc030304
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/add-the-D.patch
@@ -0,0 +1,15 @@
+--- cmake/FindWrapAtomic.cmake	2021-04-30 11:31:33.000000000 +0200
++++ -	2021-05-06 15:56:49.553742705 +0200
+@@ -31,9 +31,9 @@
+ check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
+ if(NOT HAVE_STDATOMIC)
+-    set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+-    set(CMAKE_REQUIRE_LIBRARIES "atomic")
++    set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
++    set(CMAKE_REQUIRED_LIBRARIES "atomic")
+     check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
+-    set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
++    set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
+ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..c720e7f51671
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,188 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.1.0
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_FEATURE_openssl_linked=ON
+ -DQT_FEATURE_system_sqlite=ON
+ -DBUILD_WITH_PCH=OFF"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ 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"
+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=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	# QtSetup fails native builds if this is set
+	configure_args+=" -DQT_HOST_PATH=/usr
+	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 9aa97dc1505457023ddc25d9ccdd083245dbec2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/20] New package: qt6-wayland-6.1.0

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 34 ++++++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 3ba44093b45d..569d4d2237e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..0d45ccc2450c
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,34 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.1.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel ninja"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-wayland-devel"
+fi
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 9c7af471e6156f139697c6246e3dbe72145b4edf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/20] New package: qt6-declarative-6.1.0

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 569d4d2237e5..ba39775b36c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..6da38cd33432
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.1.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args=" -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 07a67991190a32eabaddfe1b78e8d216e2df57bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/20] New package: qt6-qt5compat-6.1.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..98453ee6365a
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.1.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 7db19ac2e6f54fdcfde9e56aedcc83ef4496d71c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/20] New package: qt6-tools-6.1.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..574020f5362a
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.1.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel ninja perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ec80f043d3f98a07fd93d74f3a7b889be59f58ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/20] New package: qt6-svg-6.1.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..2257057d4369
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.1.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="ninja qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 572e19cfcf44bb8d30b661f3b991064a48d8a82e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/20] New package: qt6-translations-6.1.0

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..e8cef83b21ad
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.1.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="ninja qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ac0af71e6ad5b3085e75e355098bd4438b70d46d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/20] New package: qt6-shadertools-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index ba39775b36c9..6b6aa8a9cf6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..2296f41f1326
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.1.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="ninja perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e57334f4ccbf81b3ef7c2f85f9472bbc03725d90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/20] New package: qt6-quick3d-6.1.0

---
 common/shlibs                |  8 ++++++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6b6aa8a9cf6f..ba192c561b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,14 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..0022dc25a374
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.1.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From bc3863d9e3639d00312fc899b62281231dec9370 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/20] New package: qt6-quickcontrols2-6.1.0

---
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..b4888d166de5
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.1.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 2a372fb75c81e727281c53dd2a12c3ea8f9e39ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/20] New package: qt6-quicktimeline-6.1.0

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..cf5ad15dfb9b
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.1.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="ninja perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 36fc55fdd59a18e089675635ea870bd9c32099ac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 13/20] New package: qt6-virtualkeyboard-6.1.0

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..6488e9c5c80c
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+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/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
+checksum=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From c734c283babe6bd8250e679331e54c3e8b2c5d00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 14/20] New package: qt6-networkauth-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index ba192c561b5d..5b7622e48ccc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..b70fcc828fb8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+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=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 365294acc0418fd7dab686fc6e5f219949a13910 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 15/20] New package: qt6-scxml-6.1.0

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index 5b7622e48ccc..f98b1e473be7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..b0e60b492782
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0
+revision=1
+wrksrc="qtscxml-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/qtscxml-everywhere-src-${version}.tar.xz"
+checksum=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From c5359b78d25579cfabfef377281c07e4be2d3d18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 16/20] New package: qt6-imageformats-6.1.0

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..80c457245cfd
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a

From 3b29fb800acdcae0f77f9609ff4d79ab9650c977 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 17/20] New package: qt6-lottie-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index f98b1e473be7..38ed206a6396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..81d2458b7d6d
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0
+revision=1
+wrksrc="qtlottie-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+depends=""
+short_desc="Cross-platform application and UI framework - lottie"
+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=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ae98e6e04ceb001a1f9a0c8834fadc26211f2cf5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 18/20] New package: qt6-3d-6.1.0

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 38ed206a6396..111b048e3ff7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..101a56552999
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0
+revision=1
+wrksrc="qt3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
+ libatomic-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 812d6eac7f0399c45bf03ecbab94056a90224c22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 19/20] New package: qt6-charts-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index 111b048e3ff7..2ced94d7831f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..d8dee490199e
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0
+revision=1
+wrksrc="qtcharts-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+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=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From a694bfd5c08b2b9956b754af8420c27e0c665157 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 20/20] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  29 +-
 3 files changed, 32 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..ac2096d495ca 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,33 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
+depends="desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e
+
+build_options="qt6"
+build_options_default=""
+
+if [ "$build_option_qt6" ]; then
+	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	makedepends+=" qt6-base-devel qt6-plugin-mysql
+	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+	depends+=" qt6-plugin-sqlite"
+else
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+	makedepends+=" qt5-tools-devel qt5-plugin-mysql
+	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+	 qt5-plugin-tds qt5-x11extras-devel"
+	depends+=" qt5-plugin-sqlite"
+fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (16 preceding siblings ...)
  2021-05-06 14:14 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-06 14:25 ` Johnnynator
  2021-05-06 15:24 ` Johnnynator
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-06 14:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

New packages: qt6
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 75442 bytes --]

From fd0c1b70aa144e860aa565237b01b708c4f80614 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/20] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..0fb985631ba1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 18bc2df6f7b3d543d3105ff136f6fe92d18b3770 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/20] New package: qt6-base-6.1.0

---
 common/shlibs                              |  16 ++
 srcpkgs/qt6-base-devel                     |   1 +
 srcpkgs/qt6-base-doc                       |   1 +
 srcpkgs/qt6-base/patches/add-the-D.patch   |  15 ++
 srcpkgs/qt6-base/patches/musl-limits.patch |  20 +++
 srcpkgs/qt6-base/template                  | 188 +++++++++++++++++++++
 srcpkgs/qt6-base/update                    |   1 +
 srcpkgs/qt6-concurrent                     |   1 +
 srcpkgs/qt6-core                           |   1 +
 srcpkgs/qt6-dbus                           |   1 +
 srcpkgs/qt6-gui                            |   1 +
 srcpkgs/qt6-network                        |   1 +
 srcpkgs/qt6-opengl-widgets                 |   1 +
 srcpkgs/qt6-plugin-mysql                   |   1 +
 srcpkgs/qt6-plugin-odbc                    |   1 +
 srcpkgs/qt6-plugin-pgsql                   |   1 +
 srcpkgs/qt6-plugin-sqlite                  |   1 +
 srcpkgs/qt6-printsupport                   |   1 +
 srcpkgs/qt6-sql                            |   1 +
 srcpkgs/qt6-test                           |   1 +
 srcpkgs/qt6-widgets                        |   1 +
 srcpkgs/qt6-xml                            |   1 +
 22 files changed, 257 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b284ac33ef2..3ba44093b45d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch
new file mode 100644
index 000000000000..94d2fc030304
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/add-the-D.patch
@@ -0,0 +1,15 @@
+--- cmake/FindWrapAtomic.cmake	2021-04-30 11:31:33.000000000 +0200
++++ -	2021-05-06 15:56:49.553742705 +0200
+@@ -31,9 +31,9 @@
+ check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
+ if(NOT HAVE_STDATOMIC)
+-    set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+-    set(CMAKE_REQUIRE_LIBRARIES "atomic")
++    set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
++    set(CMAKE_REQUIRED_LIBRARIES "atomic")
+     check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
+-    set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
++    set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
+ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..c720e7f51671
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,188 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.1.0
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_FEATURE_openssl_linked=ON
+ -DQT_FEATURE_system_sqlite=ON
+ -DBUILD_WITH_PCH=OFF"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ 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"
+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=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	# QtSetup fails native builds if this is set
+	configure_args+=" -DQT_HOST_PATH=/usr
+	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 570b6af69dc69cb84d696cd3cfb4b3d1cfc4f95a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/20] New package: qt6-wayland-6.1.0

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 3ba44093b45d..569d4d2237e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..43194ae66ad8
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.1.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ec11504ce5642c45c6c8654d2723ca0687dee326 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/20] New package: qt6-declarative-6.1.0

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 569d4d2237e5..ba39775b36c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..6da38cd33432
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.1.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args=" -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 28609b12fdec5fb91430cf8b624e8188d895a544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/20] New package: qt6-qt5compat-6.1.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..0fd536dc4075
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.1.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 4bf7beaf3416cef832494f0cacc3b89dbc9217ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/20] New package: qt6-tools-6.1.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..8d2d8e3f2419
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.1.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel libatomic-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d89717c7d4a8cd516587602e534158aea1e66597 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/20] New package: qt6-svg-6.1.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..936d831fcd4e
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.1.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d3e3d98dcd57d72e191b3fbc9d5e9b803235664a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/20] New package: qt6-translations-6.1.0

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..16a3a190fe7e
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.1.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 5bb8922b779d992cd307c41eeff6d1f39db994d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/20] New package: qt6-shadertools-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index ba39775b36c9..6b6aa8a9cf6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..5c27d3fab884
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.1.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 8785ae329443eb6086493e0df221a79b1b8e52d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/20] New package: qt6-quick3d-6.1.0

---
 common/shlibs                |  8 ++++++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6b6aa8a9cf6f..ba192c561b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,14 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..0022dc25a374
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.1.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 652ffe4b0bf67856f1971cef0a4086a4b334cb95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/20] New package: qt6-quickcontrols2-6.1.0

---
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..51e8315b5aea
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.1.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 134dc33057789c04dbb9def8abd264b892ec27a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/20] New package: qt6-quicktimeline-6.1.0

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..eb30cc7b6ddb
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.1.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 6d97cbde4d94812a58c3a1ebc5f6e9e28dcf5ec1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 13/20] New package: qt6-virtualkeyboard-6.1.0

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..6488e9c5c80c
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+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/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
+checksum=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From dd7a6e973640b591e7f5cda5042d5381d08acf3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 14/20] New package: qt6-networkauth-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index ba192c561b5d..5b7622e48ccc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..b70fcc828fb8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+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=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 58d49ae2622c4894d800ddd2968ea85902d2f4d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 15/20] New package: qt6-scxml-6.1.0

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index 5b7622e48ccc..f98b1e473be7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..b0e60b492782
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0
+revision=1
+wrksrc="qtscxml-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/qtscxml-everywhere-src-${version}.tar.xz"
+checksum=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From dcef456048afb180c1096a27efec2d0363fc8e02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 16/20] New package: qt6-imageformats-6.1.0

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..80c457245cfd
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a

From 8d65f706388a5fab49168b9526f227928fcda44e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 17/20] New package: qt6-lottie-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index f98b1e473be7..38ed206a6396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..81d2458b7d6d
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0
+revision=1
+wrksrc="qtlottie-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+depends=""
+short_desc="Cross-platform application and UI framework - lottie"
+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=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 4e9e54a732bba103157d3e3d61f3cae853494551 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 18/20] New package: qt6-3d-6.1.0

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 38ed206a6396..111b048e3ff7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..101a56552999
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0
+revision=1
+wrksrc="qt3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
+ libatomic-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f8527ea19f1a530c99e94a5e4aa9e5d7ff620f4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 19/20] New package: qt6-charts-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index 111b048e3ff7..2ced94d7831f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..d8dee490199e
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0
+revision=1
+wrksrc="qtcharts-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+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=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0c57c65bc288e9d0cd9579200cddad1368d1bcdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 20/20] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  29 +-
 3 files changed, 32 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..ac2096d495ca 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,33 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
+depends="desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e
+
+build_options="qt6"
+build_options_default=""
+
+if [ "$build_option_qt6" ]; then
+	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	makedepends+=" qt6-base-devel qt6-plugin-mysql
+	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+	depends+=" qt6-plugin-sqlite"
+else
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+	makedepends+=" qt5-tools-devel qt5-plugin-mysql
+	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+	 qt5-plugin-tds qt5-x11extras-devel"
+	depends+=" qt5-plugin-sqlite"
+fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (17 preceding siblings ...)
  2021-05-06 14:25 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-06 15:24 ` Johnnynator
  2021-05-06 16:23 ` Johnnynator
  2021-05-06 16:23 ` [PR PATCH] [Merged]: " Johnnynator
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-06 15:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

New packages: qt6
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 75442 bytes --]

From cf0641c3532944780923475a24f3dbb4904a208b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/20] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..0fb985631ba1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From 1a5771857155f7994ea1da7a9289be816374cb90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/20] New package: qt6-base-6.1.0

---
 common/shlibs                              |  16 ++
 srcpkgs/qt6-base-devel                     |   1 +
 srcpkgs/qt6-base-doc                       |   1 +
 srcpkgs/qt6-base/patches/add-the-D.patch   |  15 ++
 srcpkgs/qt6-base/patches/musl-limits.patch |  20 +++
 srcpkgs/qt6-base/template                  | 188 +++++++++++++++++++++
 srcpkgs/qt6-base/update                    |   1 +
 srcpkgs/qt6-concurrent                     |   1 +
 srcpkgs/qt6-core                           |   1 +
 srcpkgs/qt6-dbus                           |   1 +
 srcpkgs/qt6-gui                            |   1 +
 srcpkgs/qt6-network                        |   1 +
 srcpkgs/qt6-opengl-widgets                 |   1 +
 srcpkgs/qt6-plugin-mysql                   |   1 +
 srcpkgs/qt6-plugin-odbc                    |   1 +
 srcpkgs/qt6-plugin-pgsql                   |   1 +
 srcpkgs/qt6-plugin-sqlite                  |   1 +
 srcpkgs/qt6-printsupport                   |   1 +
 srcpkgs/qt6-sql                            |   1 +
 srcpkgs/qt6-test                           |   1 +
 srcpkgs/qt6-widgets                        |   1 +
 srcpkgs/qt6-xml                            |   1 +
 22 files changed, 257 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b284ac33ef2..3ba44093b45d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch
new file mode 100644
index 000000000000..94d2fc030304
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/add-the-D.patch
@@ -0,0 +1,15 @@
+--- cmake/FindWrapAtomic.cmake	2021-04-30 11:31:33.000000000 +0200
++++ -	2021-05-06 15:56:49.553742705 +0200
+@@ -31,9 +31,9 @@
+ check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
+ if(NOT HAVE_STDATOMIC)
+-    set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+-    set(CMAKE_REQUIRE_LIBRARIES "atomic")
++    set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
++    set(CMAKE_REQUIRED_LIBRARIES "atomic")
+     check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
+-    set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
++    set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
+ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..c720e7f51671
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,188 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.1.0
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_FEATURE_openssl_linked=ON
+ -DQT_FEATURE_system_sqlite=ON
+ -DBUILD_WITH_PCH=OFF"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ 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"
+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=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	# QtSetup fails native builds if this is set
+	configure_args+=" -DQT_HOST_PATH=/usr
+	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 0c472b0f1934df9c6d0409e1ae3ba79f6a7d896b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/20] New package: qt6-wayland-6.1.0

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 3ba44093b45d..569d4d2237e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..43194ae66ad8
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.1.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 42391cb23aea3a680fa4872d9922c9ca7ce5444f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/20] New package: qt6-declarative-6.1.0

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 569d4d2237e5..ba39775b36c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..6da38cd33432
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.1.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args=" -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 727f5ce985bd48e9effc973d77e0e961bc7b5365 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/20] New package: qt6-qt5compat-6.1.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..0fd536dc4075
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.1.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From b3137571ad384d32eb826e55a64f8503ab9b8b89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/20] New package: qt6-tools-6.1.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..8d2d8e3f2419
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.1.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel libatomic-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 2e3336b8ec34272f04fc8b13a46c1d3391f26734 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/20] New package: qt6-svg-6.1.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..936d831fcd4e
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.1.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 8612fff57545056bcee2b4462817563f886b4582 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/20] New package: qt6-translations-6.1.0

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..16a3a190fe7e
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.1.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 834a2c0f874a7f1e214c8ba92f234d8e1f639802 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/20] New package: qt6-shadertools-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index ba39775b36c9..6b6aa8a9cf6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..5c27d3fab884
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.1.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From c642d87e50df51a680de1343809ab5f86a3a1b08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/20] New package: qt6-quick3d-6.1.0

---
 common/shlibs                |  8 ++++++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6b6aa8a9cf6f..ba192c561b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,14 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..0022dc25a374
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.1.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From bc6622d89ae4b1bef346780f513e848ca36a6753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/20] New package: qt6-quickcontrols2-6.1.0

---
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..51e8315b5aea
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.1.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From ffce1bd586eabc76bff641d3c22e15d804e7f028 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/20] New package: qt6-quicktimeline-6.1.0

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..eb30cc7b6ddb
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.1.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From dc9f90b935d364859f087b2f369f19be05be25e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 13/20] New package: qt6-virtualkeyboard-6.1.0

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..6488e9c5c80c
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+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/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
+checksum=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 8e7e9b7410778241b1a8a3f04b9a7b29d39ee6ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 14/20] New package: qt6-networkauth-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index ba192c561b5d..5b7622e48ccc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..b70fcc828fb8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+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=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b9e86b6d852a539647d0591fc300ccce52111527 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 15/20] New package: qt6-scxml-6.1.0

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index 5b7622e48ccc..f98b1e473be7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..b0e60b492782
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0
+revision=1
+wrksrc="qtscxml-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/qtscxml-everywhere-src-${version}.tar.xz"
+checksum=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From edce88551392aebec0ec0730e9286b18677df423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 16/20] New package: qt6-imageformats-6.1.0

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..80c457245cfd
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a

From 3354ed98744fff711782013f8b5ada7819702b9d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 17/20] New package: qt6-lottie-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index f98b1e473be7..38ed206a6396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..81d2458b7d6d
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0
+revision=1
+wrksrc="qtlottie-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+depends=""
+short_desc="Cross-platform application and UI framework - lottie"
+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=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From c46649a225d6ac0a3fc6c61680d7d467dec83a89 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 18/20] New package: qt6-3d-6.1.0

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 38ed206a6396..111b048e3ff7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..101a56552999
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0
+revision=1
+wrksrc="qt3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
+ libatomic-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From df9b3741d5358bdd0868a41d1f81a0f618609ccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 19/20] New package: qt6-charts-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index 111b048e3ff7..2ced94d7831f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..d8dee490199e
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0
+revision=1
+wrksrc="qtcharts-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+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=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From d4434b7901e05059f93fe537645d00b1d1aba50e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 20/20] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  29 +-
 3 files changed, 32 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..ac2096d495ca 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,33 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
+depends="desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e
+
+build_options="qt6"
+build_options_default=""
+
+if [ "$build_option_qt6" ]; then
+	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	makedepends+=" qt6-base-devel qt6-plugin-mysql
+	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+	depends+=" qt6-plugin-sqlite"
+else
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+	makedepends+=" qt5-tools-devel qt5-plugin-mysql
+	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+	 qt5-plugin-tds qt5-x11extras-devel"
+	depends+=" qt5-plugin-sqlite"
+fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (18 preceding siblings ...)
  2021-05-06 15:24 ` Johnnynator
@ 2021-05-06 16:23 ` Johnnynator
  2021-05-06 16:23 ` [PR PATCH] [Merged]: " Johnnynator
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-06 16:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt6
https://github.com/void-linux/void-packages/pull/27349

New packages: qt6
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27349.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-27349.patch --]
[-- Type: text/x-diff, Size: 75429 bytes --]

From 2d37bbecef7a963575f0810f94f4f584c39e4fb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 16:47:01 +0200
Subject: [PATCH 01/20] common/build-style/cmake.sh: pass full path of
 TOOLCHAIN_FILE to cmake

---
 common/build-style/cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 9d1a1a7a1941..0fb985631ba1 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -49,7 +49,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 _EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${build_wrksrc}/${cmake_builddir}/cross_${XBPS_CROSS_TRIPLET}.cmake"
 	fi
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"

From c56cff88bcba3061f36132182cfe721c9374baca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:31 +0200
Subject: [PATCH 02/20] New package: qt6-base-6.1.0

---
 common/shlibs                              |  16 ++
 srcpkgs/qt6-base-devel                     |   1 +
 srcpkgs/qt6-base-doc                       |   1 +
 srcpkgs/qt6-base/patches/add-the-D.patch   |  15 ++
 srcpkgs/qt6-base/patches/musl-limits.patch |  20 +++
 srcpkgs/qt6-base/template                  | 188 +++++++++++++++++++++
 srcpkgs/qt6-base/update                    |   1 +
 srcpkgs/qt6-concurrent                     |   1 +
 srcpkgs/qt6-core                           |   1 +
 srcpkgs/qt6-dbus                           |   1 +
 srcpkgs/qt6-gui                            |   1 +
 srcpkgs/qt6-network                        |   1 +
 srcpkgs/qt6-opengl-widgets                 |   1 +
 srcpkgs/qt6-plugin-mysql                   |   1 +
 srcpkgs/qt6-plugin-odbc                    |   1 +
 srcpkgs/qt6-plugin-pgsql                   |   1 +
 srcpkgs/qt6-plugin-sqlite                  |   1 +
 srcpkgs/qt6-printsupport                   |   1 +
 srcpkgs/qt6-sql                            |   1 +
 srcpkgs/qt6-test                           |   1 +
 srcpkgs/qt6-widgets                        |   1 +
 srcpkgs/qt6-xml                            |   1 +
 22 files changed, 257 insertions(+)
 create mode 120000 srcpkgs/qt6-base-devel
 create mode 120000 srcpkgs/qt6-base-doc
 create mode 100644 srcpkgs/qt6-base/patches/add-the-D.patch
 create mode 100644 srcpkgs/qt6-base/patches/musl-limits.patch
 create mode 100644 srcpkgs/qt6-base/template
 create mode 100644 srcpkgs/qt6-base/update
 create mode 120000 srcpkgs/qt6-concurrent
 create mode 120000 srcpkgs/qt6-core
 create mode 120000 srcpkgs/qt6-dbus
 create mode 120000 srcpkgs/qt6-gui
 create mode 120000 srcpkgs/qt6-network
 create mode 120000 srcpkgs/qt6-opengl-widgets
 create mode 120000 srcpkgs/qt6-plugin-mysql
 create mode 120000 srcpkgs/qt6-plugin-odbc
 create mode 120000 srcpkgs/qt6-plugin-pgsql
 create mode 120000 srcpkgs/qt6-plugin-sqlite
 create mode 120000 srcpkgs/qt6-printsupport
 create mode 120000 srcpkgs/qt6-sql
 create mode 120000 srcpkgs/qt6-test
 create mode 120000 srcpkgs/qt6-widgets
 create mode 120000 srcpkgs/qt6-xml

diff --git a/common/shlibs b/common/shlibs
index 1b284ac33ef2..3ba44093b45d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,6 +1982,22 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
 libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
+libQt6Core.so.6 qt6-core-6.0.0_1
+libQt6OpenGL.so.6 qt6-gui-6.0.0_1
+libQt6DBus.so.6 qt6-dbus-6.0.0_1
+libQt6PrintSupport.so.6 qt6-printsupport-6.0.0_1
+libQt6Concurrent.so.6 qt6-concurrent-6.0.0_1
+libQt6Widgets.so.6 qt6-widgets-6.0.0_1
+libQt6Network.so.6 qt6-network-6.0.0_1
+libQt6Sql.so.6 qt6-sql-6.0.0_1
+libQt6Xml.so.6 qt6-xml-6.0.0_1
+libQt6Gui.so.6 qt6-gui-6.0.0_1
+libQt6XcbQpa.so.6 qt6-gui-6.0.0_1
+libQt6EglFSDeviceIntegration.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
+libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
+libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
+libQt6Test.so.6 qt6-test-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-base-devel b/srcpkgs/qt6-base-devel
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-devel
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base-doc b/srcpkgs/qt6-base-doc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-base-doc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-base/patches/add-the-D.patch b/srcpkgs/qt6-base/patches/add-the-D.patch
new file mode 100644
index 000000000000..94d2fc030304
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/add-the-D.patch
@@ -0,0 +1,15 @@
+--- cmake/FindWrapAtomic.cmake	2021-04-30 11:31:33.000000000 +0200
++++ -	2021-05-06 15:56:49.553742705 +0200
+@@ -31,9 +31,9 @@
+ check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
+ if(NOT HAVE_STDATOMIC)
+-    set(_req_libraries "${CMAKE_REQUIRE_LIBRARIES}")
+-    set(CMAKE_REQUIRE_LIBRARIES "atomic")
++    set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
++    set(CMAKE_REQUIRED_LIBRARIES "atomic")
+     check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
+-    set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
++    set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
+ endif()
+ 
+ add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
new file mode 100644
index 000000000000..54f96779b31d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -0,0 +1,20 @@
+--- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:40:03.905629969 +0200
+@@ -40,6 +40,7 @@
+ #  include <unistd.h>
+ #  include <utime.h>
+ #  include <fcntl.h>
++#  include <limits.h>
+ #  include <errno.h>
+ #endif
+ 
+--- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ -	2020-10-07 22:42:32.333434381 +0200
+@@ -58,6 +58,7 @@
+ #  include <sys/vfs.h>
+ #  include <mntent.h>
+ #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
++#  include <limits.h>
+ #  include <mntent.h>
+ #  include <sys/statvfs.h>
+ #  include <sys/sysmacros.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
new file mode 100644
index 000000000000..c720e7f51671
--- /dev/null
+++ b/srcpkgs/qt6-base/template
@@ -0,0 +1,188 @@
+# Template file for 'qt6-base'
+pkgname=qt6-base
+version=6.1.0
+revision=1
+wrksrc="qtbase-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DINSTALL_DATADIR=share/qt6
+ -DINSTALL_ARCHDATADIR=lib/qt6
+ -DINSTALL_BINDIR=lib/qt6/bin
+ -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
+ -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_SYSCONFDIR=/etc/xdg
+ -DQT_FEATURE_openssl_linked=ON
+ -DQT_FEATURE_system_sqlite=ON
+ -DBUILD_WITH_PCH=OFF"
+hostmakedepends="perl pkg-config xmlstarlet qt6-base-devel"
+makedepends="zlib-devel libzstd-devel dbus-devel
+ double-conversion-devel glib-devel libxcb-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
+ 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"
+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=f7af3c87e96051d09b5abce6c88277c33031bef241ebfe1db4106d33ed0814c4
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	# QtSetup fails native builds if this is set
+	configure_args+=" -DQT_HOST_PATH=/usr
+	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-gui_package() {
+	short_desc+=" - Gui"
+	pkg_install() {
+		vmove "usr/lib/libQt6Gui.so.*"
+		vmove "usr/lib/libQt6XcbQpa.so.*"
+		vmove "usr/lib/libQt6EglFSDeviceIntegration.so.*"
+		vmove "usr/lib/libQt6EglFsKmsGbmSupport.so.*"
+		vmove "usr/lib/libQt6EglFsKmsSupport.so.*"
+		vmove "usr/lib/libQt6OpenGL.so.*"
+		vmove usr/lib/qt6/plugins/generic
+		vmove usr/lib/qt6/plugins/platforms
+		vmove usr/lib/qt6/plugins/xcbglintegrations
+		vmove usr/lib/qt6/plugins/imageformats
+		vmove usr/lib/qt6/plugins/egldeviceintegrations
+		vmove usr/lib/qt6/plugins/platforminputcontexts
+		vmove usr/lib/qt6/plugins/platformthemes
+	}
+}
+
+qt6-opengl-widgets_package() {
+	short_desc+=" - OpenGL Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6OpenGLWidgets.so.*"
+	}
+}
+
+qt6-dbus_package() {
+	short_desc+=" - DBus"
+	pkg_install() {
+		vmove "usr/lib/libQt6DBus.so.*"
+	}
+}
+
+qt6-core_package() {
+	short_desc+=" - Core"
+	pkg_install() {
+		vmove "usr/lib/libQt6Core.so.*"
+	}
+}
+
+qt6-printsupport_package() {
+	short_desc+=" - Print Support"
+	pkg_install() {
+		vmove "usr/lib/libQt6PrintSupport.so.*"
+		vmove usr/lib/qt6/plugins/printsupport
+	}
+}
+
+qt6-concurrent_package() {
+	short_desc+=" - Concurrency"
+	pkg_install() {
+		vmove "usr/lib/libQt6Concurrent.so.*"
+	}
+}
+
+qt6-widgets_package() {
+	short_desc+=" - Widgets"
+	pkg_install() {
+		vmove "usr/lib/libQt6Widgets.so.*"
+	}
+}
+
+qt6-network_package() {
+	short_desc+=" - Network"
+	pkg_install() {
+		vmove "usr/lib/libQt6Network.so.*"
+	}
+}
+
+qt6-sql_package() {
+	short_desc+=" - Sql"
+	pkg_install() {
+		vmove "usr/lib/libQt6Sql.so.*"
+	}
+}
+
+qt6-test_package() {
+	short_desc+=" - Test"
+	pkg_install() {
+		vmove "usr/lib/libQt6Test.so*"
+	}
+}
+
+qt6-xml_package() {
+	short_desc+=" - Xml"
+	pkg_install() {
+		vmove "usr/lib/libQt6Xml.so.*"
+	}
+}
+
+qt6-base-doc_package() {
+	short_desc+=" - Documentation"
+	pkg_install() {
+		vmove usr/share/qt6/doc
+	}
+}
+
+
+qt6-plugin-odbc_package() {
+	short_desc+=" - ODBC plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlodbc.so
+	}
+}
+
+qt6-plugin-pgsql_package() {
+	short_desc+=" - PostgreSQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlpsql.so
+	}
+}
+
+qt6-plugin-mysql_package() {
+	short_desc+=" - MySQL plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlmysql.so
+	}
+}
+
+qt6-plugin-sqlite_package() {
+	short_desc+=" - SQLite plugin"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/sqldrivers/libqsqlite.so
+	}
+}
+
+qt6-base-devel_package() {
+	short_desc+=" - Development files"
+	depends="qt6-base>=${version}_${revision}
+	 qt6-gui>=${version}_${revision}
+	 qt6-core>=${version}_${revision}
+	 qt6-widgets>=${version}_${revision}
+	 qt6-opengl-widgets>=${version}_${revision}
+	 qt6-printsupport>=${version}_${revision}
+	 qt6-concurrent>=${version}_${revision}
+	 qt6-sql>=${version}_${revision}
+	 qt6-test>=${version}_${revision}
+	 qt6-network>=${version}_${revision}
+	 qt6-xml>=${version}_${revision}
+	 ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-base/update b/srcpkgs/qt6-base/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-base/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"
diff --git a/srcpkgs/qt6-concurrent b/srcpkgs/qt6-concurrent
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-concurrent
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-core b/srcpkgs/qt6-core
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-core
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-dbus b/srcpkgs/qt6-dbus
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-dbus
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-gui b/srcpkgs/qt6-gui
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-gui
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-network b/srcpkgs/qt6-network
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-network
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-opengl-widgets b/srcpkgs/qt6-opengl-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-opengl-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-mysql b/srcpkgs/qt6-plugin-mysql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-mysql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-odbc b/srcpkgs/qt6-plugin-odbc
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-odbc
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-pgsql b/srcpkgs/qt6-plugin-pgsql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-pgsql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-plugin-sqlite b/srcpkgs/qt6-plugin-sqlite
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-plugin-sqlite
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-printsupport b/srcpkgs/qt6-printsupport
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-printsupport
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-sql b/srcpkgs/qt6-sql
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-sql
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-test b/srcpkgs/qt6-test
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-test
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-widgets b/srcpkgs/qt6-widgets
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-widgets
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file
diff --git a/srcpkgs/qt6-xml b/srcpkgs/qt6-xml
new file mode 120000
index 000000000000..8ddee598d5ed
--- /dev/null
+++ b/srcpkgs/qt6-xml
@@ -0,0 +1 @@
+qt6-base
\ No newline at end of file

From 82ac2e4c03aef0ca8531d162d41e13230498b998 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 8 Oct 2020 20:40:52 +0200
Subject: [PATCH 03/20] New package: qt6-wayland-6.1.0

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-wayland-devel    |  1 +
 srcpkgs/qt6-wayland/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/qt6-wayland/update   |  1 +
 4 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-wayland-devel
 create mode 100644 srcpkgs/qt6-wayland/template
 create mode 100644 srcpkgs/qt6-wayland/update

diff --git a/common/shlibs b/common/shlibs
index 3ba44093b45d..569d4d2237e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1998,6 +1998,8 @@ libQt6EglFsKmsSupport.so.6 qt6-gui-6.0.0_1
 libQt6EglFsKmsGbmSupport.so.6 qt6-gui-6.0.0_1
 libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
+libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
+libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-wayland-devel b/srcpkgs/qt6-wayland-devel
new file mode 120000
index 000000000000..c4dec18ea9a0
--- /dev/null
+++ b/srcpkgs/qt6-wayland-devel
@@ -0,0 +1 @@
+qt6-wayland
\ No newline at end of file
diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
new file mode 100644
index 000000000000..43194ae66ad8
--- /dev/null
+++ b/srcpkgs/qt6-wayland/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-wayland'
+pkgname=qt6-wayland
+version=6.1.0
+revision=1
+wrksrc="qtwayland-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+# XXX: Qml as optional dep
+makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
+short_desc="Cross-platform application and UI framework - Wayland"
+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/qtwayland-everywhere-src-${version}.tar.xz"
+checksum=d67e8ffe4014a66b5864acf358a392149555db2adac1b9802a6650a59a70ad97
+
+qt6-wayland-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin/qtwaylandscanner
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-wayland/update b/srcpkgs/qt6-wayland/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-wayland/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 3bd666f9426d9826fd738a4ee6806fd7755f84b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 9 Oct 2020 20:34:02 +0200
Subject: [PATCH 04/20] New package: qt6-declarative-6.1.0

---
 common/shlibs                    | 11 ++++++++
 srcpkgs/qt6-declarative-devel    |  1 +
 srcpkgs/qt6-declarative-tools    |  1 +
 srcpkgs/qt6-declarative/template | 43 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-declarative/update   |  1 +
 5 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/qt6-declarative-devel
 create mode 120000 srcpkgs/qt6-declarative-tools
 create mode 100644 srcpkgs/qt6-declarative/template
 create mode 100644 srcpkgs/qt6-declarative/update

diff --git a/common/shlibs b/common/shlibs
index 569d4d2237e5..ba39775b36c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2000,6 +2000,17 @@ libQt6OpenGLWidgets.so.6 qt6-opengl-widgets-6.0.0_1
 libQt6Test.so.6 qt6-test-6.0.0_1
 libQt6WaylandCompositor.so.6 qt6-wayland-6.0.0_1
 libQt6WaylandClient.so.6 qt6-wayland-6.0.0_1
+libQt6Core5Compat.so.6 qt6-qt5compat-6.0.0_1
+libQt6Svg.so.6 qt6-svg-6.0.0_1
+libQt6SvgWidgets.so.6 qt6-svg-6.0.0_1
+libQt6Qml.so.6 qt6-declarative-6.0.0_1
+libQt6QmlWorkerScript.so.6 qt6-declarative-6.0.0_1
+libQt6QuickTest.so.6 qt6-declarative-6.0.0_1
+libQt6QuickShapes.so.6 qt6-declarative-6.0.0_1
+libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
+libQt6Quick.so.6 qt6-declarative-6.0.0_1
+libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
+libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-declarative-devel b/srcpkgs/qt6-declarative-devel
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-devel
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative-tools b/srcpkgs/qt6-declarative-tools
new file mode 120000
index 000000000000..fd03a4809f3e
--- /dev/null
+++ b/srcpkgs/qt6-declarative-tools
@@ -0,0 +1 @@
+qt6-declarative
\ No newline at end of file
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
new file mode 100644
index 000000000000..6da38cd33432
--- /dev/null
+++ b/srcpkgs/qt6-declarative/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-declarative'
+pkgname=qt6-declarative
+version=6.1.0
+revision=1
+wrksrc="qtdeclarative-everywhere-src-${version}"
+build_style=cmake
+configure_args=" -DQT_HOST_PATH=/usr
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
+makedepends="qt6-base-devel Vulkan-Headers"
+short_desc="Cross-platform application and UI framework - Declarative"
+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=e6f64314b8d54d7b541f52827b4e795317b17c3b7f39ad5210b8dbf343b75bda
+
+qt6-declarative-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/lib/qt6/plugins/qmltooling
+		for bin in qmlcachegen qmleasing qmlformat qmlimportscanner \
+			qmllint qmlplugindump qmlpreview qmlprofiler qmlscene \
+			qmltestrunner qmltime qmltyperegistrar; do
+			vmove usr/lib/qt6/bin/$bin
+		done
+	}
+}
+
+qt6-declarative-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-declarative-tools>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-declarative/update b/srcpkgs/qt6-declarative/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-declarative/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From f5826b0b17a86e941e7d456e626e2f1ce179a487 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 14:58:17 +0100
Subject: [PATCH 05/20] New package: qt6-qt5compat-6.1.0

---
 srcpkgs/qt6-qt5compat-devel    |  1 +
 srcpkgs/qt6-qt5compat/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-qt5compat/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-qt5compat-devel
 create mode 100644 srcpkgs/qt6-qt5compat/template
 create mode 100644 srcpkgs/qt6-qt5compat/update

diff --git a/srcpkgs/qt6-qt5compat-devel b/srcpkgs/qt6-qt5compat-devel
new file mode 120000
index 000000000000..f88da3a0fe5b
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat-devel
@@ -0,0 +1 @@
+qt6-qt5compat
\ No newline at end of file
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
new file mode 100644
index 000000000000..0fd536dc4075
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-qt5compat'
+pkgname=qt6-qt5compat
+version=6.1.0
+revision=1
+wrksrc="qt5compat-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
+checksum=c7d7e6ca2702b8b8b8b251bd271771ec319e5d107bb65f4dba024c200c8fd23c
+
+qt6-qt5compat-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-qt5compat/update b/srcpkgs/qt6-qt5compat/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-qt5compat/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 247ef708e481fd1e733397e89ac033d235272d2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:47:47 +0100
Subject: [PATCH 06/20] New package: qt6-tools-6.1.0

---
 srcpkgs/qt6-tools-devel    |  1 +
 srcpkgs/qt6-tools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-tools/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-tools-devel
 create mode 100644 srcpkgs/qt6-tools/template
 create mode 100644 srcpkgs/qt6-tools/update

diff --git a/srcpkgs/qt6-tools-devel b/srcpkgs/qt6-tools-devel
new file mode 120000
index 000000000000..d2de59aba453
--- /dev/null
+++ b/srcpkgs/qt6-tools-devel
@@ -0,0 +1 @@
+qt6-tools
\ No newline at end of file
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
new file mode 100644
index 000000000000..8d2d8e3f2419
--- /dev/null
+++ b/srcpkgs/qt6-tools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-tools'
+pkgname=qt6-tools
+version=6.1.0
+revision=1
+wrksrc="qttools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel libatomic-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
+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://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
+checksum=6263030c1120a30b0541d37b52dc0be0ea04bbb8d1695ec9648f0bd77e421f3e
+
+qt6-tools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-tools/update b/srcpkgs/qt6-tools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-tools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 9c7486196c2ed7a11993495a00c119948e49d317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 15:53:22 +0100
Subject: [PATCH 07/20] New package: qt6-svg-6.1.0

---
 srcpkgs/qt6-svg-devel    |  1 +
 srcpkgs/qt6-svg/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-svg/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-svg-devel
 create mode 100644 srcpkgs/qt6-svg/template
 create mode 100644 srcpkgs/qt6-svg/update

diff --git a/srcpkgs/qt6-svg-devel b/srcpkgs/qt6-svg-devel
new file mode 120000
index 000000000000..69c493dbd794
--- /dev/null
+++ b/srcpkgs/qt6-svg-devel
@@ -0,0 +1 @@
+qt6-svg
\ No newline at end of file
diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
new file mode 100644
index 000000000000..936d831fcd4e
--- /dev/null
+++ b/srcpkgs/qt6-svg/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-svg'
+pkgname=qt6-svg
+version=6.1.0
+revision=1
+wrksrc="qtsvg-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel perl"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
+checksum=5dd3aef98c93073b7a1ab5beadcc8948d1f939c7fd19ea4c2041cc4a3bc8b719
+
+qt6-svg-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-svg/update b/srcpkgs/qt6-svg/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-svg/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 5c7a3f041b3819dac6d2f212092392f9ec212a44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 21 Dec 2020 16:02:02 +0100
Subject: [PATCH 08/20] New package: qt6-translations-6.1.0

---
 srcpkgs/qt6-translations/template | 15 +++++++++++++++
 srcpkgs/qt6-translations/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-translations/template
 create mode 100644 srcpkgs/qt6-translations/update

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
new file mode 100644
index 000000000000..16a3a190fe7e
--- /dev/null
+++ b/srcpkgs/qt6-translations/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-translations'
+pkgname=qt6-translations
+version=6.1.0
+revision=1
+wrksrc="qttranslations-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="qt6-base-devel qt6-tools-devel perl"
+makedepends="qt6-base-devel qt6-tools-devel"
+short_desc="Cross-platform application and UI framework - translations"
+maintainer="John <me@johnnynator.dev>"
+license="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/qttranslations-everywhere-src-${version}.tar.xz"
+checksum=2affef9a0da9b61e8fc64ebbd515136b59c7392b789cd059ad134b26755dd073
diff --git a/srcpkgs/qt6-translations/update b/srcpkgs/qt6-translations/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-translations/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 74b8abd2a8f4a504e81bf95c1a29b3c48c780158 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 13:24:29 +0100
Subject: [PATCH 09/20] New package: qt6-shadertools-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-shadertools-devel    |  1 +
 srcpkgs/qt6-shadertools/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-shadertools/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-shadertools-devel
 create mode 100644 srcpkgs/qt6-shadertools/template
 create mode 100644 srcpkgs/qt6-shadertools/update

diff --git a/common/shlibs b/common/shlibs
index ba39775b36c9..6b6aa8a9cf6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2011,6 +2011,7 @@ libQt6QuickWidgets.so.6 qt6-declarative-6.0.0_1
 libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
+libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-shadertools-devel b/srcpkgs/qt6-shadertools-devel
new file mode 120000
index 000000000000..f1424d216cb3
--- /dev/null
+++ b/srcpkgs/qt6-shadertools-devel
@@ -0,0 +1 @@
+qt6-shadertools
\ No newline at end of file
diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
new file mode 100644
index 000000000000..5c27d3fab884
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-shadertools'
+pkgname=qt6-shadertools
+version=6.1.0
+revision=1
+wrksrc="qtshadertools-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - shadertools"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
+checksum=e391e2fb9dd4bd6b7fec0d6fd55817ca488a49d8e7f56b43655bea26167481e1
+
+qt6-shadertools-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-shadertools/update b/srcpkgs/qt6-shadertools/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-shadertools/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 8e553c11a5e71f32c40326a49d84a98172a8ceb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:01:58 +0100
Subject: [PATCH 10/20] New package: qt6-quick3d-6.1.0

---
 common/shlibs                |  8 ++++++++
 srcpkgs/qt6-quick3d-devel    |  1 +
 srcpkgs/qt6-quick3d/template | 29 +++++++++++++++++++++++++++++
 srcpkgs/qt6-quick3d/update   |  1 +
 4 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-quick3d-devel
 create mode 100644 srcpkgs/qt6-quick3d/template
 create mode 100644 srcpkgs/qt6-quick3d/update

diff --git a/common/shlibs b/common/shlibs
index 6b6aa8a9cf6f..ba192c561b5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,6 +2012,14 @@ libQt6Quick.so.6 qt6-declarative-6.0.0_1
 libQt6QmlModels.so.6 qt6-declarative-6.0.0_1
 libQt6QuickParticles.so.6 qt6-declarative-6.0.0_1
 libQt6ShaderTools.so.6 qt6-shadertools-6.0.0_1
+libQt6Quick3D.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DRuntimeRender.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
+libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
+libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-quick3d-devel b/srcpkgs/qt6-quick3d-devel
new file mode 120000
index 000000000000..91ff6f03e479
--- /dev/null
+++ b/srcpkgs/qt6-quick3d-devel
@@ -0,0 +1 @@
+qt6-quick3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
new file mode 100644
index 000000000000..0022dc25a374
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-quick3d'
+pkgname=qt6-quick3d
+version=6.1.0
+revision=1
+wrksrc="qtquick3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
+ libassimp-devel"
+short_desc="Cross-platform application and UI framework - Quick3d"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
+checksum=ead155359cf7fb8b2c1a69d00847196c4011433a4839938cc5f87f65a9d5d268
+
+qt6-quick3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/bin
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quick3d/update b/srcpkgs/qt6-quick3d/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quick3d/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d77d94c8b46f60e8e9ed3b3a7b06248d1959a189 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:09:47 +0100
Subject: [PATCH 11/20] New package: qt6-quickcontrols2-6.1.0

---
 srcpkgs/qt6-quickcontrols2-devel    |  1 +
 srcpkgs/qt6-quickcontrols2/template | 27 +++++++++++++++++++++++++++
 srcpkgs/qt6-quickcontrols2/update   |  1 +
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-quickcontrols2-devel
 create mode 100644 srcpkgs/qt6-quickcontrols2/template
 create mode 100644 srcpkgs/qt6-quickcontrols2/update

diff --git a/srcpkgs/qt6-quickcontrols2-devel b/srcpkgs/qt6-quickcontrols2-devel
new file mode 120000
index 000000000000..280bc162057d
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2-devel
@@ -0,0 +1 @@
+qt6-quickcontrols2
\ No newline at end of file
diff --git a/srcpkgs/qt6-quickcontrols2/template b/srcpkgs/qt6-quickcontrols2/template
new file mode 100644
index 000000000000..51e8315b5aea
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-quickcontrols2'
+pkgname=qt6-quickcontrols2
+version=6.1.0
+revision=1
+wrksrc="qtquickcontrols2-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quickcontrols2"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-2.0-or-later, LGPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquickcontrols2-everywhere-src-${version}.tar.xz"
+checksum=784f1d79e74df59f095b126a116d85e72801bd357f5666d6bad8407ac3957d59
+
+qt6-quickcontrols2-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-quickcontrols2/update b/srcpkgs/qt6-quickcontrols2/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quickcontrols2/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d46c6c0cde0370b081b72c9153012f8465fdfa8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 22 Dec 2020 14:12:46 +0100
Subject: [PATCH 12/20] New package: qt6-quicktimeline-6.1.0

---
 srcpkgs/qt6-quicktimeline/template | 15 +++++++++++++++
 srcpkgs/qt6-quicktimeline/update   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-quicktimeline/template
 create mode 100644 srcpkgs/qt6-quicktimeline/update

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
new file mode 100644
index 000000000000..eb30cc7b6ddb
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-quicktimeline'
+pkgname=qt6-quicktimeline
+version=6.1.0
+revision=1
+wrksrc="qtquicktimeline-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr "
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - quicktimeline"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://qt.io/"
+distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquicktimeline-everywhere-src-${version}.tar.xz"
+checksum=ae7421d5ae692ef7fda5a1be88dcb542c7f3531ad6264ceaea9d870605b6953e
diff --git a/srcpkgs/qt6-quicktimeline/update b/srcpkgs/qt6-quicktimeline/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-quicktimeline/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 09230189ee1609c838ad7e6613582f2614d92a1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 10:54:23 +0200
Subject: [PATCH 13/20] New package: qt6-virtualkeyboard-6.1.0

---
 srcpkgs/qt6-virtualkeyboard-devel    |  1 +
 srcpkgs/qt6-virtualkeyboard/template | 29 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/qt6-virtualkeyboard-devel
 create mode 100644 srcpkgs/qt6-virtualkeyboard/template

diff --git a/srcpkgs/qt6-virtualkeyboard-devel b/srcpkgs/qt6-virtualkeyboard-devel
new file mode 120000
index 000000000000..5da71523b639
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard-devel
@@ -0,0 +1 @@
+qt6-virtualkeyboard
\ No newline at end of file
diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
new file mode 100644
index 000000000000..6488e9c5c80c
--- /dev/null
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -0,0 +1,29 @@
+# Template file for 'qt6-virtualkeyboard'
+pkgname=qt6-virtualkeyboard
+version=6.1.0
+revision=1
+wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl pkg-config qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-quickcontrols2-devel
+ qt6-svg-devel hunspell-devel"
+depends="qt6-quickcontrols2"
+short_desc="Cross-platform application and UI framework - virtualkeyboard"
+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/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
+checksum=595d69dbfd43a87b4d3a270afed6dd64172551990e29239281f39b727b145c01
+
+qt6-virtualkeyboard-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From cb82eb379090007f14fab01ab697aa682e66e340 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:00:25 +0200
Subject: [PATCH 14/20] New package: qt6-networkauth-6.1.0

---
 common/shlibs                    |  1 +
 srcpkgs/qt6-networkauth-devel    |  1 +
 srcpkgs/qt6-networkauth/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-networkauth-devel
 create mode 100644 srcpkgs/qt6-networkauth/template

diff --git a/common/shlibs b/common/shlibs
index ba192c561b5d..5b7622e48ccc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2020,6 +2020,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
+libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-networkauth-devel b/srcpkgs/qt6-networkauth-devel
new file mode 120000
index 000000000000..e9763b3bb1a8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth-devel
@@ -0,0 +1 @@
+qt6-networkauth
\ No newline at end of file
diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
new file mode 100644
index 000000000000..b70fcc828fb8
--- /dev/null
+++ b/srcpkgs/qt6-networkauth/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-networkauth'
+pkgname=qt6-networkauth
+version=6.1.0
+revision=1
+wrksrc="qtnetworkauth-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - networkauth"
+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=bae8a941e4b635a364bdc65ea814adfe75b20b06fce0888612f72fc1e81ebdd3
+
+qt6-networkauth-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From fa59fa4eff89fa6b5ef7878bdc113e3c50067caf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:01:48 +0200
Subject: [PATCH 15/20] New package: qt6-scxml-6.1.0

---
 common/shlibs              |  4 ++++
 srcpkgs/qt6-scxml-devel    |  1 +
 srcpkgs/qt6-scxml/template | 27 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-scxml-devel
 create mode 100644 srcpkgs/qt6-scxml/template

diff --git a/common/shlibs b/common/shlibs
index 5b7622e48ccc..f98b1e473be7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,6 +2021,10 @@ libQt6QuickControls2Impl.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickControls2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-quickcontrols2-6.0.0_1
 libQt6NetworkAuth.so.6 qt6-networkauth-6.1.0rc2_1
+libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
+libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-scxml-devel b/srcpkgs/qt6-scxml-devel
new file mode 120000
index 000000000000..cd3032d5ed07
--- /dev/null
+++ b/srcpkgs/qt6-scxml-devel
@@ -0,0 +1 @@
+qt6-scxml
\ No newline at end of file
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
new file mode 100644
index 000000000000..b0e60b492782
--- /dev/null
+++ b/srcpkgs/qt6-scxml/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-scxml'
+pkgname=qt6-scxml
+version=6.1.0
+revision=1
+wrksrc="qtscxml-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - scxml"
+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/qtscxml-everywhere-src-${version}.tar.xz"
+checksum=c835809c2e194171e044464744ee516abce647fb428aa896d9f990e217c363ea
+
+qt6-scxml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f3c58f14bbd24af7fe7d127ea321cf2c49ef748b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:07:02 +0200
Subject: [PATCH 16/20] New package: qt6-imageformats-6.1.0

---
 srcpkgs/qt6-imageformats/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/qt6-imageformats/template

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
new file mode 100644
index 000000000000..80c457245cfd
--- /dev/null
+++ b/srcpkgs/qt6-imageformats/template
@@ -0,0 +1,15 @@
+# Template file for 'qt6-imageformats'
+pkgname=qt6-imageformats
+version=6.1.0
+revision=1
+wrksrc="qtimageformats-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-base-devel"
+short_desc="Cross-platform application and UI framework - imageformats"
+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=34e63786d31d0c5dcc13a4b37d31002efb53244e48a8c2f0fafdd81e8d28575a

From ad8f9ae50112d4666a271618ff36458c15c8df36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:08:18 +0200
Subject: [PATCH 17/20] New package: qt6-lottie-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-lottie-devel    |  1 +
 srcpkgs/qt6-lottie/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-lottie-devel
 create mode 100644 srcpkgs/qt6-lottie/template

diff --git a/common/shlibs b/common/shlibs
index f98b1e473be7..38ed206a6396 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2025,6 +2025,7 @@ libQt6ScxmlQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
+libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-lottie-devel b/srcpkgs/qt6-lottie-devel
new file mode 120000
index 000000000000..ba915c5589b8
--- /dev/null
+++ b/srcpkgs/qt6-lottie-devel
@@ -0,0 +1 @@
+qt6-lottie
\ No newline at end of file
diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
new file mode 100644
index 000000000000..21ad418162bb
--- /dev/null
+++ b/srcpkgs/qt6-lottie/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-lottie'
+pkgname=qt6-lottie
+version=6.1.0
+revision=1
+wrksrc="qtlottie-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - lottie"
+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=3c2478f1064574939cfc151d7df0743d6bb1119d8cee6ed3ca3bc1cdfb8fece8
+
+qt6-lottie-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 97d0725fbd92521fd37782bf4b93b79f9b97415c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:48:19 +0200
Subject: [PATCH 18/20] New package: qt6-3d-6.1.0

---
 common/shlibs           | 12 ++++++++++++
 srcpkgs/qt6-3d-devel    |  1 +
 srcpkgs/qt6-3d/template | 28 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 120000 srcpkgs/qt6-3d-devel
 create mode 100644 srcpkgs/qt6-3d/template

diff --git a/common/shlibs b/common/shlibs
index 38ed206a6396..111b048e3ff7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,6 +2026,18 @@ libQt6Scxml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachine.so.6 qt6-scxml-6.1.0rc2_1
 libQt6StateMachineQml.so.6 qt6-scxml-6.1.0rc2_1
 libQt6Bodymovin.so.6 qt6-lottie-6.1.0rc2_1
+libQt63DQuickAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DCore.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickScene2D.so.6 qt6-3d-6.1.0rc2_1
+libQt63DLogic.so.6 qt6-3d-6.1.0rc2_1
+libQt63DRender.so.6 qt6-3d-6.1.0rc2_1
+libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
+libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
+libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-3d-devel b/srcpkgs/qt6-3d-devel
new file mode 120000
index 000000000000..4b7cae59503c
--- /dev/null
+++ b/srcpkgs/qt6-3d-devel
@@ -0,0 +1 @@
+qt6-3d
\ No newline at end of file
diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
new file mode 100644
index 000000000000..101a56552999
--- /dev/null
+++ b/srcpkgs/qt6-3d/template
@@ -0,0 +1,28 @@
+# Template file for 'qt6-3d'
+pkgname=qt6-3d
+version=6.1.0
+revision=1
+wrksrc="qt3d-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
+ libatomic-devel"
+short_desc="Cross-platform application and UI framework - 3d"
+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=af48f674883de91a5bcb11caefda0e130b9c8c65dce474c47550dc2fdd3a5660
+
+qt6-3d-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 1eb8d979590ca4dc98fbfe5896641ba435ae8815 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 1 May 2021 11:57:02 +0200
Subject: [PATCH 19/20] New package: qt6-charts-6.1.0

---
 common/shlibs               |  1 +
 srcpkgs/qt6-charts-devel    |  1 +
 srcpkgs/qt6-charts/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/qt6-charts-devel
 create mode 100644 srcpkgs/qt6-charts/template

diff --git a/common/shlibs b/common/shlibs
index 111b048e3ff7..2ced94d7831f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2038,6 +2038,7 @@ libQt63DAnimation.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuickExtras.so.6 qt6-3d-6.1.0rc2_1
 libQt63DInput.so.6 qt6-3d-6.1.0rc2_1
 libQt63DQuick.so.6 qt6-3d-6.1.0rc2_1
+libQt6Charts.so.6 qt6-charts-6.1.0rc2_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-charts-devel b/srcpkgs/qt6-charts-devel
new file mode 120000
index 000000000000..894d48aa3126
--- /dev/null
+++ b/srcpkgs/qt6-charts-devel
@@ -0,0 +1 @@
+qt6-charts
\ No newline at end of file
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
new file mode 100644
index 000000000000..d8dee490199e
--- /dev/null
+++ b/srcpkgs/qt6-charts/template
@@ -0,0 +1,27 @@
+# Template file for 'qt6-charts'
+pkgname=qt6-charts
+version=6.1.0
+revision=1
+wrksrc="qtcharts-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - charts"
+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=8f70dc54b3f29eed91cf207db4185cef25f3d0bbc479059725c75c1895cddfcd
+
+qt6-charts-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 2264d06f0196c8949066a4db10adfe31b554640f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 20:52:55 +0200
Subject: [PATCH 20/20] strawberry: update to 0.9.3.

---
 .../strawberry/patches/less-log-spam.patch    |  10 +
 srcpkgs/strawberry/patches/pb_namespace.patch | 347 ------------------
 srcpkgs/strawberry/template                   |  29 +-
 3 files changed, 32 insertions(+), 354 deletions(-)
 create mode 100644 srcpkgs/strawberry/patches/less-log-spam.patch
 delete mode 100644 srcpkgs/strawberry/patches/pb_namespace.patch

diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch
new file mode 100644
index 000000000000..5cf85ad5fcdc
--- /dev/null
+++ b/srcpkgs/strawberry/patches/less-log-spam.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt	2021-04-14 16:59:00.905391095 +0200
++++ -	2021-04-29 21:22:05.347050684 +0200
+@@ -50,7 +50,6 @@
+   -Winit-self
+   -Wmissing-include-dirs
+   -Wmissing-declarations
+-  -Wstrict-overflow=2
+   -Wunused-parameter
+   -Wformat=2
+   -Wdisabled-optimization
diff --git a/srcpkgs/strawberry/patches/pb_namespace.patch b/srcpkgs/strawberry/patches/pb_namespace.patch
deleted file mode 100644
index 5a9946116ac1..000000000000
--- a/srcpkgs/strawberry/patches/pb_namespace.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-diff -ur ext/libstrawberry-tagreader/tagreader.cpp ext/libstrawberry-tagreader/tagreader.cpp
---- ext/libstrawberry-tagreader/tagreader.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -146,34 +146,34 @@
- 
- }
- 
--pb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
-+spb::tagreader::SongMetadata_FileType TagReader::GuessFileType(TagLib::FileRef *fileref) const {
- 
--  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV;
--  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC;
--  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK;
--  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC;
--  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS;
--  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS;
--  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX;
--  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG;
--  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4;
--  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF;
--  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF;
--  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC;
--  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO;
--  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE;
-+  if (dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV;
-+  if (dynamic_cast<TagLib::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC;
-+  if (dynamic_cast<TagLib::WavPack::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK;
-+  if (dynamic_cast<TagLib::Ogg::FLAC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC;
-+  if (dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS;
-+  if (dynamic_cast<TagLib::Ogg::Opus::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS;
-+  if (dynamic_cast<TagLib::Ogg::Speex::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX;
-+  if (dynamic_cast<TagLib::MPEG::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG;
-+  if (dynamic_cast<TagLib::MP4::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4;
-+  if (dynamic_cast<TagLib::ASF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF;
-+  if (dynamic_cast<TagLib::RIFF::AIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF;
-+  if (dynamic_cast<TagLib::MPC::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC;
-+  if (dynamic_cast<TagLib::TrueAudio::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO;
-+  if (dynamic_cast<TagLib::APE::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE;
- #ifdef HAVE_TAGLIB_DSFFILE
--  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF;
-+  if (dynamic_cast<TagLib::DSF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF;
- #endif
- #ifdef HAVE_TAGLIB_DSDIFFFILE
--  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF;
-+  if (dynamic_cast<TagLib::DSDIFF::File*>(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSDIFF;
- #endif
- 
--  return pb::tagreader::SongMetadata_FileType_UNKNOWN;
-+  return spb::tagreader::SongMetadata_FileType_UNKNOWN;
- 
- }
- 
--void TagReader::ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const {
- 
-   const QByteArray url(QUrl::fromLocalFile(filename).toEncoded());
-   const QFileInfo info(filename);
-@@ -435,7 +435,7 @@
- 
- }
- 
--void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   if (!map["COMPOSER"].isEmpty()) Decode(map["COMPOSER"].front(), song->mutable_composer());
-   if (!map["PERFORMER"].isEmpty()) Decode(map["PERFORMER"].front(), song->mutable_performer());
-@@ -459,7 +459,7 @@
- 
- }
- 
--void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const {
-+void TagReader::ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
- 
-   TagLib::APE::ItemListMap::ConstIterator it = map.find("ALBUM ARTIST");
-   if (it != map.end()) {
-@@ -503,7 +503,7 @@
- 
- }
- 
--void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const {
- 
-   vorbis_comments->addField("COMPOSER", StdStringToTaglibString(song.composer()), true);
-   vorbis_comments->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
-@@ -521,7 +521,7 @@
- 
- }
- 
--bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const {
-+bool TagReader::SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const {
- 
-   if (filename.isEmpty()) return false;
- 
-@@ -608,7 +608,7 @@
-   return result;
- }
- 
--void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const {
-+void TagReader::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
- 
-   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
-   tag->addValue("disc", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-diff -ur ext/libstrawberry-tagreader/tagreader.h ext/libstrawberry-tagreader/tagreader.h
---- ext/libstrawberry-tagreader/tagreader.h	2020-11-09 17:12:40.431554880 -0500
-+++ ext/libstrawberry-tagreader/tagreader.h	2021-02-19 14:36:37.195218302 -0500
-@@ -51,10 +51,10 @@
-   ~TagReader();
- 
-   bool IsMediaFile(const QString &filename) const;
--  pb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
-+  spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
- 
--  void ReadFile(const QString &filename, pb::tagreader::SongMetadata *song) const;
--  bool SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const;
-+  void ReadFile(const QString &filename, spb::tagreader::SongMetadata *song) const;
-+  bool SaveFile(const QString &filename, const spb::tagreader::SongMetadata &song) const;
- 
-   QByteArray LoadEmbeddedArt(const QString &filename) const;
-   QByteArray LoadEmbeddedAPEArt(const TagLib::APE::ItemListMap &map) const;
-@@ -62,11 +62,11 @@
-   static void Decode(const TagLib::String &tag, std::string *output);
-   static void Decode(const QString &tag, std::string *output);
- 
--  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
--  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, pb::tagreader::SongMetadata *song) const;
-+  void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
-+  void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
- 
--  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const pb::tagreader::SongMetadata &song) const;
--  void SaveAPETag(TagLib::APE::Tag *tag, const pb::tagreader::SongMetadata &song) const;
-+  void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, const spb::tagreader::SongMetadata &song) const;
-+  void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
- 
-   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
-   void SetTextFrame(const char *id, const std::string &value, TagLib::ID3v2::Tag *tag) const;
-diff -ur ext/libstrawberry-tagreader/tagreadermessages.proto ext/libstrawberry-tagreader/tagreadermessages.proto
---- ext/libstrawberry-tagreader/tagreadermessages.proto	2020-09-11 17:34:59.552108115 -0400
-+++ ext/libstrawberry-tagreader/tagreadermessages.proto	2021-02-19 14:36:49.047230658 -0500
-@@ -1,6 +1,6 @@
- syntax = "proto2";
- 
--package pb.tagreader;
-+package spb.tagreader;
- 
- message SongMetadata {
- 
-diff -ur ext/strawberry-tagreader/tagreaderworker.cpp ext/strawberry-tagreader/tagreaderworker.cpp
---- ext/strawberry-tagreader/tagreaderworker.cpp	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -27,13 +27,13 @@
- #include "tagreaderworker.h"
- 
- TagReaderWorker::TagReaderWorker(QIODevice *socket, QObject *parent)
--  : AbstractMessageHandler<pb::tagreader::Message>(socket, parent)
-+  : AbstractMessageHandler<spb::tagreader::Message>(socket, parent)
- {
- }
- 
--void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
-+void TagReaderWorker::MessageArrived(const spb::tagreader::Message& message) {
- 
--  pb::tagreader::Message reply;
-+  spb::tagreader::Message reply;
- 
-   if (message.has_read_file_request()) {
-     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
-@@ -55,7 +55,7 @@
- 
- 
- void TagReaderWorker::DeviceClosed() {
--  AbstractMessageHandler<pb::tagreader::Message>::DeviceClosed();
-+  AbstractMessageHandler<spb::tagreader::Message>::DeviceClosed();
- 
-   qApp->exit();
- }
-diff -ur ext/strawberry-tagreader/tagreaderworker.h ext/strawberry-tagreader/tagreaderworker.h
---- ext/strawberry-tagreader/tagreaderworker.h	2020-09-11 17:34:59.552108115 -0400
-+++ ext/strawberry-tagreader/tagreaderworker.h	2021-02-19 14:36:37.195218302 -0500
-@@ -28,12 +28,12 @@
- 
- class QIODevice;
- 
--class TagReaderWorker : public AbstractMessageHandler<pb::tagreader::Message> {
-+class TagReaderWorker : public AbstractMessageHandler<spb::tagreader::Message> {
- public:
-   explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr);
- 
- protected:
--  void MessageArrived(const pb::tagreader::Message &message) override;
-+  void MessageArrived(const spb::tagreader::Message &message) override;
-   void DeviceClosed() override;
- 
- private:
-diff -ur src/core/song.cpp src/core/song.cpp
---- src/core/song.cpp	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.cpp	2021-02-19 14:36:37.196218302 -0500
-@@ -744,7 +744,7 @@
-   set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
- }
- 
--void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
-+void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
- 
-   if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
- 
-@@ -791,7 +791,7 @@
- 
- }
- 
--void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
-+void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
- 
-   const QByteArray url(d->url_.toEncoded());
-   const QByteArray art_automatic(d->art_automatic_.toEncoded());
-@@ -826,7 +826,7 @@
-   pb->set_filesize(d->filesize_);
-   pb->set_suspicious_tags(d->suspicious_tags_);
-   pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
--  pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
-+  pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
- 
- }
- 
-diff -ur src/core/song.h src/core/song.h
---- src/core/song.h	2020-11-09 17:12:40.431554880 -0500
-+++ src/core/song.h	2021-02-19 14:37:05.177247472 -0500
-@@ -44,11 +44,11 @@
- struct SimpleMetaBundle;
- }  // namespace Engine
- 
--namespace pb {
-+namespace spb {
- namespace tagreader {
- class SongMetadata;
- }  // namespace tagreader
--}  // namespace pb
-+}  // namespace spb
- 
- #ifdef HAVE_LIBGPOD
- struct _Itdb_Track;
-@@ -155,7 +155,7 @@
-   // Constructors
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
-   void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
--  void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
-+  void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
-   void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
-   void InitFromFilePartial(const QString &filename);  // Just store the filename: incomplete but fast
-   void InitArtManual();  // Check if there is already a art in the cache and store the filename in art_manual
-@@ -180,7 +180,7 @@
-   void BindToQuery(QSqlQuery *query) const;
-   void BindToFtsQuery(QSqlQuery *query) const;
-   void ToXesam(QVariantMap *map) const;
--  void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
-+  void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
- 
-   // Simple accessors
-   bool is_valid() const;
-diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp
---- src/core/tagreaderclient.cpp	2020-10-19 13:09:38.951139121 -0400
-+++ src/core/tagreaderclient.cpp	2021-02-19 14:36:37.195218302 -0500
-@@ -71,8 +71,8 @@
- 
- TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -82,8 +82,8 @@
- 
- TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
-   metadata.ToProtobuf(req->mutable_metadata());
-@@ -96,8 +96,8 @@
- 
- TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-@@ -107,8 +107,8 @@
- 
- TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
- 
--  pb::tagreader::Message message;
--  pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
-+  spb::tagreader::Message message;
-+  spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
- 
-   req->set_filename(DataCommaSizeFromQString(filename));
- 
-diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h
---- src/core/tagreaderclient.h	2020-09-11 17:34:59.560108063 -0400
-+++ src/core/tagreaderclient.h	2021-02-19 14:36:37.196218302 -0500
-@@ -44,7 +44,7 @@
-  public:
-   explicit TagReaderClient(QObject *parent = nullptr);
- 
--  typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
-+  typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
-   typedef HandlerType::ReplyType ReplyType;
- 
-   static const char *kWorkerExecutableName;
-@@ -78,7 +78,7 @@
-   static TagReaderClient *sInstance;
- 
-   WorkerPool<HandlerType> *worker_pool_;
--  QList<pb::tagreader::Message> message_queue_;
-+  QList<spb::tagreader::Message> message_queue_;
-   QThread *original_thread_;
- };
- 
-diff -ur tests/src/tagreader_test.cpp tests/src/tagreader_test.cpp
---- tests/src/tagreader_test.cpp	2020-09-11 17:34:59.596107832 -0400
-+++ tests/src/tagreader_test.cpp	2021-02-19 14:36:37.194218300 -0500
-@@ -44,7 +44,7 @@
-   static Song ReadSongFromFile(const QString& filename) {
-     TagReader tag_reader;
-     Song song;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
- 
-     // We need to init protobuf object from a Song object, to have default values initialized correctly.
-     song.ToProtobuf(&pb_song);
-@@ -55,7 +55,7 @@
- 
-   static void WriteSongToFile(const Song& song, const QString& filename) {
-     TagReader tag_reader;
--    ::pb::tagreader::SongMetadata pb_song;
-+    ::spb::tagreader::SongMetadata pb_song;
-     song.ToProtobuf(&pb_song);
-     tag_reader.SaveFile(filename, pb_song);
-   }
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 2621799c3421..ac2096d495ca 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,18 +1,33 @@
 # Template file for 'strawberry'
 pkgname=strawberry
-version=0.8.4
+version=0.9.3
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
+hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
  chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
- libmtp-devel protobuf-devel pulseaudio-devel qt5-tools-devel qt5-plugin-mysql
- qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
- qt5-x11extras-devel taglib-devel"
-depends="qt5-plugin-sqlite desktop-file-utils"
+ libmtp-devel protobuf-devel pulseaudio-devel taglib-devel"
+depends="desktop-file-utils"
 short_desc="Audio player and music collection organizer"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.strawberrymusicplayer.org/"
 distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b
+checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e
+
+build_options="qt6"
+build_options_default=""
+
+if [ "$build_option_qt6" ]; then
+	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
+	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	makedepends+=" qt6-base-devel qt6-plugin-mysql
+	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+	depends+=" qt6-plugin-sqlite"
+else
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+	makedepends+=" qt5-tools-devel qt5-plugin-mysql
+	 qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+	 qt5-plugin-tds qt5-x11extras-devel"
+	depends+=" qt5-plugin-sqlite"
+fi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Merged]: New packages: qt6
  2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
                   ` (19 preceding siblings ...)
  2021-05-06 16:23 ` Johnnynator
@ 2021-05-06 16:23 ` Johnnynator
  20 siblings, 0 replies; 22+ messages in thread
From: Johnnynator @ 2021-05-06 16:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

There's a merged pull request on the void-packages repository

New packages: qt6
https://github.com/void-linux/void-packages/pull/27349

Description:
TOOD:
- [ ] Address TODOs

~~the cmake part does not use the host version of some tools e.g. a problem with lconvert~~ fixed with 6.1.0

[ci skip]

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2021-05-06 16:23 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-22 13:35 [PR PATCH] common/build-style/cmake.sh: pass full path of TOOLCHAIN_FILE to cmake Johnnynator
2020-12-22 13:41 ` [PR PATCH] [Updated] [WIP] New packages: qt6 Johnnynator
2020-12-22 18:39 ` ericonr
2020-12-23 23:17 ` Johnnynator
2020-12-23 23:19 ` [PR PATCH] [Updated] " Johnnynator
2020-12-23 23:20 ` Johnnynator
2020-12-24 11:01 ` Johnnynator
2021-04-29 17:19 ` Johnnynator
2021-04-29 19:02 ` Johnnynator
2021-04-29 19:44 ` Johnnynator
2021-05-01  9:59 ` Johnnynator
2021-05-01 18:10 ` [PR REVIEW] " yopito
2021-05-01 18:10 ` yopito
2021-05-01 18:11 ` yopito
2021-05-01 22:06 ` [PR PATCH] [Updated] " Johnnynator
2021-05-05 14:44 ` Johnnynator
2021-05-05 22:06 ` [PR REVIEW] " yopito
2021-05-06 14:14 ` [PR PATCH] [Updated] " Johnnynator
2021-05-06 14:25 ` [PR PATCH] [Updated] " Johnnynator
2021-05-06 15:24 ` Johnnynator
2021-05-06 16:23 ` Johnnynator
2021-05-06 16:23 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).