build KDE Frameworks with each Qt version
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
{ kdeFramework, lib, copyPathsToStore
|
||||
, extra-cmake-modules, acl, karchive
|
||||
, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
|
||||
, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
|
||||
, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
|
||||
, kwidgetsaddons, kwindowsystem, kxmlgui
|
||||
, qtscript, qtx11extras, solid
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "kio";
|
||||
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [
|
||||
acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
|
||||
kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
|
||||
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
|
||||
qtx11extras
|
||||
];
|
||||
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
samba-search-path.patch
|
||||
Reference in New Issue
Block a user