diff options
| author | Marius Bakke <marius@gnu.org> | 2022-10-16 00:10:07 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-10-16 00:10:07 +0200 |
| commit | c567a82a6975e70c8207a4aeed55a72b5121213c (patch) | |
| tree | 8a6dfe8a78726933e4a1581a2c6ba4a84d59411f /gnu/packages/patches/kinit-kdeinit-extra_libs.patch | |
| parent | 3a84b4ec4cec1d122cb454da9d4f6a747a51e49a (diff) | |
| parent | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (diff) | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/patches/kinit-kdeinit-extra_libs.patch')
| -rw-r--r-- | gnu/packages/patches/kinit-kdeinit-extra_libs.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch index 1271f3df7d..b27c6ed535 100644 --- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch +++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch @@ -21,27 +21,6 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch #endif }; #endif -@@ -1533,20 +1531,6 @@ static int initXconnection() - } - #endif - --#ifndef Q_OS_OSX --// Find a shared lib in the lib dir, e.g. libkio.so. --// Completely unrelated to plugins. --static QString findSharedLib(const QString &lib) --{ -- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; -- if (QFile::exists(path)) { -- return path; -- } -- // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? -- return QString(); --} --#endif -- - extern "C" { - - static void secondary_child_handler(int) @@ -1673,7 +1673,7 @@ #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { |