Merge pull request #91571 from NixOS/u/kde

kde-applications: 19.12.3 -> 20.04.1
This commit is contained in:
Thomas Tuegel 2020-07-14 10:40:48 -05:00 committed by GitHub
commit 7a8bdde4e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 1394 additions and 1334 deletions

View File

@ -1,27 +1,42 @@
Index: akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp From 90969b9b36400d47b1afe761fb8468c1acb8a04a Mon Sep 17 00:00:00 2001
=================================================================== From: Thomas Tuegel <ttuegel@mailbox.org>
--- akonadi-19.08.0.orig/src/akonadicontrol/agentmanager.cpp Date: Mon, 13 Jul 2020 11:41:19 -0500
+++ akonadi-19.08.0/src/akonadicontrol/agentmanager.cpp Subject: [PATCH 1/3] akonadi paths
@@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose,
mStorageController = new Akonadi::ProcessControl;
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
if (mAgentServerEnabled) { ---
mAgentServer = new Akonadi::ProcessControl; src/akonadicontrol/agentmanager.cpp | 4 ++--
connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); src/akonadicontrol/agentprocessinstance.cpp | 2 +-
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); src/server/storage/dbconfigmysql.cpp | 26 ++++-----------------
+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); src/server/storage/dbconfigpostgresql.cpp | 19 +++------------
4 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 23b4a1f..c13b658 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -61,7 +61,7 @@ public:
[]() {
QCoreApplication::instance()->exit(255);
});
- start(QStringLiteral("akonadiserver"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadiserver"), args, RestartOnCrash);
} }
}
Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp ~StorageProcessControl() override
=================================================================== @@ -84,7 +84,7 @@ public:
--- akonadi-19.08.0.orig/src/akonadicontrol/agentprocessinstance.cpp []() {
+++ akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp qCCritical(AKONADICONTROL_LOG) << "Failed to start AgentServer!";
@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A });
- start(QStringLiteral("akonadi_agent_server"), args, RestartOnCrash);
+ start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), args, RestartOnCrash);
}
~AgentServerProcessControl() override
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index 4e58f7e..e8bb532 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
} else { } else {
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier(); const QStringList arguments = QStringList() << executable << identifier();
@ -30,11 +45,11 @@ Index: akonadi-19.08.0/src/akonadicontrol/agentprocessinstance.cpp
mController->start(agentLauncherExec, arguments); mController->start(agentLauncherExec, arguments);
} }
return true; return true;
Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
=================================================================== index cac40f5..527649b 100644
--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp
+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp
@@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &sett @@ -83,7 +83,6 @@ bool DbConfigMysql::init(QSettings &settings)
// determine default settings depending on the driver // determine default settings depending on the driver
QString defaultHostName; QString defaultHostName;
QString defaultOptions; QString defaultOptions;
@ -42,7 +57,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
QString defaultCleanShutdownCommand; QString defaultCleanShutdownCommand;
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
@@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &sett @@ -92,16 +91,7 @@ bool DbConfigMysql::init(QSettings &settings)
#endif #endif
const bool defaultInternalServer = true; const bool defaultInternalServer = true;
@ -60,7 +75,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
if (!mysqladminPath.isEmpty()) { if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown") defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/%4 shutdown")
@@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &sett @@ -111,10 +101,10 @@ bool DbConfigMysql::init(QSettings &settings)
#endif #endif
} }
@ -73,7 +88,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &sett @@ -131,7 +121,7 @@ bool DbConfigMysql::init(QSettings &settings)
mUserName = settings.value(QStringLiteral("User")).toString(); mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -82,7 +97,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup(); settings.endGroup();
@@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &sett @@ -141,9 +131,6 @@ bool DbConfigMysql::init(QSettings &settings)
// intentionally not namespaced as we are the only one in this db instance when using internal mode // intentionally not namespaced as we are the only one in this db instance when using internal mode
mDatabaseName = QStringLiteral("akonadi"); mDatabaseName = QStringLiteral("akonadi");
} }
@ -92,7 +107,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
@@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &sett @@ -152,9 +139,6 @@ bool DbConfigMysql::init(QSettings &settings)
settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Name"), mDatabaseName);
settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Host"), mHostName);
settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -102,7 +117,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer( @@ -209,7 +193,7 @@ bool DbConfigMysql::startInternalServer()
#endif #endif
// generate config file // generate config file
@ -111,11 +126,11 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) { if (globalConfig.isEmpty()) {
Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
=================================================================== index 09cdbd5..1c8996b 100644
--- akonadi-19.08.0.orig/src/server/storage/dbconfigpostgresql.cpp --- a/src/server/storage/dbconfigpostgresql.cpp
+++ akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp +++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -140,9 +140,7 @@ bool DbConfigPostgresql::init(QSettings @@ -141,9 +141,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
// determine default settings depending on the driver // determine default settings depending on the driver
QString defaultHostName; QString defaultHostName;
QString defaultOptions; QString defaultOptions;
@ -125,7 +140,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
QString defaultPgData; QString defaultPgData;
#ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows #ifndef Q_WS_WIN // We assume that PostgreSQL is running as service on Windows
@@ -153,12 +151,8 @@ bool DbConfigPostgresql::init(QSettings @@ -154,12 +152,8 @@ bool DbConfigPostgresql::init(QSettings &settings)
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
if (mInternalServer) { if (mInternalServer) {
@ -139,7 +154,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
} }
@@ -177,20 +171,14 @@ bool DbConfigPostgresql::init(QSettings @@ -178,20 +172,14 @@ bool DbConfigPostgresql::init(QSettings &settings)
mUserName = settings.value(QStringLiteral("User")).toString(); mUserName = settings.value(QStringLiteral("User")).toString();
mPassword = settings.value(QStringLiteral("Password")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@ -162,7 +177,7 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath; qCDebug(AKONADISERVER_LOG) << "Found pg_upgrade:" << mPgUpgradePath;
mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString(); mPgData = settings.value(QStringLiteral("PgData"), defaultPgData).toString();
if (mPgData.isEmpty()) { if (mPgData.isEmpty()) {
@@ -206,7 +194,6 @@ bool DbConfigPostgresql::init(QSettings @@ -207,7 +195,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
settings.setValue(QStringLiteral("Port"), mHostPort); settings.setValue(QStringLiteral("Port"), mHostPort);
} }
settings.setValue(QStringLiteral("Options"), mConnectionOptions); settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@ -170,3 +185,6 @@ Index: akonadi-19.08.0/src/server/storage/dbconfigpostgresql.cpp
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.setValue(QStringLiteral("StartServer"), mInternalServer);
settings.endGroup(); settings.endGroup();
--
2.25.4

View File

@ -0,0 +1,26 @@
From b8c6a2a017321649db8fec553a644b8da2300514 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:41:35 -0500
Subject: [PATCH 2/3] akonadi timestamps
---
src/server/storage/dbconfigmysql.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 527649b..08c3dd4 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer()
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
+ if (true) {
QFile globalFile(globalConfig);
QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
--
2.25.4

View File

@ -1,19 +1,18 @@
From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 22 Dec 2017 17:36:03 +0300 Date: Mon, 13 Jul 2020 11:41:55 -0500
Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" Subject: [PATCH 3/3] akonadi revert make relocatable
This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
--- ---
CMakeLists.txt | 3 --- CMakeLists.txt | 3 ---
KF5AkonadiConfig.cmake.in | 6 +++--- KF5AkonadiConfig.cmake.in | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-) 2 files changed, 3 insertions(+), 6 deletions(-)
Index: akonadi-19.08.0/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
=================================================================== index d927471..83a74c0 100644
--- akonadi-19.08.0.orig/CMakeLists.txt --- a/CMakeLists.txt
+++ akonadi-19.08.0/CMakeLists.txt +++ b/CMakeLists.txt
@@ -306,9 +306,6 @@ configure_package_config_file( @@ -330,9 +330,6 @@ configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
@ -23,11 +22,11 @@ Index: akonadi-19.08.0/CMakeLists.txt
) )
install(FILES install(FILES
Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
=================================================================== index 421e1df..e3abf27 100644
--- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in --- a/KF5AkonadiConfig.cmake.in
+++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in +++ b/KF5AkonadiConfig.cmake.in
@@ -26,8 +26,8 @@ if(BUILD_TESTING) @@ -24,8 +24,8 @@ if(BUILD_TESTING)
find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
endif() endif()
@ -38,7 +37,7 @@ Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
find_dependency(Boost "@Boost_MINIMUM_VERSION@") find_dependency(Boost "@Boost_MINIMUM_VERSION@")
@@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako @@ -33,7 +33,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
@ -47,3 +46,6 @@ Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in
#################################################################################### ####################################################################################
# CMAKE_AUTOMOC # CMAKE_AUTOMOC
--
2.25.4

View File

@ -1,14 +0,0 @@
Index: akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
===================================================================
--- akonadi-19.08.0.orig/src/server/storage/dbconfigmysql.cpp
+++ akonadi-19.08.0/src/server/storage/dbconfigmysql.cpp
@@ -235,8 +235,7 @@ bool DbConfigMysql::startInternalServer(
bool confUpdate = false;
QFile actualFile(actualConfig);
// update conf only if either global (or local) is newer than actual
- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
- (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) {
+ if (true) {
QFile globalFile(globalConfig);
QFile localFile(localConfig);
if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {

View File

@ -11,7 +11,11 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = [
./0001-akonadi-paths.patch
./0002-akonadi-timestamps.patch
./0003-akonadi-revert-make-relocatable.patch
];
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ buildInputs = [
kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n

View File

@ -1,3 +0,0 @@
akonadi-paths.patch
akonadi-timestamps.patch
0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch

View File

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.3/src ) WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.1/src)

View File

@ -9,14 +9,6 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ]; license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };
patches = [
# Fix a bug with thumbnail.so processes hanging:
# https://bugs.kde.org/show_bug.cgi?id=404652
(fetchpatch {
url = "https://github.com/KDE/kdegraphics-thumbnailers/commit/3e2ea6e924d0e2a2cdd9bb435b06965117d6d34c.patch";
sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1";
})
];
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kio libkexiv2 libkdcraw ]; buildInputs = [ karchive kio libkexiv2 libkdcraw ];
} }

View File

@ -25,7 +25,7 @@
, frei0r , frei0r
, phonon-backend-gstreamer , phonon-backend-gstreamer
, qtdeclarative , qtdeclarative
, qtquickcontrols , qtquickcontrols2
, qtscript , qtscript
, qtwebkit , qtwebkit
, rttr , rttr
@ -60,7 +60,7 @@ mkDerivation {
mlt mlt
phonon-backend-gstreamer phonon-backend-gstreamer
qtdeclarative qtdeclarative
qtquickcontrols qtquickcontrols2
qtscript qtscript
qtwebkit qtwebkit
shared-mime-info shared-mime-info

View File

@ -1,9 +1,9 @@
{ {
mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,
exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio,
kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr, ilmbase, khtml, kdelibs4support, kpty, syntax-highlighting, libmtp, libssh, openexr,
openslp, phonon, qtsvg, samba, solid, gperf ilmbase, openslp, phonon, qtsvg, samba, solid, gperf
}: }:
mkDerivation { mkDerivation {
@ -15,9 +15,9 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [ buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml
kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba kdelibs4support kpty syntax-highlighting libmtp libssh openexr openslp
solid gperf phonon qtsvg samba solid gperf
]; ];
CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ];
} }

View File

@ -5,7 +5,7 @@
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
pimcommon, qtwebengine, qtwebkit, syntax-highlighting pimcommon, qca-qt5, qtwebengine, qtwebkit, syntax-highlighting
}: }:
mkDerivation { mkDerivation {
@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [ buildInputs = [
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qca-qt5 qtwebkit
syntax-highlighting syntax-highlighting
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -17,8 +17,8 @@ mkDerivation {
knewstuff kwayland knewstuff kwayland
]; ];
postPatch = '' postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop \ substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
--replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
''; '';
propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
} }

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.68/ ) WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/)

View File

@ -1,8 +1,17 @@
From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:23:36 -0500
Subject: [PATCH] kcmutils follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index 137c865..097ab75 100644 index 46deef5..2eacb9f 100644
--- a/src/kpluginselector.cpp --- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp +++ b/src/kpluginselector.cpp
@@ -303,7 +303,7 @@ void KPluginSelector::addPlugins(const QString &componentName, @@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames; QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
for (const QString &dir : dirs) { for (const QString &dir : dirs) {
@ -11,3 +20,6 @@ index 137c865..097ab75 100644
while (it.hasNext()) { while (it.hasNext()) {
desktopFileNames.append(it.next()); desktopFileNames.append(it.next());
} }
--
2.25.4

View File

@ -14,5 +14,7 @@ mkDerivation {
qtdeclarative qtdeclarative
]; ];
propagatedBuildInputs = [ kconfigwidgets kservice ]; propagatedBuildInputs = [ kconfigwidgets kservice ];
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); patches = [
./0001-kcmutils-follow-symlinks.patch
];
} }

View File

@ -1,13 +0,0 @@
Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
KPluginFactory* factory = loader.factory();
if (!factory) {
- qWarning() << "Couldn't load plugin:" << loader.errorString();
+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
} else {
std::unique_ptr<KQuickAddons::ConfigModule> cm(factory->create<KQuickAddons::ConfigModule>(nullptr, args2));
if (!cm) {

View File

@ -1,2 +0,0 @@
kcmutils-follow-symlinks.patch
kcmutils-debug-module-loader.patch

View File

@ -1,28 +1,14 @@
Index: kio-5.17.0/src/core/ksambashare.cpp diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
=================================================================== index 1895783..9fe7286 100644
--- kio-5.17.0.orig/src/core/ksambashare.cpp --- a/src/core/ksambashare.cpp
+++ kio-5.17.0/src/core/ksambashare.cpp +++ b/src/core/ksambashare.cpp
@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( @@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
bool KSambaSharePrivate::isSambaInstalled() bool KSambaSharePrivate::isSambaInstalled()
{ {
- if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) const bool daemonExists =
- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { - !QStandardPaths::findExecutable(QStringLiteral("smbd"),
- return true; - {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
+ const QByteArray pathEnv = qgetenv("PATH"); + !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
+ if (!pathEnv.isEmpty()) { if (!daemonExists) {
+ QLatin1Char pathSep(':'); qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
+ QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
+ for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
+ it->append(QStringLiteral("/smbd"));
+ if (QFile::exists(*it)) {
+ return true;
+ }
+ }
} }
- //qDebug() << "Samba is not installed!";
-
return false;
}

View File

@ -2,7 +2,7 @@
mkDerivation, lib, fetchpatch, mkDerivation, lib, fetchpatch,
extra-cmake-modules, extra-cmake-modules,
attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
qtdeclarative, kirigami2, qtdeclarative, kirigami2,
}: }:
@ -12,6 +12,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
kpackage
ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2
]; ];
propagatedBuildInputs = [ attica kservice kxmlgui ]; propagatedBuildInputs = [ attica kservice kxmlgui ];

View File

@ -4,659 +4,659 @@
{ {
attica = { attica = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/attica-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz";
sha256 = "9b4001a32831c9bae1d44161247acd5e6d3048ca2ece98c2c756c72a1464b9e9"; sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d";
name = "attica-5.68.0.tar.xz"; name = "attica-5.71.0.tar.xz";
}; };
}; };
baloo = { baloo = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/baloo-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz";
sha256 = "4b599fb279ef92dc4f575847767c370f2633b27e884e372c3f7b92f08917865e"; sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b";
name = "baloo-5.68.0.tar.xz"; name = "baloo-5.71.0.tar.xz";
}; };
}; };
bluez-qt = { bluez-qt = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/bluez-qt-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz";
sha256 = "99889cac874820e83a32bee938b6cc8e25dca6a3013d4a589ac7b8f5d32b4224"; sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad";
name = "bluez-qt-5.68.0.tar.xz"; name = "bluez-qt-5.71.0.tar.xz";
}; };
}; };
breeze-icons = { breeze-icons = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/breeze-icons-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz";
sha256 = "750fff6560abfa85a2243187d14f1b8f1d3d1c4097d84cbf8c58d2f48102fe8d"; sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155";
name = "breeze-icons-5.68.0.tar.xz"; name = "breeze-icons-5.71.0.tar.xz";
}; };
}; };
extra-cmake-modules = { extra-cmake-modules = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/extra-cmake-modules-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz";
sha256 = "4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e"; sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878";
name = "extra-cmake-modules-5.68.0.tar.xz"; name = "extra-cmake-modules-5.71.0.tar.xz";
}; };
}; };
frameworkintegration = { frameworkintegration = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/frameworkintegration-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz";
sha256 = "5bb3c2e56b2c4c41d8a472363f80445fd3fc28656e6a3163d48ed826a133985a"; sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961";
name = "frameworkintegration-5.68.0.tar.xz"; name = "frameworkintegration-5.71.0.tar.xz";
}; };
}; };
kactivities = { kactivities = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kactivities-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz";
sha256 = "1853135feb6adfec252e6fab0b1472450422afd5998a9a31d942e8672fbe7111"; sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f";
name = "kactivities-5.68.0.tar.xz"; name = "kactivities-5.71.0.tar.xz";
}; };
}; };
kactivities-stats = { kactivities-stats = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kactivities-stats-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz";
sha256 = "fb645db4685113dfd98834f48d8941529fee53d5e26ec5e36cfee8a9bfae97ae"; sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978";
name = "kactivities-stats-5.68.0.tar.xz"; name = "kactivities-stats-5.71.0.tar.xz";
}; };
}; };
kapidox = { kapidox = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kapidox-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz";
sha256 = "4f60582cb0771c38733989f192694636b1c93ecae290bfbe551030dd397e976e"; sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5";
name = "kapidox-5.68.0.tar.xz"; name = "kapidox-5.71.0.tar.xz";
}; };
}; };
karchive = { karchive = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/karchive-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz";
sha256 = "518f07629d87e5778e1d8ce066f5590941472d9fffa7bd74819759be5c6edf0d"; sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624";
name = "karchive-5.68.0.tar.xz"; name = "karchive-5.71.0.tar.xz";
}; };
}; };
kauth = { kauth = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kauth-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz";
sha256 = "b9a7cd724709ea188852f7656fbeda2dc3cc40cc5d09573049c2680c0edbd41f"; sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5";
name = "kauth-5.68.0.tar.xz"; name = "kauth-5.71.0.tar.xz";
}; };
}; };
kbookmarks = { kbookmarks = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kbookmarks-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz";
sha256 = "80dc06188a5e1d960d46f527bd82d9b79df75a785164fa29a088a7b705abbf84"; sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a";
name = "kbookmarks-5.68.0.tar.xz"; name = "kbookmarks-5.71.0.tar.xz";
}; };
}; };
kcalendarcore = { kcalendarcore = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcalendarcore-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz";
sha256 = "50ffbe4feb9a602c09e130d6f10f0f260fa7625bc266003697895e1d716d6ba9"; sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94";
name = "kcalendarcore-5.68.0.tar.xz"; name = "kcalendarcore-5.71.0.tar.xz";
}; };
}; };
kcmutils = { kcmutils = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcmutils-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz";
sha256 = "a688d54286fe11b23e11e2100536a513a332d2a7d784fcbebeaccbfb980d83d1"; sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d";
name = "kcmutils-5.68.0.tar.xz"; name = "kcmutils-5.71.0.tar.xz";
}; };
}; };
kcodecs = { kcodecs = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcodecs-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz";
sha256 = "5f1e6ae3a51ca817aa0a5082ce4ce5490cb527388ef1888a642fb374c5e2bb48"; sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28";
name = "kcodecs-5.68.0.tar.xz"; name = "kcodecs-5.71.0.tar.xz";
}; };
}; };
kcompletion = { kcompletion = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcompletion-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz";
sha256 = "642d68b4c472e11a8861a61238297633be288bfd72c13547707754f1ae2be33a"; sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4";
name = "kcompletion-5.68.0.tar.xz"; name = "kcompletion-5.71.0.tar.xz";
}; };
}; };
kconfig = { kconfig = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kconfig-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz";
sha256 = "c3bf138a7a4d002475f2483987baf40a61cda7d491c3cc292dd2c6da726ee898"; sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4";
name = "kconfig-5.68.0.tar.xz"; name = "kconfig-5.71.0.tar.xz";
}; };
}; };
kconfigwidgets = { kconfigwidgets = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kconfigwidgets-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz";
sha256 = "f50421e9dbb6669e8d7c10605f7779ad03f30ea7c9c4451a70a7be66cd9df995"; sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f";
name = "kconfigwidgets-5.68.0.tar.xz"; name = "kconfigwidgets-5.71.0.tar.xz";
}; };
}; };
kcontacts = { kcontacts = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcontacts-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz";
sha256 = "532f1e89c7412e971db8c431d627d38144470ddf5c978a7fa9348e418b6cd3c3"; sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd";
name = "kcontacts-5.68.0.tar.xz"; name = "kcontacts-5.71.0.tar.xz";
}; };
}; };
kcoreaddons = { kcoreaddons = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcoreaddons-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz";
sha256 = "c578ae30b4161e45e672d613d2d9c5575a849d21909d9817f90a441044df65d7"; sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b";
name = "kcoreaddons-5.68.0.tar.xz"; name = "kcoreaddons-5.71.0.tar.xz";
}; };
}; };
kcrash = { kcrash = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kcrash-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz";
sha256 = "60daf2cee87c652619b098b688edce6f993c7960783159cd8be9d9145df29f7f"; sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005";
name = "kcrash-5.68.0.tar.xz"; name = "kcrash-5.71.0.tar.xz";
}; };
}; };
kdbusaddons = { kdbusaddons = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kdbusaddons-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz";
sha256 = "839fe42f9ac8df353f87245110fd7b515a8eb29f0840f54481bd89e5175bf1af"; sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c";
name = "kdbusaddons-5.68.0.tar.xz"; name = "kdbusaddons-5.71.0.tar.xz";
}; };
}; };
kdeclarative = { kdeclarative = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kdeclarative-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz";
sha256 = "96a032bcb360e0ffcfe51d4d2f6153786682c2f967592bffcf15b9e6cd4cd3ae"; sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8";
name = "kdeclarative-5.68.0.tar.xz"; name = "kdeclarative-5.71.0.tar.xz";
}; };
}; };
kded = { kded = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kded-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz";
sha256 = "b03afe48fbdbd7d92c46b3b60bdb4b825f77e1a9d00c16a5f236b24a0135e4b7"; sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc";
name = "kded-5.68.0.tar.xz"; name = "kded-5.71.0.tar.xz";
}; };
}; };
kdelibs4support = { kdelibs4support = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kdelibs4support-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz";
sha256 = "2fca7bf9d31b081e7568631b6b6d2f7847068217261e47ef0dea106470c22df1"; sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7";
name = "kdelibs4support-5.68.0.tar.xz"; name = "kdelibs4support-5.71.0.tar.xz";
}; };
}; };
kdesignerplugin = { kdesignerplugin = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kdesignerplugin-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz";
sha256 = "ae433e0eeaf0007312b1f32fc4349cf26c34617a5a9951ae4155c5c4e4009b72"; sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b";
name = "kdesignerplugin-5.68.0.tar.xz"; name = "kdesignerplugin-5.71.0.tar.xz";
}; };
}; };
kdesu = { kdesu = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kdesu-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz";
sha256 = "427ba50bcd14308980cbdfdc77a6b7419277942a42d83da72ff3afbc1ec78903"; sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a";
name = "kdesu-5.68.0.tar.xz"; name = "kdesu-5.71.0.tar.xz";
}; };
}; };
kdewebkit = { kdewebkit = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kdewebkit-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz";
sha256 = "181b14bd80e9f34aa2f896d39aca5be91f65d65bfaaf47660e91fdd98b7f36a2"; sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d";
name = "kdewebkit-5.68.0.tar.xz"; name = "kdewebkit-5.71.0.tar.xz";
}; };
}; };
kdnssd = { kdnssd = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kdnssd-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz";
sha256 = "3369da85c0088c375f2123a82132fb84490c46ebc8e9cd1253c795ef45fd4403"; sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958";
name = "kdnssd-5.68.0.tar.xz"; name = "kdnssd-5.71.0.tar.xz";
}; };
}; };
kdoctools = { kdoctools = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kdoctools-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz";
sha256 = "93f5bee9dfaacacacfbeb3e915b192b5e645c1d01057b0cea4081c9ae5285670"; sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09";
name = "kdoctools-5.68.0.tar.xz"; name = "kdoctools-5.71.0.tar.xz";
}; };
}; };
kemoticons = { kemoticons = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kemoticons-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz";
sha256 = "e03fe81ad34e107dc5fe61f9bf424ecef7716bf8a62f8abb78fd3f6bd6806f56"; sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc";
name = "kemoticons-5.68.0.tar.xz"; name = "kemoticons-5.71.0.tar.xz";
}; };
}; };
kfilemetadata = { kfilemetadata = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kfilemetadata-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz";
sha256 = "c2a8aee8243efa30fc921b7f50b390b47ee2cf83aa83b125a530a25de6d6fe21"; sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe";
name = "kfilemetadata-5.68.0.tar.xz"; name = "kfilemetadata-5.71.0.tar.xz";
}; };
}; };
kglobalaccel = { kglobalaccel = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kglobalaccel-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz";
sha256 = "2eb710a3f29cbc8b7875fb3e8315d7c8e3b5bb93867e0a34cd5cdbac690bcbbf"; sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c";
name = "kglobalaccel-5.68.0.tar.xz"; name = "kglobalaccel-5.71.0.tar.xz";
}; };
}; };
kguiaddons = { kguiaddons = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kguiaddons-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz";
sha256 = "cdbf694e92b47358c2e2c31917bf5f01382042c2cb99b65faf3bc00a0eb52c64"; sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2";
name = "kguiaddons-5.68.0.tar.xz"; name = "kguiaddons-5.71.0.tar.xz";
}; };
}; };
kholidays = { kholidays = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kholidays-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz";
sha256 = "067a544c22f5988cf959a475b66ed62e419b975b3ee22810667a076f3d50dbba"; sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417";
name = "kholidays-5.68.0.tar.xz"; name = "kholidays-5.71.0.tar.xz";
}; };
}; };
khtml = { khtml = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/khtml-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz";
sha256 = "af97da0a5d877c928d98690c3629a8f9788b29b27f583c9e3e26144a6abb9dcc"; sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10";
name = "khtml-5.68.0.tar.xz"; name = "khtml-5.71.0.tar.xz";
}; };
}; };
ki18n = { ki18n = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/ki18n-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz";
sha256 = "2c59dd55d032c95710e338e376a31bf11d799bceba8ebfdb148c8b77067a1e92"; sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881";
name = "ki18n-5.68.0.tar.xz"; name = "ki18n-5.71.0.tar.xz";
}; };
}; };
kiconthemes = { kiconthemes = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kiconthemes-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz";
sha256 = "ac3f322f2644dd0468cd2b07cc0c7f853f1ac4bc714fe532bbe92e88141f6729"; sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496";
name = "kiconthemes-5.68.0.tar.xz"; name = "kiconthemes-5.71.0.tar.xz";
}; };
}; };
kidletime = { kidletime = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kidletime-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz";
sha256 = "cd6309d403ea36553abc99af4fa7e4ed3f8b3b2c55d14887ef09d68e5627b3e7"; sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d";
name = "kidletime-5.68.0.tar.xz"; name = "kidletime-5.71.0.tar.xz";
}; };
}; };
kimageformats = { kimageformats = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kimageformats-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz";
sha256 = "498fab29d19f10f2c91c796134f959b2cf3ce8372087b5eeb62f07e62af85949"; sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94";
name = "kimageformats-5.68.0.tar.xz"; name = "kimageformats-5.71.0.tar.xz";
}; };
}; };
kinit = { kinit = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kinit-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz";
sha256 = "fa136996eaaa7d2adb5a341c2b7a1abe86d8139c6f18999e0b0dc0220e512559"; sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6";
name = "kinit-5.68.0.tar.xz"; name = "kinit-5.71.0.tar.xz";
}; };
}; };
kio = { kio = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kio-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz";
sha256 = "9cc2fb2da84d6661a90eac81eb12c2e37921a5c34cbc1975f48d613e5a9d9eef"; sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6";
name = "kio-5.68.0.tar.xz"; name = "kio-5.71.0.tar.xz";
}; };
}; };
kirigami2 = { kirigami2 = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kirigami2-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz";
sha256 = "ad5f78afc916e9cb26f23918a6eb1983d4a57aa7e4f7314a8c23fb81e0fcaf4b"; sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356";
name = "kirigami2-5.68.0.tar.xz"; name = "kirigami2-5.71.0.tar.xz";
}; };
}; };
kitemmodels = { kitemmodels = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kitemmodels-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz";
sha256 = "4f435db4362832cf63e49896229affd07f125567931fc499751d37ac3bafb149"; sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7";
name = "kitemmodels-5.68.0.tar.xz"; name = "kitemmodels-5.71.0.tar.xz";
}; };
}; };
kitemviews = { kitemviews = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kitemviews-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz";
sha256 = "5196885ac42347d67779df61a03d7f9c54f38053ff91348ef6fdc08439b4742f"; sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de";
name = "kitemviews-5.68.0.tar.xz"; name = "kitemviews-5.71.0.tar.xz";
}; };
}; };
kjobwidgets = { kjobwidgets = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kjobwidgets-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz";
sha256 = "a11ba51ed0ab330f9a921cf0a61e604c27d88c1c2ea477a875bc0a0cd228a292"; sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3";
name = "kjobwidgets-5.68.0.tar.xz"; name = "kjobwidgets-5.71.0.tar.xz";
}; };
}; };
kjs = { kjs = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kjs-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz";
sha256 = "18e3d7c667aec21e9e4d0d4730ad32a10475b7db5a574a674a8b90a6f9e0cd0e"; sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734";
name = "kjs-5.68.0.tar.xz"; name = "kjs-5.71.0.tar.xz";
}; };
}; };
kjsembed = { kjsembed = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kjsembed-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz";
sha256 = "e9b9ac63f06447ffc6870806eb1507f0281281bae907fdbae42ee87a2b926db2"; sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486";
name = "kjsembed-5.68.0.tar.xz"; name = "kjsembed-5.71.0.tar.xz";
}; };
}; };
kmediaplayer = { kmediaplayer = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kmediaplayer-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz";
sha256 = "aa07466ea27b2e042e03d76fe3a23c570ba6521f57a2a51dc0ddf32fc8276db0"; sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca";
name = "kmediaplayer-5.68.0.tar.xz"; name = "kmediaplayer-5.71.0.tar.xz";
}; };
}; };
knewstuff = { knewstuff = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/knewstuff-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz";
sha256 = "f7c13b133f8b87ceece2d33d3f69215912b3b8c1dbb92ac39a1a6a0a42b7c93a"; sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855";
name = "knewstuff-5.68.0.tar.xz"; name = "knewstuff-5.71.0.tar.xz";
}; };
}; };
knotifications = { knotifications = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/knotifications-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz";
sha256 = "646bd3bac073fbf4f19f9047360325c933751d605cf1311f4c922d7457fbda51"; sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440";
name = "knotifications-5.68.0.tar.xz"; name = "knotifications-5.71.0.tar.xz";
}; };
}; };
knotifyconfig = { knotifyconfig = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/knotifyconfig-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz";
sha256 = "36c7c93964f2b9b584d73de1757f75d6ee8bb29ebe860e8fd6905354d2f10145"; sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e";
name = "knotifyconfig-5.68.0.tar.xz"; name = "knotifyconfig-5.71.0.tar.xz";
}; };
}; };
kpackage = { kpackage = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kpackage-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz";
sha256 = "49727d89f1ca7ee504397d6e8b5cd25c26cd0061596b26d8ab2b64e3987d2d16"; sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba";
name = "kpackage-5.68.0.tar.xz"; name = "kpackage-5.71.0.tar.xz";
}; };
}; };
kparts = { kparts = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kparts-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz";
sha256 = "fd17d0b0ff41d66c122530bbd8d1187f3271382207f63237ce72147865bf6d29"; sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90";
name = "kparts-5.68.0.tar.xz"; name = "kparts-5.71.0.tar.xz";
}; };
}; };
kpeople = { kpeople = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kpeople-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz";
sha256 = "1cae86d527d650d9fa311f6007cc33b5dcd858bcfe4eb7cae65b5402205c4675"; sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403";
name = "kpeople-5.68.0.tar.xz"; name = "kpeople-5.71.0.tar.xz";
}; };
}; };
kplotting = { kplotting = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kplotting-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz";
sha256 = "ccae7f90c016a1c517db820f352bb962f600678efdc4ac6b12e33d2c48f5c268"; sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1";
name = "kplotting-5.68.0.tar.xz"; name = "kplotting-5.71.0.tar.xz";
}; };
}; };
kpty = { kpty = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kpty-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz";
sha256 = "35b838cff80311db52d83e1f61bc365277d54929742ee34265f36a12ce7689e3"; sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9";
name = "kpty-5.68.0.tar.xz"; name = "kpty-5.71.0.tar.xz";
}; };
}; };
kquickcharts = { kquickcharts = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kquickcharts-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz";
sha256 = "2cfb78bc2a7659a8c4ca6b072ff586c44e6da64e10b84a0fb0c5e3f03c944628"; sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a";
name = "kquickcharts-5.68.0.tar.xz"; name = "kquickcharts-5.71.0.tar.xz";
}; };
}; };
kross = { kross = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/portingAids/kross-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz";
sha256 = "2f5a79a2097f84bfd2033ca183abdbf6626f6e5dc2c6f781c312f15c97dace33"; sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c";
name = "kross-5.68.0.tar.xz"; name = "kross-5.71.0.tar.xz";
}; };
}; };
krunner = { krunner = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/krunner-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz";
sha256 = "4575ae1d658d32c15f9d57dc30616073e9d143d1a7f9632556906ef10e82e3b8"; sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952";
name = "krunner-5.68.0.tar.xz"; name = "krunner-5.71.0.tar.xz";
}; };
}; };
kservice = { kservice = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kservice-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz";
sha256 = "c774ce1738081c17e6e105e506aa89c22a9db07e73972d4b18ce733ec8ad0a8a"; sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce";
name = "kservice-5.68.0.tar.xz"; name = "kservice-5.71.0.tar.xz";
}; };
}; };
ktexteditor = { ktexteditor = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/ktexteditor-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz";
sha256 = "dad373d4c136d113cca1ee6d700753563b7348813ff3229db670eedc63980cd6"; sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da";
name = "ktexteditor-5.68.0.tar.xz"; name = "ktexteditor-5.71.0.tar.xz";
}; };
}; };
ktextwidgets = { ktextwidgets = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/ktextwidgets-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz";
sha256 = "23b354469afed21c840ca36e2bb5b2b383ed5c4ec3690bb009e273c39fbe00c0"; sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4";
name = "ktextwidgets-5.68.0.tar.xz"; name = "ktextwidgets-5.71.0.tar.xz";
}; };
}; };
kunitconversion = { kunitconversion = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kunitconversion-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz";
sha256 = "39ec06e2439306ce5b5efe5fe972d201e8c8e5fda634652cdc01c58427574adb"; sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb";
name = "kunitconversion-5.68.0.tar.xz"; name = "kunitconversion-5.71.0.tar.xz";
}; };
}; };
kwallet = { kwallet = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kwallet-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz";
sha256 = "7524eeffdde3166df182f0dbf0f3f461905547bfd7a06387c7c503cd1ab75ecf"; sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5";
name = "kwallet-5.68.0.tar.xz"; name = "kwallet-5.71.0.tar.xz";
}; };
}; };
kwayland = { kwayland = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kwayland-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz";
sha256 = "7c99bfac8f4bff457a5384c846be776c385649ced76be0f48699c6e12de24e7c"; sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2";
name = "kwayland-5.68.0.tar.xz"; name = "kwayland-5.71.0.tar.xz";
}; };
}; };
kwidgetsaddons = { kwidgetsaddons = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kwidgetsaddons-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz";
sha256 = "b4ff96b4ec6365e5f9e4da5e651da99be491799a4e6cfd982d0838dda39844ac"; sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e";
name = "kwidgetsaddons-5.68.0.tar.xz"; name = "kwidgetsaddons-5.71.0.tar.xz";
}; };
}; };
kwindowsystem = { kwindowsystem = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kwindowsystem-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz";
sha256 = "859c930a04c2588f792bfb9a28ed40b226db632b15c2851b186301b70d4c825a"; sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda";
name = "kwindowsystem-5.68.0.tar.xz"; name = "kwindowsystem-5.71.0.tar.xz";
}; };
}; };
kxmlgui = { kxmlgui = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kxmlgui-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz";
sha256 = "6310e9a725a982d3b70672367c5858727437fe08c8e409458e48b6015c7bf10e"; sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc";
name = "kxmlgui-5.68.0.tar.xz"; name = "kxmlgui-5.71.0.tar.xz";
}; };
}; };
kxmlrpcclient = { kxmlrpcclient = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/kxmlrpcclient-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz";
sha256 = "e49f2ab649aafb292e01dacefb7b6f28fc596606764bef61e7ce622b67241324"; sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f";
name = "kxmlrpcclient-5.68.0.tar.xz"; name = "kxmlrpcclient-5.71.0.tar.xz";
}; };
}; };
modemmanager-qt = { modemmanager-qt = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/modemmanager-qt-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz";
sha256 = "9c0febf18a04b69e47cffdb4563390a79a4a673da856502cbf50d5c7707670ec"; sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d";
name = "modemmanager-qt-5.68.0.tar.xz"; name = "modemmanager-qt-5.71.0.tar.xz";
}; };
}; };
networkmanager-qt = { networkmanager-qt = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/networkmanager-qt-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz";
sha256 = "6a9bea5e6d58f5322848114e4e827edadee6b5a890a3549446ff23a568325e2c"; sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034";
name = "networkmanager-qt-5.68.0.tar.xz"; name = "networkmanager-qt-5.71.0.tar.xz";
}; };
}; };
oxygen-icons5 = { oxygen-icons5 = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/oxygen-icons5-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz";
sha256 = "75a8113e567d8cbba57bda3c8829d116d58ebf6bc5ace88aed7700b28a00c463"; sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04";
name = "oxygen-icons5-5.68.0.tar.xz"; name = "oxygen-icons5-5.71.0.tar.xz";
}; };
}; };
plasma-framework = { plasma-framework = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/plasma-framework-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz";
sha256 = "d27c7a62231784ecad1246f8a81b02fd6db2e9818244a06650fd6c972a69ea74"; sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067";
name = "plasma-framework-5.68.0.tar.xz"; name = "plasma-framework-5.71.0.tar.xz";
}; };
}; };
prison = { prison = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/prison-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz";
sha256 = "22e2b8e9ca06e4fb7ab91afeddbaebe6e2b6792bbcd5ba6c440c6fad0df176b7"; sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f";
name = "prison-5.68.0.tar.xz"; name = "prison-5.71.0.tar.xz";
}; };
}; };
purpose = { purpose = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/purpose-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz";
sha256 = "c8c8f8244b568e52b4c02b89b71611bb8ba7cd07173645caa022b4bd90b41ab0"; sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be";
name = "purpose-5.68.0.tar.xz"; name = "purpose-5.71.0.tar.xz";
}; };
}; };
qqc2-desktop-style = { qqc2-desktop-style = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/qqc2-desktop-style-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz";
sha256 = "0f522861e5757de6a1205c86a2e5f8d2a7375c96eac1ece95d03a35858dc7b03"; sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700";
name = "qqc2-desktop-style-5.68.0.tar.xz"; name = "qqc2-desktop-style-5.71.0.tar.xz";
}; };
}; };
solid = { solid = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/solid-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz";
sha256 = "472c1934b3c9cf917f28ac0e5b0864de442b96852744c301d88d8ab7269d74c3"; sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b";
name = "solid-5.68.0.tar.xz"; name = "solid-5.71.0.tar.xz";
}; };
}; };
sonnet = { sonnet = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/sonnet-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz";
sha256 = "079c4f5fcb9fe670e1242b18648e178aaa01eb81dbdfc881805eea1ec585bd67"; sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72";
name = "sonnet-5.68.0.tar.xz"; name = "sonnet-5.71.0.tar.xz";
}; };
}; };
syndication = { syndication = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/syndication-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz";
sha256 = "0715fc1b7312b5081521b781d0878d88cc70dcb77272ee173cecca03cc221fd3"; sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0";
name = "syndication-5.68.0.tar.xz"; name = "syndication-5.71.0.tar.xz";
}; };
}; };
syntax-highlighting = { syntax-highlighting = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/syntax-highlighting-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz";
sha256 = "a857c743aa60b21eea7e4b986e8b195882aa2c18358412e767e68d93ce35e134"; sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84";
name = "syntax-highlighting-5.68.0.tar.xz"; name = "syntax-highlighting-5.71.0.tar.xz";
}; };
}; };
threadweaver = { threadweaver = {
version = "5.68.0"; version = "5.71.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.68/threadweaver-5.68.0.tar.xz"; url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz";
sha256 = "e28c0bfff375b3e1e9e4eec72f0a804f3f41c4ec5fd59af9b951708d229eff64"; sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d";
name = "threadweaver-5.68.0.tar.xz"; name = "threadweaver-5.71.0.tar.xz";
}; };
}; };
} }

View File

@ -0,0 +1,39 @@
{ mkDerivation, lib, fetchurl
, cmake
, qtbase
}:
let
version = "1.9.0";
in
mkDerivation {
pname = "kdsoap";
inherit version;
meta = {
description = "A Qt-based client-side and server-side SOAP component";
longDescription = ''
KD Soap is a Qt-based client-side and server-side SOAP component.
It can be used to create client applications for web services and also
provides the means to create web services without the need for any further
component such as a dedicated web server.
'';
license = with lib.licenses; [ gpl2 gpl3 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
src = fetchurl {
url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
sha256 = "0a28k48cmagqxhaayyrqnxsx1zbvw4f06dgs16kl33xhbinn5fg3";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
postInstall = ''
moveToOutput bin/kdwsdl2cpp "$dev"
sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \
-e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\""
sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \
-e "s@$out/bin@$dev/bin@"
'';
}

View File

@ -14493,6 +14493,8 @@ in
kdiagram = callPackage ../development/libraries/kdiagram { }; kdiagram = callPackage ../development/libraries/kdiagram { };
kdsoap = callPackage ../development/libraries/kdsoap { };
kproperty = callPackage ../development/libraries/kproperty { }; kproperty = callPackage ../development/libraries/kproperty { };
kreport = callPackage ../development/libraries/kreport { }; kreport = callPackage ../development/libraries/kreport { };