tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001
2From: Thomas Tuegel <ttuegel@mailbox.org>
3Date: Sun, 16 Feb 2020 14:24:07 -0600
4Subject: [PATCH 3/4] kdeinit-extra-libs
5
6---
7 src/kdeinit/kinit.cpp | 22 ++++------------------
8 1 file changed, 4 insertions(+), 18 deletions(-)
9
10diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
11index 0801b75..622dd5f 100644
12--- a/src/kdeinit/kinit.cpp
13+++ b/src/kdeinit/kinit.cpp
14@@ -96,9 +96,9 @@ static const char *extra_libs[] = {
15 "libKF5Parts.5.dylib",
16 "libKF5Plasma.5.dylib"
17 #else
18- "libKF5KIOCore.so.5",
19- "libKF5Parts.so.5",
20- "libKF5Plasma.so.5"
21+ NIXPKGS_KF5_KIOCORE,
22+ NIXPKGS_KF5_PARTS,
23+ NIXPKGS_KF5_PLASMA
24 #endif
25 };
26 #endif
27@@ -1524,20 +1524,6 @@ static int initXconnection()
28 }
29 #endif
30
31-#ifndef Q_OS_OSX
32-// Find a shared lib in the lib dir, e.g. libkio.so.
33-// Completely unrelated to plugins.
34-static QString findSharedLib(const QString &lib)
35-{
36- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib;
37- if (QFile::exists(path)) {
38- return path;
39- }
40- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes?
41- return QString();
42-}
43-#endif
44-
45 extern "C" {
46
47 static void secondary_child_handler(int)
48@@ -1679,7 +1665,7 @@ int main(int argc, char **argv)
49 #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)
50 if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
51 for (const char *extra_lib : extra_libs) {
52- const QString extra = findSharedLib(QString::fromLatin1(extra_lib));
53+ const QString extra = QString::fromLatin1(extra_lib);
54 if (!extra.isEmpty()) {
55 QLibrary l(extra);
56 l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
57--
582.23.1
59