[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/09: gnu: kio: Search 'smbd' on $PATH.
From: |
guix-commits |
Subject: |
05/09: gnu: kio: Search 'smbd' on $PATH. |
Date: |
Fri, 4 Jan 2019 04:11:44 -0500 (EST) |
htgoebel pushed a commit to branch master
in repository guix.
commit a6e532815d5022d005a00f8323e46084cfa66221
Author: Hartmut Goebel <address@hidden>
Date: Sun Oct 22 17:17:57 2017 +0200
gnu: kio: Search 'smbd' on $PATH.
Transfer the remaining NixOS patch for kio as of 2018-02-17.
* gnu/packages/patches/kio-search-smbd-on-PATH.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/kde-frameworks.scm(kio)<source>: Use it.
---
gnu/local.mk | 1 +
gnu/packages/kde-frameworks.scm | 6 ++---
gnu/packages/patches/kio-search-smbd-on-PATH.patch | 30 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 362f934..a7e6a06 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -855,6 +855,7 @@ dist_patch_DATA =
\
%D%/packages/patches/kiki-makefile.patch \
%D%/packages/patches/kiki-missing-includes.patch \
%D%/packages/patches/kiki-portability-64bit.patch \
+ %D%/packages/patches/kio-search-smbd-on-PATH.patch \
%D%/packages/patches/kmod-module-directory.patch \
%D%/packages/patches/kobodeluxe-paths.patch \
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index e270035..98c920a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2573,7 +2573,8 @@ makes starting KDE applications faster and reduces memory
consumption.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k"))))
+ "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k"))
+ (patches (search-patches "kio-search-smbd-on-PATH.patch"))))
(build-system cmake-build-system)
(propagated-inputs
`(("kbookmarks" ,kbookmarks)
@@ -2616,11 +2617,10 @@ makes starting KDE applications faster and reduces
memory consumption.")
(modify-phases %standard-phases
(add-after 'unpack 'patch
(lambda _
- ;; Better error message (taken from nix)
+ ;; Better error message (taken from NixOS)
(substitute* "src/kiod/kiod_main.cpp"
(("(^\\s*qCWarning(KIOD_CATEGORY) << \"Error loading
plugin:\")( << loader.errorString();)" _ a b)
(string-append a "<< name" b)))
- ;; TODO: samba-search-path.patch from nix: search smbd on $PATH
#t))
(add-before 'check 'check-setup
(lambda _
diff --git a/gnu/packages/patches/kio-search-smbd-on-PATH.patch
b/gnu/packages/patches/kio-search-smbd-on-PATH.patch
new file mode 100644
index 0000000..47e20cf
--- /dev/null
+++ b/gnu/packages/patches/kio-search-smbd-on-PATH.patch
@@ -0,0 +1,30 @@
+Adopted from NixOS
+pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
+
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+- if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+- return true;
++ const QByteArray pathEnv = qgetenv("PATH");
++ if (!pathEnv.isEmpty()) {
++ QLatin1Char pathSep(':');
++ QStringList paths = QFile::decodeName(pathEnv).split(pathSep,
QString::SkipEmptyParts);
++ for (QStringList::iterator it = paths.begin(); it != paths.end();
++it) {
++ it->append("/smbd");
++ if (QFile::exists(*it)) {
++ return true;
++ }
++ }
+ }
+
+- //qDebug() << "Samba is not installed!";
+-
+ return false;
+ }
+
- branch master updated (b824dbe -> fb0356d), guix-commits, 2019/01/04
- 03/09: gnu: kconfigwidgets: Make QDirIterator follow symlinks., guix-commits, 2019/01/04
- 04/09: gnu: kdelibs4support: Add todo comment for a patch from NixOS., guix-commits, 2019/01/04
- 05/09: gnu: kio: Search 'smbd' on $PATH.,
guix-commits <=
- 02/09: gnu: kcmutils: Print plugin name when loading fails., guix-commits, 2019/01/04
- 01/09: gnu: kcmutils: Make QDirIterator follow symlinks., guix-commits, 2019/01/04
- 09/09: gnu: kservice: Transfer patches from NixOS., guix-commits, 2019/01/04
- 07/09: gnu: kinit: Use LIBRARY_PATH to search for dynamically loaded libs., guix-commits, 2019/01/04
- 08/09: gnu: kpackage: Transfer patches from NixOS., guix-commits, 2019/01/04
- 06/09: gnu: kinit: Use the store paths for dynamically loaded libs., guix-commits, 2019/01/04