scottk/ports
1
0
Fork 0
mirror of https://github.com/outbackdingo/ports.git synced 2026-03-22 01:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
cceff0bd15c8d48fd3aa68e4e9bd5bf3cefca2bf
ports/core/qt5/main.patch
emmett1 ffc55872d6 merge musl repo to core
2020-05-03 23:38:23 +08:00

201 lines
9.8 KiB
Diff
Raw Blame History

diff -ruN qt-everywhere-src-5.14.1-orig/gnuwin32/lib/libcharset.la.orig qt-everywhere-src-5.14.1/gnuwin32/lib/libcharset.la.orig
--- qt-everywhere-src-5.14.1-orig/gnuwin32/lib/libcharset.la.orig 2020-01-24 14:22:45.000000000 +0900
+++ qt-everywhere-src-5.14.1/gnuwin32/lib/libcharset.la.orig 1970-01-01 09:00:00.000000000 +0900
@@ -1,35 +0,0 @@
-# libcharset.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5 (1.1220 2003/04/05 19:32:58)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='../bin/libcharset1.dll'
-
-# Names of this library.
-library_names='libcharset.dll.a'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Version information for libcharset.
-current=1
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='c:/progra~1/LibIconv/lib'
diff -ruN qt-everywhere-src-5.14.1-orig/gnuwin32/lib/libiconv.la.orig qt-everywhere-src-5.14.1/gnuwin32/lib/libiconv.la.orig
--- qt-everywhere-src-5.14.1-orig/gnuwin32/lib/libiconv.la.orig 2020-01-24 14:22:45.000000000 +0900
+++ qt-everywhere-src-5.14.1/gnuwin32/lib/libiconv.la.orig 1970-01-01 09:00:00.000000000 +0900
@@ -1,35 +0,0 @@
-# libiconv.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5 (1.1220 2003/04/05 19:32:58)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='../bin/libiconv2.dll'
-
-# Names of this library.
-library_names='libiconv.dll.a'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Version information for libiconv.
-current=4
-age=2
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='c:/progra~1/LibIconv/lib'
diff -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/corelib/codecs/qiconvcodec.cpp qt-everywhere-src-5.14.1/qtbase/src/corelib/codecs/qiconvcodec.cpp
--- qt-everywhere-src-5.14.1-orig/qtbase/src/corelib/codecs/qiconvcodec.cpp 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/corelib/codecs/qiconvcodec.cpp 2020-03-11 04:02:33.353404703 +0900
@@ -61,7 +61,7 @@
#elif defined(Q_OS_AIX)
# define NO_BOM
# define UTF16 "UCS-2"
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
# define NO_BOM
# if Q_BYTE_ORDER == Q_BIG_ENDIAN
# define UTF16 "UTF-16BE"
diff -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/network/configure.json qt-everywhere-src-5.14.1/qtbase/src/network/configure.json
--- qt-everywhere-src-5.14.1-orig/qtbase/src/network/configure.json 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/network/configure.json 2020-03-11 04:02:33.353404703 +0900
@@ -195,7 +195,7 @@
"test": {
"include": "openssl/opensslv.h",
"tail": [
- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L",
+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)",
"# error OpenSSL >= 1.1 is required",
"#endif"
]
diff -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslcontext_openssl.cpp qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslcontext_openssl.cpp
--- qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslcontext_openssl.cpp 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslcontext_openssl.cpp 2020-03-11 04:02:33.353404703 +0900
@@ -269,7 +269,7 @@
}
#endif // ocsp
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {
diff -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
--- qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp 2020-03-11 04:02:33.353404703 +0900
@@ -600,7 +600,7 @@
q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
}
#endif
-#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 -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
--- qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-03-11 04:02:33.354404703 +0900
@@ -248,8 +248,8 @@
#endif
DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return)
DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
@@ -448,7 +448,7 @@
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)
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(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);
diff -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
--- qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h 2020-03-11 04:02:33.354404703 +0900
@@ -378,7 +378,7 @@
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);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(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);
diff -ruN qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
--- qt-everywhere-src-5.14.1-orig/qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2020-01-23 21:37:32.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2020-03-11 04:02:33.354404703 +0900
@@ -78,8 +78,8 @@
unsigned char * q_ASN1_STRING_data(ASN1_STRING *a);
BIO *q_BIO_new_file(const char *filename, const char *mode);
void q_ERR_clear_error();
-Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a);
-Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem();
+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
int q_CRYPTO_num_locks();
void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
void q_CRYPTO_set_id_callback(unsigned long (*a)());
diff -ruN qt-everywhere-src-5.14.1-orig/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp qt-everywhere-src-5.14.1/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp
--- qt-everywhere-src-5.14.1-orig/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp 2019-11-07 19:38:14.000000000 +0900
+++ qt-everywhere-src-5.14.1/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp 2020-03-11 04:03:25.892405745 +0900
@@ -11,17 +11,21 @@
std::string getCurrentThreadName() {
char name[32] = "unknown";
+#if defined(__GLIBC__)
pthread_getname_np(pthread_self(), name, sizeof(name));
+#endif
return name;
}
void setCurrentThreadName(const std::string& name) {
+#if defined(__GLIBC__)
if (name.size() > 15) { // Linux hard limit (see manpages).
pthread_setname_np(pthread_self(), name.substr(0, 15).c_str());
} else {
pthread_setname_np(pthread_self(), name.c_str());
}
+#endif
}
void makeThreadLowPriority() {
Reference in New Issue View Git Blame Copy Permalink