From 3726d341bd3485f21d612f7da047e18522017b87 Mon Sep 17 00:00:00 2001 From: John 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 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 + # include + # include ++# include + # include + #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 + # include + #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD) ++# include + # include + # include + # include 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 +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 +--- + 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 _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 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(output.data()), &len, + reinterpret_cast(data.constData()), data.size()); +- q_EVP_CipherFinal(ctx, ++ q_EVP_CipherFinal_ex(ctx, + reinterpret_cast(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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAV; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_FLAC; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_WAVPACK; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGFLAC; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGVORBIS; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGOPUS; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_OGGSPEEX; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPEG; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MP4; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_ASF; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_AIFF; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_MPC; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_TRUEAUDIO; -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_APE; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAV; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_FLAC; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_WAVPACK; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGFLAC; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGVORBIS; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGOPUS; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_OGGSPEEX; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPEG; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MP4; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_ASF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_AIFF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_MPC; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_TRUEAUDIO; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_APE; - #ifdef HAVE_TAGLIB_DSFFILE -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSF; -+ if (dynamic_cast(fileref->file())) return spb::tagreader::SongMetadata_FileType_DSF; - #endif - #ifdef HAVE_TAGLIB_DSDIFFFILE -- if (dynamic_cast(fileref->file())) return pb::tagreader::SongMetadata_FileType_DSDIFF; -+ if (dynamic_cast(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(socket, parent) -+ : AbstractMessageHandler(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::DeviceClosed(); -+ AbstractMessageHandler::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 { -+class TagReaderWorker : public AbstractMessageHandler { - 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(d->filetype_)); -+ pb->set_filetype(static_cast(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 HandlerType; -+ typedef AbstractMessageHandler HandlerType; - typedef HandlerType::ReplyType ReplyType; - - static const char *kWorkerExecutableName; -@@ -78,7 +78,7 @@ - static TagReaderClient *sInstance; - - WorkerPool *worker_pool_; -- QList message_queue_; -+ QList 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 " license="GPL-3.0-or-later" homepage="https://www.strawberrymusicplayer.org/" distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz" -checksum=f93acf3217ae6b63c6ee469bf8b8a86317f724c018cf7e86c43d663c8066760b +checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e