kde/plasma5: adjust patches to 5.24
This commit is contained in:
André Vitor de Lima Matos
parent
5e80366cb2
commit
217b65f690
|
|
@ -1,8 +1,8 @@
|
|||
{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }:
|
||||
{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, kcoreaddons }:
|
||||
|
||||
mkDerivation {
|
||||
name = "kdecoration";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtbase ki18n ];
|
||||
buildInputs = [ qtbase ki18n kcoreaddons ];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,11 +63,11 @@ index 0000000..726065d
|
|||
+
|
||||
+}// namespace
|
||||
+
|
||||
+#endif // SERVICE_UTILS_H
|
||||
diff --git a/src/service_utils.h b/src/service_utils.h
|
||||
+#endif // NIXOS_UTILS_H
|
||||
diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h
|
||||
index 8a70c1f..475b15d 100644
|
||||
--- a/src/service_utils.h
|
||||
+++ b/src/service_utils.h
|
||||
--- a/src/utils/serviceutils.h
|
||||
+++ b/src/utils/serviceutils.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <QLoggingCategory>
|
||||
//KF
|
||||
|
|
|
|||
|
|
@ -11,11 +11,10 @@ diff --git a/processui/scripting.cpp b/processui/scripting.cpp
|
|||
index efed8ff..841761a 100644
|
||||
--- a/processui/scripting.cpp
|
||||
+++ b/processui/scripting.cpp
|
||||
@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() {
|
||||
QStringList scripts;
|
||||
@@ -293,7 +293,7 @@ void Scripting::loadContextMenu()
|
||||
const QStringList dirs =
|
||||
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory);
|
||||
Q_FOREACH (const QString &dir, dirs) {
|
||||
for (const QString &dir : dirs) {
|
||||
- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
|
||||
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||||
while (it.hasNext()) {
|
||||
|
|
|
|||
|
|
@ -14,33 +14,33 @@ diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/start
|
|||
index 270744053..356160e96 100644
|
||||
--- a/startkde/plasma-session/startup.cpp
|
||||
+++ b/startkde/plasma-session/startup.cpp
|
||||
@@ -143,7 +143,7 @@ Startup::Startup(QObject *parent)
|
||||
const AutoStart autostart;
|
||||
@@ -179,7 +179,7 @@ Startup::Startup(QObject *parent)
|
||||
}
|
||||
|
||||
// Keep for KF5; remove in KF6 (KInit will be gone then)
|
||||
- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
|
||||
+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
|
||||
|
||||
KJob *windowManagerJob = nullptr;
|
||||
if (qEnvironmentVariable("XDG_SESSION_TYPE") != QLatin1String("wayland")) {
|
||||
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
|
||||
KJob *phase1 = nullptr;
|
||||
m_lock.reset(new QEventLoopLocker);
|
||||
diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
|
||||
index 3a054a04f..b2e7ab3fb 100644
|
||||
--- a/startkde/startplasma-waylandsession.cpp
|
||||
+++ b/startkde/startplasma-waylandsession.cpp
|
||||
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
|
||||
out << "startplasma-waylandsession: Shutting down...\n";
|
||||
--- a/startkde/startplasma-wayland.cpp
|
||||
+++ b/startkde/startplasma-wayland.cpp
|
||||
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
|
||||
out << "startplasma-wayland: Shutting down...\n";
|
||||
|
||||
// Keep for KF5; remove in KF6 (KInit will be gone then)
|
||||
- runSync(QStringLiteral("kdeinit5_shutdown"), {});
|
||||
+ runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
|
||||
|
||||
out << "startplasma-waylandsession: Done.\n";
|
||||
|
||||
out << "startplasmacompositor: Shutting down...\n";
|
||||
cleanupPlasmaEnvironment(oldSystemdEnvironment);
|
||||
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
|
||||
index d6b2c5439..534eeb0e5 100644
|
||||
--- a/startkde/startplasma-x11.cpp
|
||||
+++ b/startkde/startplasma-x11.cpp
|
||||
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
|
||||
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
|
||||
out << "startkde: Shutting down...\n";
|
||||
|
||||
// Keep for KF5; remove in KF6 (KInit will be gone then)
|
||||
|
|
@ -53,7 +53,7 @@ diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
|||
index 008fdfcaf..72468f21c 100644
|
||||
--- a/startkde/startplasma.cpp
|
||||
+++ b/startkde/startplasma.cpp
|
||||
@@ -39,7 +39,7 @@ QTextStream out(stderr);
|
||||
@@ -50,7 +50,7 @@ QTextStream out(stderr);
|
||||
void messageBox(const QString &text)
|
||||
{
|
||||
out << text;
|
||||
|
|
@ -62,7 +62,7 @@ index 008fdfcaf..72468f21c 100644
|
|||
}
|
||||
|
||||
QStringList allServices(const QLatin1String &prefix)
|
||||
@@ -340,7 +340,7 @@ void setupX11()
|
||||
@@ -412,7 +412,7 @@ void setupX11()
|
||||
// If the user has overwritten fonts, the cursor font may be different now
|
||||
// so don't move this up.
|
||||
|
||||
|
|
@ -70,17 +70,8 @@ index 008fdfcaf..72468f21c 100644
|
|||
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
|
||||
}
|
||||
|
||||
void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment)
|
||||
@@ -403,7 +403,7 @@ void setupFontDpi()
|
||||
// TODO port to c++?
|
||||
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
|
||||
QProcess p;
|
||||
- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
|
||||
+ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
|
||||
p.setProcessChannelMode(QProcess::ForwardedChannels);
|
||||
p.write(input);
|
||||
p.closeWriteChannel();
|
||||
@@ -425,7 +425,7 @@ QProcess *setupKSplash()
|
||||
void cleanupPlasmaEnvironment(const std::optional<QProcessEnvironment> &oldSystemdEnvironment)
|
||||
@@ -500,7 +500,7 @@ QProcess *setupKSplash()
|
||||
KConfigGroup ksplashCfg = cfg.group("KSplash");
|
||||
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
|
||||
p = new QProcess;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ index a560da3..f723c1e 100644
|
|||
type=image
|
||||
color=#1d99f3
|
||||
fontSize=10
|
||||
-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
|
||||
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
|
||||
-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
|
||||
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
|
||||
needsFullUserModel=false
|
||||
--
|
||||
2.30.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user