diff --git a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch index d08061dd5dd6..a79f0f363899 100644 --- a/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch +++ b/pkgs/development/libraries/qt-5/5.4/0011-dlopen-openssl.patch @@ -1,17 +1,8 @@ -From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:35:21 -0600 -Subject: [PATCH] dlopen-openssl - ---- - qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 4e6200f..d9c3e7d 100644 +index c1fea93..bc1c0f0 100644 --- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -585,8 +585,8 @@ static QPair loadOpenSsl() +@@ -611,8 +611,8 @@ static QPair loadOpenSsl() #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. @@ -22,10 +13,10 @@ index 4e6200f..d9c3e7d 100644 if (libcrypto->load() && libssl->load()) { // libssl.so. and libcrypto.so. found return pair; -@@ -597,8 +597,8 @@ static QPair loadOpenSsl() - #endif - - // second attempt: find the development files libssl.so and libcrypto.so +@@ -629,8 +629,8 @@ static QPair loadOpenSsl() + // 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. - libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); - libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); + libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); @@ -33,6 +24,3 @@ index 4e6200f..d9c3e7d 100644 if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found return pair; --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch index f32386e114b7..77eb7bc85af5 100644 --- a/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch +++ b/pkgs/development/libraries/qt-5/5.4/0012-dlopen-dbus.patch @@ -1,25 +1,13 @@ -From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 1 Dec 2014 17:38:04 -0600 -Subject: [PATCH] dlopen-dbus - ---- - qtbase/src/dbus/qdbus_symbols.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp -index a7a1b67..661baf1 100644 +index 6764309..33f25f9 100644 --- a/qtbase/src/dbus/qdbus_symbols.cpp +++ b/qtbase/src/dbus/qdbus_symbols.cpp -@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus() +@@ -88,7 +88,7 @@ bool qdbus_loadLibDBus() + #ifdef Q_OS_WIN + QLatin1String("dbus-1"), + #endif +- QLatin1String("libdbus-1") ++ QLatin1String("@dbus_libs@/lib/libdbus-1") + }; - static int majorversions[] = { 3, 2, -1 }; lib->unload(); -- lib->setFileName(QLatin1String("dbus-1")); -+ lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1")); - for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) { - lib->setFileNameAndVersion(lib->fileName(), majorversions[i]); - if (lib->load() && lib->resolve("dbus_connection_open_private")) --- -2.1.3 - diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index 0a460f863af6..ca6491f0c7db 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -30,7 +30,7 @@ let importManifest ./manifest.nix { mirror = "http://download.qt.io"; }; srcs = mapAttrs (name: manifest: manifest.src) manifest; - version = "5.4.0"; + version = "5.4.1"; callPackage = newScope (self // { inherit qtSubmodule; });