Verified Commit 88d29983 authored by Hartmut Goebel's avatar Hartmut Goebel
Browse files

Revert "TEMP patch for libkscreen - just to save the work."

parent 46cf0fc3
......@@ -1016,34 +1016,6 @@ them.")
and prints it in a X window.")
(license license:gpl2+)))
(define-public libkscreen-patched
(package
(inherit libkscreen)
(version "5.37.1")
(replacement #f)
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" "5.10.4"
"/libkscreen-" "5.10.4" ".tar.xz"))
(sha256
(base32 "0zpybykj6s547j53a7x4flj45qhpk3z0d3sfp6wgi88gybnffj8g"))
;; TODO: If kscreen-backends occur in other packages, try to get rid of
;; libkscreen-backends-path.patch, which hard-codes the path.
(patches (search-patches "libkscreen-backends-path.patch"))))
(arguments
`(#:tests? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "src/backendmanager.cpp"
(("GUIXPKGS_LIBKSCREEN_BACKENDS")
(string-append (assoc-ref outputs "out") "/lib/qt5/plugins/kf5/kscreen"))
)
#t)))))
))
(define-public milou
(package
(name "milou")
......
Index: libkscreen-5.9.4/src/backendmanager.cpp
===================================================================
--- libkscreen-5.9.4.orig/src/backendmanager.cpp
+++ libkscreen-5.9.4/src/backendmanager.cpp
@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke
QFileInfoList BackendManager::listBackends()
{
// Compile a list of installed backends first
- const QString backendFilter = QStringLiteral("KSC_*");
- const QStringList paths = QCoreApplication::libraryPaths();
- QFileInfoList finfos;
- for (const QString &path : paths) {
- const QDir dir(path + QLatin1String("/kf5/kscreen/"),
- backendFilter,
- QDir::SortFlags(QDir::QDir::Name),
- QDir::NoDotAndDotDot | QDir::Files);
- finfos.append(dir.entryInfoList());
- }
- return finfos;
+ const QDir dir(QLatin1String("GUIXPKGS_LIBKSCREEN_BACKENDS"),
+ QStringLiteral("KSC_*"),
+ QDir::SortFlags(QDir::QDir::Name),
+ QDir::NoDotAndDotDot | QDir::Files);
+ return dir.entryInfoList();
}
KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment