mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
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.
This commit is contained in:
parent
5e46b563c8
commit
9d3965edca
2 changed files with 197 additions and 173 deletions
File diff suppressed because it is too large
Load diff
|
@ -42,12 +42,12 @@ pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
static void secondary_child_handler(int)
|
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")) {
|
if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
|
||||||
const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]);
|
for (const char *extra_lib : extra_libs) {
|
||||||
for (int i = 0; i < extrasCount; i++) {
|
- const QString extra = findSharedLib(QString::fromLatin1(extra_lib));
|
||||||
- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i]));
|
+ const QString extra = QString::fromLatin1(extra_lib);
|
||||||
+ const QString extra = QString::fromLatin1(extra_libs[i]);
|
|
||||||
if (!extra.isEmpty()) {
|
if (!extra.isEmpty()) {
|
||||||
QLibrary l(extra);
|
QLibrary l(extra);
|
||||||
l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
|
l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
|
||||||
|
|
Loading…
Reference in a new issue