1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00

kde-applications: 18.08.1 -> 18.12.0

This commit is contained in:
Bastian Köcher 2018-12-03 14:01:40 +01:00
parent 3aa02943ff
commit 70f0f3e7c4
8 changed files with 886 additions and 893 deletions

View file

@ -1,8 +1,8 @@
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 2e9f1acf4..ecc80afdc 100644 index d85c1a79b..8df02710c 100644
--- a/src/akonadicontrol/agentmanager.cpp --- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp +++ b/src/akonadicontrol/agentmanager.cpp
@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) @@ -78,12 +78,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
mStorageController = new Akonadi::ProcessControl; mStorageController = new Akonadi::ProcessControl;
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld 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); connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
@ -15,8 +15,8 @@ index 2e9f1acf4..ecc80afdc 100644
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
} }
}
#ifndef QT_NO_DEBUG
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index be1cc4afb..6d0c1d7e5 100644 index be1cc4afb..6d0c1d7e5 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp --- a/src/akonadicontrol/agentprocessinstance.cpp
@ -31,7 +31,7 @@ index be1cc4afb..6d0c1d7e5 100644
} }
return true; return true;
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index a32e86602..48ea4e52e 100644 index 8b057b459..3fa4548ad 100644
--- a/src/server/storage/dbconfigmysql.cpp --- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp
@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) @@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings)
@ -121,7 +121,7 @@ index a32e86602..48ea4e52e 100644
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) { if (globalConfig.isEmpty()) {
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
index 60e6272f2..ad7cefbfe 100644 index 6b50ae50e..f94a8c5eb 100644
--- a/src/server/storage/dbconfigpostgresql.cpp --- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp +++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) @@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
@ -132,7 +132,7 @@ index 60e6272f2..ad7cefbfe 100644
QString defaultInitDbPath; QString defaultInitDbPath;
QString defaultPgData; QString defaultPgData;
@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) @@ -70,35 +69,7 @@ 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) {
@ -144,7 +144,8 @@ index 60e6272f2..ad7cefbfe 100644
- postgresSearchPath << QStringLiteral(POSTGRES_PATH); - postgresSearchPath << QStringLiteral(POSTGRES_PATH);
- } - }
-#endif -#endif
- postgresSearchPath << QStringLiteral("/usr/sbin") - postgresSearchPath << QStringLiteral("/usr/bin")
- << QStringLiteral("/usr/sbin")
- << QStringLiteral("/usr/local/sbin"); - << QStringLiteral("/usr/local/sbin");
- // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed - // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
- // sorted order, so we search from the newest one to the oldest. - // sorted order, so we search from the newest one to the oldest.
@ -168,7 +169,7 @@ index 60e6272f2..ad7cefbfe 100644
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
} }
@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) @@ -118,10 +89,7 @@ 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();
@ -180,7 +181,7 @@ index 60e6272f2..ad7cefbfe 100644
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
if (mInternalServer && mInitDbPath.isEmpty()) { if (mInternalServer && mInitDbPath.isEmpty()) {
@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) @@ -142,7 +110,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);

View file

@ -165,7 +165,6 @@ let
pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
print-manager = callPackage ./print-manager.nix {}; print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {}; spectacle = callPackage ./spectacle.nix {};
syndication = callPackage ./syndication.nix {};
# Okteta was removed from kde applications and will now be released independently # Okteta was removed from kde applications and will now be released independently
# Lets keep an alias for compatibility reasons # Lets keep an alias for compatibility reasons
inherit okteta; inherit okteta;

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/18.08.1/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/applications/18.12.0/ -A '*.tar.xz' )

View file

@ -5,7 +5,7 @@
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
pimcommon, qtwebengine, libkgapi pimcommon, qtwebengine, libkgapi, qtspeech
}: }:
mkDerivation { mkDerivation {
@ -19,7 +19,7 @@ mkDerivation {
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon libkgapi pimcommon libkgapi qtspeech
]; ];
# Attempts to build some files before dependencies have been generated # Attempts to build some files before dependencies have been generated
enableParallelBuilding = false; enableParallelBuilding = false;

View file

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kmime, qtbase, kmime, qtbase, kcodecs
}: }:
mkDerivation { mkDerivation {
@ -11,6 +11,6 @@ mkDerivation {
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kmime qtbase ]; buildInputs = [ kmime qtbase kcodecs ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

View file

@ -2,7 +2,8 @@
mkDerivation, lib, kdepimTeam, mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
qtspeech
}: }:
mkDerivation { mkDerivation {
@ -14,7 +15,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
sonnet syntax-highlighting qttools sonnet syntax-highlighting qttools qtspeech
]; ];
propagatedBuildInputs = [ ktextwidgets ]; propagatedBuildInputs = [ ktextwidgets ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

File diff suppressed because it is too large Load diff

View file

@ -1,16 +0,0 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kio
}:
mkDerivation {
name = "syndication";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [ kio ];
outputs = [ "out" "dev" ];
}