qt55: set library paths from NIX_PROFILES

+95 -46
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0001-dlopen-gtkstyle.patch
··· 1 - From d3224286c647f1d1e7dac485bbeee5bc8286e6c6 Mon Sep 17 00:00:00 2001 1 + From 5334f7d5d3e7be31ea25c3553dfb60f283a14669 Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Mon, 1 Dec 2014 17:21:58 -0600 4 - Subject: [PATCH 1/9] dlopen-gtkstyle 4 + Subject: [PATCH 01/11] dlopen-gtkstyle 5 5 6 6 --- 7 7 qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- ··· 59 59 return (QGtkStylePrivate::gconf_client_get_default !=0); 60 60 } 61 61 -- 62 - 2.5.0 62 + 2.5.2 63 63
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0002-dlopen-resolv.patch
··· 1 - From af315c076c8626292075592fab1726fcd62c3169 Mon Sep 17 00:00:00 2001 1 + From 51ae02d8c9de1cb93bf22b2519efb119dd2e39d9 Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Mon, 1 Dec 2014 17:22:55 -0600 4 - Subject: [PATCH 2/9] dlopen-resolv 4 + Subject: [PATCH 02/11] dlopen-resolv 5 5 6 6 --- 7 7 qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- ··· 35 35 return; 36 36 } 37 37 -- 38 - 2.5.0 38 + 2.5.2 39 39
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0003-dlopen-gl.patch
··· 1 - From fc9f34b6e8a290615868e27bfcd31c355d11487c Mon Sep 17 00:00:00 2001 1 + From d1f7bf62e4bab26df5deea37f08cfdd278cca47c Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Mon, 1 Dec 2014 17:23:08 -0600 4 - Subject: [PATCH 3/9] dlopen-gl 4 + Subject: [PATCH 03/11] dlopen-gl 5 5 6 6 --- 7 7 .../plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 +- ··· 21 21 } 22 22 } 23 23 -- 24 - 2.5.0 24 + 2.5.2 25 25
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0004-tzdir.patch
··· 1 - From b1a0771652ddf91058f67fa92260a89c43f5c530 Mon Sep 17 00:00:00 2001 1 + From 26c73d6da84f1b4797421b9ddecef18d6ce588f0 Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Mon, 1 Dec 2014 17:23:22 -0600 4 - Subject: [PATCH 4/9] tzdir 4 + Subject: [PATCH 04/11] tzdir 5 5 6 6 --- 7 7 qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ ··· 48 48 } 49 49 50 50 -- 51 - 2.5.0 51 + 2.5.2 52 52
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0005-dlopen-libXcursor.patch
··· 1 - From 5fbe717120864d490fa4d60bc7f7676ac19bd69d Mon Sep 17 00:00:00 2001 1 + From 9fbdfd6c1231ee4778acc9a2edf297cf4b9314ac Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Mon, 1 Dec 2014 17:33:51 -0600 4 - Subject: [PATCH 5/9] dlopen-libXcursor 4 + Subject: [PATCH 05/11] dlopen-libXcursor 5 5 6 6 --- 7 7 qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- ··· 25 25 } 26 26 if (xcursorFound) { 27 27 -- 28 - 2.5.0 28 + 2.5.2 29 29
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0006-dlopen-openssl.patch
··· 1 - From 4c4b1f2a35644014da79d089d3860e518fa9a27d Mon Sep 17 00:00:00 2001 1 + From 2d7e4e21291238e2b41d0e173f918cd3530c8ade Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Sun, 23 Aug 2015 08:52:04 -0500 4 - Subject: [PATCH 6/9] dlopen openssl 4 + Subject: [PATCH 06/11] dlopen openssl 5 5 6 6 --- 7 7 qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- ··· 34 34 // libssl.so.0 and libcrypto.so.0 found 35 35 return pair; 36 36 -- 37 - 2.5.0 37 + 2.5.2 38 38
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0007-dlopen-dbus.patch
··· 1 - From a23141d76cdde068ba1cefdad4a6352c921ce7c9 Mon Sep 17 00:00:00 2001 1 + From d060d32d8df3e320a12567ebdfc2c1d01c648168 Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Sun, 23 Aug 2015 08:52:27 -0500 4 - Subject: [PATCH 7/9] dlopen dbus 4 + Subject: [PATCH 07/11] dlopen dbus 5 5 6 6 --- 7 7 qtbase/src/dbus/qdbus_symbols.cpp | 2 +- ··· 21 21 22 22 lib->unload(); 23 23 -- 24 - 2.5.0 24 + 2.5.2 25 25
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0008-xdg-config-dirs.patch
··· 1 - From a7dc6209542ef8aa54191c0e17fbb9b41cbad67f Mon Sep 17 00:00:00 2001 1 + From 253c0829d4bc30da0152a22114a949449796ec7d Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Sun, 23 Aug 2015 08:52:57 -0500 4 - Subject: [PATCH 8/9] xdg config dirs 4 + Subject: [PATCH 08/11] xdg config dirs 5 5 6 6 --- 7 7 qtbase/src/corelib/io/qsettings.cpp | 18 ++++++++++++++++++ ··· 51 51 SandboxConfFile = 0, 52 52 NumConfFiles = 1 53 53 -- 54 - 2.5.0 54 + 2.5.2 55 55
+3 -3
pkgs/development/libraries/qt-5/5.5/qtbase/0009-decrypt-ssl-traffic.patch
··· 1 - From 64bc88615a4cb58d461fe600b46611415d74b7b2 Mon Sep 17 00:00:00 2001 1 + From 44378743aa6ca21eb61de93476daa8356081c0fc Mon Sep 17 00:00:00 2001 2 2 From: Thomas Tuegel <ttuegel@gmail.com> 3 3 Date: Sun, 23 Aug 2015 08:53:42 -0500 4 - Subject: [PATCH 9/9] decrypt ssl traffic 4 + Subject: [PATCH 09/11] decrypt ssl traffic 5 5 6 6 --- 7 7 qtbase/src/network/ssl/qsslsocket_openssl.cpp | 2 +- ··· 21 21 #include "qssl_p.h" 22 22 #include "qsslsocket_openssl_p.h" 23 23 -- 24 - 2.5.0 24 + 2.5.2 25 25
+27
pkgs/development/libraries/qt-5/5.5/qtbase/0010-mkspecs-libgl.patch
··· 1 + From 5113406661f06afa01da48ebc0567a4d0f69051c Mon Sep 17 00:00:00 2001 2 + From: Thomas Tuegel <ttuegel@gmail.com> 3 + Date: Sat, 17 Oct 2015 09:12:46 -0500 4 + Subject: [PATCH 10/11] mkspecs libgl 5 + 6 + --- 7 + qtbase/mkspecs/common/linux.conf | 4 ++-- 8 + 1 file changed, 2 insertions(+), 2 deletions(-) 9 + 10 + diff --git a/qtbase/mkspecs/common/linux.conf b/qtbase/mkspecs/common/linux.conf 11 + index 8d6fb6f..0ff9181 100644 12 + --- a/qtbase/mkspecs/common/linux.conf 13 + +++ b/qtbase/mkspecs/common/linux.conf 14 + @@ -12,8 +12,8 @@ QMAKE_INCDIR = 15 + QMAKE_LIBDIR = 16 + QMAKE_INCDIR_X11 = 17 + QMAKE_LIBDIR_X11 = 18 + -QMAKE_INCDIR_OPENGL = 19 + -QMAKE_LIBDIR_OPENGL = 20 + +QMAKE_INCDIR_OPENGL = @mesa@/include 21 + +QMAKE_LIBDIR_OPENGL = @mesa@/lib 22 + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL 23 + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL 24 + QMAKE_INCDIR_EGL = 25 + -- 26 + 2.5.2 27 +
+38
pkgs/development/libraries/qt-5/5.5/qtbase/0011-nix-profiles-library-paths.patch
··· 1 + From 2da5e660c4b470444e756f2ec88cb520a124bc99 Mon Sep 17 00:00:00 2001 2 + From: Thomas Tuegel <ttuegel@gmail.com> 3 + Date: Sat, 17 Oct 2015 09:20:35 -0500 4 + Subject: [PATCH] nix profiles library paths 5 + 6 + --- 7 + qtbase/src/corelib/kernel/qcoreapplication.cpp | 15 +++++++++++++++ 8 + 1 file changed, 15 insertions(+) 9 + 10 + diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp 11 + index ecafe91..96e3eb5 100644 12 + --- a/qtbase/src/corelib/kernel/qcoreapplication.cpp 13 + +++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp 14 + @@ -2496,6 +2496,21 @@ QStringList QCoreApplication::libraryPaths() 15 + } 16 + } 17 + } 18 + + 19 + + // Add library paths derived from NIX_PROFILES. 20 + + const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES"); 21 + + if (!nixProfilesEnv.isEmpty()) { 22 + + QLatin1Char pathSep(' '); 23 + + QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts); 24 + + for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { 25 + + it->append("/lib/qt5/plugins"); 26 + + QString canonicalPath = QDir(*it).canonicalPath(); 27 + + if (!canonicalPath.isEmpty() 28 + + && !app_libpaths->contains(canonicalPath)) { 29 + + app_libpaths->append(canonicalPath); 30 + + } 31 + + } 32 + + } 33 + } 34 + return *(coreappdata()->app_libpaths); 35 + } 36 + -- 37 + 2.5.2 38 +
-17
pkgs/development/libraries/qt-5/5.5/qtbase/0014-mkspecs-libgl.patch
··· 1 - Ensure Qt knows where libGL is. 2 - 3 - Author: Bjørn Forsman <bjorn.forsman@gmail.com> 4 - diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 5 - --- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 6 - +++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 7 - @@ -12,8 +12,8 @@ 8 - QMAKE_LIBDIR = 9 - QMAKE_INCDIR_X11 = 10 - QMAKE_LIBDIR_X11 = 11 - -QMAKE_INCDIR_OPENGL = 12 - -QMAKE_LIBDIR_OPENGL = 13 - +QMAKE_INCDIR_OPENGL = @mesa@/include 14 - +QMAKE_LIBDIR_OPENGL = @mesa@/lib 15 - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL 16 - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL 17 - QMAKE_INCDIR_EGL =
+3 -2
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
··· 84 84 xdg-config-dirs = ./0008-xdg-config-dirs.patch; 85 85 decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch; 86 86 mkspecs-libgl = substituteAll { 87 - src = ./0014-mkspecs-libgl.patch; 87 + src = ./0010-mkspecs-libgl.patch; 88 88 inherit mesa; 89 89 }; 90 + nix-profiles-library-paths = ./0011-nix-profiles-library-paths.patch; 90 91 in [ 91 92 dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl 92 - dlopen-dbus xdg-config-dirs 93 + dlopen-dbus xdg-config-dirs nix-profiles-library-paths 93 94 ] 94 95 ++ optional gtkStyle dlopen-gtkstyle 95 96 ++ optional decryptSslTraffic decrypt-ssl-traffic