kdeApplications: adapt deps and patches to new version

+6 -42
-11
pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
··· 44 44 loader->setTheme(dirName); 45 45 46 46 if (!sEngine) { 47 - @@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons 48 - Grantlee::Context ctx = createContext(); 49 - ctx.insert(QStringLiteral("error"), reason); 50 - ctx.insert(QStringLiteral("templateName"), origTemplateName); 51 - - const QString errorString = failedTemplate 52 - - ? failedTemplate->errorString() 53 - - : QStringLiteral("(null template)"); 54 - + const QString errorString = failedTemplate->errorString(); 55 - ctx.insert(QStringLiteral("errorMessage"), errorString); 56 - return tpl->render(&ctx); 57 - } 58 47 @@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c 59 48 KConfigGroup group(&config, QStringLiteral("Desktop Entry")); 60 49 if (group.isValid()) {
-25
pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
··· 1 - diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp 2 - index b86fc3a..8af72f4 100644 3 - --- a/src/grantleetheme.cpp 4 - +++ b/src/grantleetheme.cpp 5 - @@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason, 6 - Grantlee::Context ctx = createContext(); 7 - ctx.insert(QStringLiteral("error"), reason); 8 - ctx.insert(QStringLiteral("templateName"), origTemplateName); 9 - - ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString()); 10 - + const QString errorString = failedTemplate 11 - + ? failedTemplate->errorString() 12 - + : QStringLiteral("(null template)"); 13 - + ctx.insert(QStringLiteral("errorMessage"), errorString); 14 - return tpl->render(&ctx); 15 - } 16 - 17 - @@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con 18 - } 19 - 20 - Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine); 21 - - if (tpl->error()) { 22 - + if (!tpl || tpl->error()) { 23 - return d->errorTemplate(i18n("Template parsing error"), templateName, tpl); 24 - } 25 -
-1
pkgs/applications/kde/grantleetheme/series
··· 1 - grantleetheme_check_null.patch 2 1 grantlee-merge-theme-dirs.patch
+2 -1
pkgs/applications/kde/kdepim-runtime.nix
··· 5 5 akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, 6 6 kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, 7 7 kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, 8 - qtwebengine, 8 + pimcommon, qtwebengine, 9 9 }: 10 10 11 11 mkDerivation { ··· 19 19 akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes 20 20 kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap 21 21 kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine 22 + pimcommon 22 23 ]; 23 24 # Attempts to build some files before dependencies have been generated 24 25 enableParallelBuilding = false;
+2 -2
pkgs/applications/kde/kmail.nix
··· 2 2 mkDerivation, lib, kdepimTeam, 3 3 extra-cmake-modules, kdoctools, 4 4 akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, 5 - kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, 5 + kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, 6 6 kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, 7 7 kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, 8 8 kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, ··· 20 20 buildInputs = [ 21 21 akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig 22 22 kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n 23 - kiconthemes kinit kio kldap kmail-account-wizard kmailtransport 23 + kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim 24 24 knotifications knotifyconfig kontactinterface kparts kpty kservice 25 25 ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar 26 26 libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
+2 -2
pkgs/applications/kde/mailcommon.nix
··· 3 3 extra-cmake-modules, kdoctools, 4 4 akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets, 5 5 kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap, 6 - kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, 6 + kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, libkdepim 7 7 }: 8 8 9 9 mkDerivation { ··· 16 16 buildInputs = [ 17 17 akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons 18 18 kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport 19 - kwindowsystem mailimporter messagelib phonon 19 + kwindowsystem mailimporter messagelib phonon libkdepim 20 20 ]; 21 21 outputs = [ "out" "dev" ]; 22 22 }