diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch index a0e344a7bc68..5b212c099650 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch @@ -1,9 +1,9 @@ -Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio - // the QTCOMPOSE environment variable +--- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -258,10 +258,7 @@ void TableGenerator::initPossibleLocatio + m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); - m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch index 9891bfeac5bf..46600e7f4262 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp +Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -658,8 +658,8 @@ static QPair loadO +--- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -681,8 +681,8 @@ static QPair loadO #endif #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so // first attempt: the canonical name is libssl.so. @@ -13,7 +13,7 @@ Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cp if (libcrypto->load() && libssl->load()) { // libssl.so. and libcrypto.so. found return pair; -@@ -676,8 +676,8 @@ static QPair loadO +@@ -699,8 +699,8 @@ static QPair loadO // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third // attempt, _after_ /Contents/Frameworks has been searched. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch index 98a3610f5fbd..1df27377658d 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp +Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp -+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp -@@ -85,7 +85,7 @@ static bool resolveLibraryInternal() +--- qtbase-opensource-src-5.8.0.orig/src/network/kernel/qdnslookup_unix.cpp ++++ qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp +@@ -90,7 +90,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif { @@ -11,10 +11,10 @@ Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp if (!lib.load()) return false; } -Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp +Index: qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp -+++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp +--- qtbase-opensource-src-5.8.0.orig/src/network/kernel/qhostinfo_unix.cpp ++++ qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp @@ -100,7 +100,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch index 4390db977a71..e9c60e7ab076 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch @@ -9,11 +9,11 @@ is defined in openssl, but not in libressl. src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp +Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp -+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp -@@ -347,7 +347,7 @@ init_context: +--- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslcontext_openssl.cpp ++++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp +@@ -351,7 +351,7 @@ init_context: const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); if (!qcurves.isEmpty()) { @@ -22,7 +22,7 @@ Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp // Set the curves to be used if (q_SSLeay() >= 0x10002000L) { // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -360,7 +360,7 @@ init_context: +@@ -364,7 +364,7 @@ init_context: sslContext->errorCode = QSslError::UnspecifiedError; } } else diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch index ebaf3651a6d0..c5d91066d8f6 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp +Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp -@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat +--- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp +@@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch index f4056dd9cc97..f48ac761ccf2 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -68,7 +68,10 @@ typedef QHash Q +--- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -70,7 +70,10 @@ typedef QHash Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -14,7 +14,7 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt +@@ -642,12 +645,18 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch index 1f2f316c5b26..b5c21f064a42 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch @@ -1,8 +1,8 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp +Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp -@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti +--- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings.cpp ++++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp +@@ -1134,6 +1134,23 @@ QConfFileSettingsPrivate::QConfFileSetti confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); @@ -26,10 +26,10 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp for (i = 0; i < NumConfFiles; ++i) { if (confFiles[i]) { spec = i; -Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h +Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h =================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h -+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h +--- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings_p.h ++++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h @@ -246,7 +246,7 @@ public: F_Organization = 0x1, F_User = 0x0,