plasma5: 5.22.5 -> 5.23.0 #141670
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.0/ -A '*.tar.xz' ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,10 +11,10 @@ diff --git a/processui/scripting.cpp b/processui/scripting.cpp | |
| index efed8ff..841761a 100644 | ||
| --- a/processui/scripting.cpp | ||
| +++ b/processui/scripting.cpp | ||
| @@ -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) { | ||
| - 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()) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| extra-cmake-modules, | ||
| kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, | ||
| knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, | ||
| qtbase, qtscript, qtwebengine, qtx11extras, libnl, libpcap, lm_sensors | ||
| }: | ||
|
|
||
| mkDerivation { | ||
|
|
@@ -15,7 +15,7 @@ mkDerivation { | |
| buildInputs = [ | ||
| kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets | ||
| kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras | ||
| qtwebengine knewstuff libnl libpcap lm_sensors | ||
| ]; | ||
| outputs = [ "bin" "dev" "out" ]; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,11 +36,6 @@ mkDerivation { | |
| patches = [ | ||
| ./hwclock-path.patch | ||
| ./tzdir.patch | ||
|
Member
There was a problem hiding this comment. Please remove the unused fetchpatch from inputs. |
||
| ]; | ||
| CXXFLAGS = [ | ||
| ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,12 +2,12 @@ diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvanced | |
| index 2f11ba1d..310f11b4 100644 | ||
| --- a/vpn/openvpn/openvpnadvancedwidget.cpp | ||
| +++ b/vpn/openvpn/openvpnadvancedwidget.cpp | ||
| @@ -80,7 +80,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P | ||
| }); | ||
|
|
||
| // start openVPN process and get its cipher list | ||
| - const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"}); | ||
| + const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin", "@openvpn@/bin", "/run/current-system/sw/sbin", "/run/current-system/sw/bin"}); | ||
| const QStringList ciphersArgs(QLatin1String("--show-ciphers")); | ||
| const QStringList versionArgs(QLatin1String("--version")); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,11 +25,7 @@ mkDerivation { | |
| ]; | ||
| patches = [ | ||
| (substituteAll { | ||
| src = ./0001-openvpn-binary-path.patch; | ||
| inherit openvpn; | ||
| }) | ||
| ]; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,46 +14,46 @@ diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/start | |
| index c3e77d4..88cb0e9 100644 | ||
| --- a/startkde/plasma-session/startup.cpp | ||
| +++ b/startkde/plasma-session/startup.cpp | ||
| @@ -203,7 +203,7 @@ Startup::Startup(QObject *parent) | ||
| const AutoStart autostart; | ||
|
|
||
| // 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 | ||
| index 4fbfe18..6ba916c 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"; | ||
|
|
||
| // 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"; | ||
|
|
||
| diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp | ||
| index 4ddf9f8..e0e59cd 100644 | ||
| --- a/startkde/startplasma-x11.cpp | ||
| +++ b/startkde/startplasma-x11.cpp | ||
| @@ -90,7 +90,7 @@ int main(int argc, char **argv) | ||
| out << "startkde: Shutting down...\n"; | ||
|
|
||
| // Keep for KF5; remove in KF6 (KInit will be gone then) | ||
| - runSync(QStringLiteral("kdeinit5_shutdown"), {}); | ||
| + runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); | ||
|
|
||
| cleanupPlasmaEnvironment(oldSystemdEnvironment); | ||
|
|
||
| diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp | ||
| index 9809197..1250e3e 100644 | ||
| --- a/startkde/startplasma.cpp | ||
| +++ b/startkde/startplasma.cpp | ||
| @@ -34,7 +34,7 @@ QTextStream out(stderr); | ||
| void messageBox(const QString &text) | ||
| { | ||
| out << text; | ||
|
|
@@ -62,38 +62,16 @@ index 9809197..1250e3e 100644 | |
| } | ||
|
|
||
| QStringList allServices(const QLatin1String &prefix) | ||
| @@ -335,7 +335,7 @@ void setupX11() | ||
| // If the user has overwritten fonts, the cursor font may be different now | ||
| // so don't move this up. | ||
|
|
||
| - runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); | ||
| + runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); | ||
| } | ||
|
|
||
| void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment) | ||
| @@ -398,7 +398,7 @@ void setupFontDpi() | ||
| // TODO port to c++? | ||
| const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); | ||
| QProcess p; | ||
|
|
@@ -102,7 +80,7 @@ index 9809197..1250e3e 100644 | |
| p.setProcessChannelMode(QProcess::ForwardedChannels); | ||
| p.write(input); | ||
| p.closeWriteChannel(); | ||
| @@ -420,7 +420,7 @@ QProcess *setupKSplash() | ||
| KConfigGroup ksplashCfg = cfg.group("KSplash"); | ||
| if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { | ||
| p = new QProcess; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.