public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kinit: upgrade patches

Browse Source 
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
This commit is contained in:
Yaroslav Bolyukin 2021-02-17 18:59:43 +03:00
parent 15fd83232c
commit 47d5bebf67
No known key found for this signature in database
GPG Key ID: 40B5D6948143175F
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
View File

@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644
- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 - // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
- // - so we try hacking it in ourselves - // - so we try hacking it in ourselves
- QString install_lib_dir = QFile::decodeName( - QString install_lib_dir = QFile::decodeName(
- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); - CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/");
- QString orig_libpath = libpath; - QString orig_libpath = libpath;
- libpath = install_lib_dir + libpath; - libpath = install_lib_dir + libpath;
- l.setFileName(libpath); - l.setFileName(libpath);

2
pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
View File

@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
-#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" -#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+#define EXECUTE "/run/wrappers/bin/start_kdeinit" +#define EXECUTE "/run/wrappers/bin/start_kdeinit"
#if KDEINIT_OOM_PROTECT #if KDEINIT_OOM_PROTECT

2
pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
View File

@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644
-// Completely unrelated to plugins. -// Completely unrelated to plugins.
-static QString findSharedLib(const QString &lib) -static QString findSharedLib(const QString &lib)
-{ -{
- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; - QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib;
- if (QFile::exists(path)) { - if (QFile::exists(path)) {
- return path; - return path;
- } - }