diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-08 14:20:46 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-08 14:20:46 -0600 |
| commit | fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e (patch) | |
| tree | 438a071359823ebd1228f43269b7de2f7ce0fe97 /pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch | |
| parent | d81538ff49d63774684cc1f83cf44a4a061fb38d (diff) | |
| parent | 049357bb3083930750a3f01d36b42dae55f9bb2e (diff) | |
| download | nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.gz nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.bz2 nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.lz nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.xz nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.tar.zst nixlib-fdefc0cb2c0fac1e02cadbc5ea53bfc234d2953e.zip | |
Merge branch 'kdenetwork-filesharing'
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch new file mode 100644 index 000000000000..c9ad46b41bb7 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch @@ -0,0 +1,28 @@ +Index: kio-5.17.0/src/core/ksambashare.cpp +=================================================================== +--- 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; + } + |