summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/kinit-kdeinit-extra_libs.patch
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-17 19:11:28 +0200
committerMarius Bakke <marius@gnu.org>2020-05-26 22:32:56 +0200
commit9d3965edca29f80667374da45214cc6f22a85be4 (patch)
tree697549c04a6bfa4eead7ae556ff80b631b78189f /gnu/packages/patches/kinit-kdeinit-extra_libs.patch
parent5e46b563c8ca3adf0f04b33de8774b7606994d02 (diff)
gnu: KDE Frameworks: Update to 5.70.
* gnu/packages/patches/kinit-kdeinit-extra_libs.patch: Adjust for upstream changes. * gnu/packages/kde-frameworks.scm (extra-cmake-modules, attica, bluez-qt, breeze-icons, kapidox, karchive, kcalendarcore, kcodecs, kconfig, kcoreaddons, kdbusaddons, kdnssd, kguiaddons, kholidays, ki18n, kidletime, kirigami, kitemmodels, kitemviews, kplotting, ksyntaxhighlighting, kwidgetsaddons, kwindowsystem, modemmanager-qt, networkmanager-qt, oxygen-icons, prison, qqc2-desktop-style, solid, sonnet, threadweaver, kactivities, kauth, kcompletion, kcontacts, kcrash, kdoctools, kfilemetadata, kimageformats, kjobwidgets, knotifications, kpackage, kpty, kunitconversion, syndication, baloo, kactivities-stats, kbookmarks, kcmutils, kconfigwidgets, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kemoticons, kglobalaccel, kiconthemes, kinit, knewstuff, knotifyconfig ,kparts, kpeople, krunner, kservice, ktextwidgets, kwallet, kxmlgui, kxmlrpcclient, purpose, kde-frameworkintegration, kdelibs4support, khtml, kjs, kjsembed, kmediaplayer, kross): Update to 5.70.0. (kwayland)[inputs]: Add QTWAYLAND. (kparts)[arguments]: New field. (kinit)[inputs]: Add KDBUSADDONS. (kcmutils)[inputs]: Add KGUIADDONS. (krunner)[native-inputs]: Add DBUS. [arguments]: Run tests with "dbus-launch". (baloo)[arguments]: Remove broken test substitution. Disable one other test. (ktexteditor, plasma-framework): Update to 5.70.1. (kio): Likewise. [inputs]: Move KWINDOWSYSTEM ... [propagated-inputs]: ... here.
Diffstat (limited to 'gnu/packages/patches/kinit-kdeinit-extra_libs.patch')
-rw-r--r--gnu/packages/patches/kinit-kdeinit-extra_libs.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch
index c3c4ce1161..1271f3df7d 100644
--- a/gnu/packages/patches/kinit-kdeinit-extra_libs.patch
+++ b/gnu/packages/patches/kinit-kdeinit-extra_libs.patch
@@ -42,12 +42,12 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
extern "C" {
static void secondary_child_handler(int)
-@@ -1689,7 +1693,7 @@
+@@ -1673,7 +1673,7 @@
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)
if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
- const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]);
- for (int i = 0; i < extrasCount; i++) {
-- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i]));
-+ const QString extra = QString::fromLatin1(extra_libs[i]);
+ for (const char *extra_lib : extra_libs) {
+- const QString extra = findSharedLib(QString::fromLatin1(extra_lib));
++ const QString extra = QString::fromLatin1(extra_lib);
if (!extra.isEmpty()) {
QLibrary l(extra);
l.setLoadHints(QLibrary::ExportExternalSymbolsHint);