dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

qt58.qtbase: Update patch offsets

Browse Source
This commit is contained in:
Thomas Tuegel 2017-04-15 11:11:32 -05:00
parent c4c614c232
commit 44eb84feb6
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
View File

@ -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.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio @@ -258,10 +258,7 @@ void TableGenerator::initPossibleLocatio
// the QTCOMPOSE environment variable m_possibleLocations.reserve(7);
if (qEnvironmentVariableIsSet("QTCOMPOSE")) if (qEnvironmentVariableIsSet("QTCOMPOSE"))
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); - m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));

10
pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
View File

@ -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.8.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadO @@ -681,8 +681,8 @@ static QPair<QLibrary*, QLibrary*> loadO
#endif #endif
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so #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.<SHLIB_VERSION_NUMBER> // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@ -13,7 +13,7 @@ Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cp
if (libcrypto->load() && libssl->load()) { if (libcrypto->load() && libssl->load()) {
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
return pair; return pair;
@@ -676,8 +676,8 @@ static QPair<QLibrary*, QLibrary*> loadO @@ -699,8 +699,8 @@ static QPair<QLibrary*, QLibrary*> loadO
// OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
// attempt, _after_ <bundle>/Contents/Frameworks has been searched. // attempt, _after_ <bundle>/Contents/Frameworks has been searched.
// iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.

14
pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
View File

@ -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.8.0.orig/src/network/kernel/qdnslookup_unix.cpp
+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp +++ qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
@@ -85,7 +85,7 @@ static bool resolveLibraryInternal() @@ -90,7 +90,7 @@ static bool resolveLibraryInternal()
if (!lib.load()) if (!lib.load())
#endif #endif
{ {
@ -11,10 +11,10 @@ Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
if (!lib.load()) if (!lib.load())
return false; 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.8.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/src/network/kernel/qhostinfo_unix.cpp
@@ -100,7 +100,7 @@ static bool resolveLibraryInternal() @@ -100,7 +100,7 @@ static bool resolveLibraryInternal()
if (!lib.load()) if (!lib.load())
#endif #endif

10
pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
View File

@ -9,11 +9,11 @@ is defined in openssl, but not in libressl.
src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 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.8.0.orig/src/network/ssl/qsslcontext_openssl.cpp
+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp +++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslcontext_openssl.cpp
@@ -347,7 +347,7 @@ init_context: @@ -351,7 +351,7 @@ init_context:
const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
if (!qcurves.isEmpty()) { 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 // Set the curves to be used
if (q_SSLeay() >= 0x10002000L) { if (q_SSLeay() >= 0x10002000L) {
// SSL_CTX_ctrl wants a non-const pointer as last argument, // 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; sslContext->errorCode = QSslError::UnspecifiedError;
} }
} else } else

8
pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
View File

@ -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.8.0.orig/src/corelib/kernel/qcoreapplication.cpp
+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp +++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat @@ -2476,7 +2476,17 @@ QStringList QCoreApplication::libraryPat
QStringList *app_libpaths = new QStringList; QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths); coreappdata()->app_libpaths.reset(app_libpaths);

10
pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
View File

@ -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.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp +++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q @@ -70,7 +70,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones() static QTzTimeZoneHash loadTzTimeZones()
{ {
@ -14,7 +14,7 @@ Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
if (!QFile::exists(path)) if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); 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)) if (!tzif.open(QIODevice::ReadOnly))
return; return;
} else { } else {

14
pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
View File

@ -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.8.0.orig/src/corelib/io/qsettings.cpp
+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp +++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp
@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti @@ -1134,6 +1134,23 @@ QConfFileSettingsPrivate::QConfFileSetti
confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, 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) { for (i = 0; i < NumConfFiles; ++i) {
if (confFiles[i]) { if (confFiles[i]) {
spec = 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.8.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/src/corelib/io/qsettings_p.h
@@ -246,7 +246,7 @@ public: @@ -246,7 +246,7 @@ public:
F_Organization = 0x1, F_Organization = 0x1,
F_User = 0x0, F_User = 0x0,