From 34c265584dfbfd3c49e3f3a58fa45d98f10fed89 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 20 Aug 2017 11:54:35 +0200 Subject: kdeApplications: adapt deps and patches to new version --- .../grantleetheme/grantlee-merge-theme-dirs.patch | 11 ---------- .../grantleetheme/grantleetheme_check_null.patch | 25 ---------------------- pkgs/applications/kde/grantleetheme/series | 1 - pkgs/applications/kde/kdepim-runtime.nix | 3 ++- pkgs/applications/kde/kmail.nix | 4 ++-- pkgs/applications/kde/mailcommon.nix | 4 ++-- 6 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch (limited to 'pkgs') diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch index 76b65a4447527..6275bb84c17b0 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -44,17 +44,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp loader->setTheme(dirName); if (!sEngine) { -@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons - Grantlee::Context ctx = createContext(); - ctx.insert(QStringLiteral("error"), reason); - ctx.insert(QStringLiteral("templateName"), origTemplateName); -- const QString errorString = failedTemplate -- ? failedTemplate->errorString() -- : QStringLiteral("(null template)"); -+ const QString errorString = failedTemplate->errorString(); - ctx.insert(QStringLiteral("errorMessage"), errorString); - return tpl->render(&ctx); - } @@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c KConfigGroup group(&config, QStringLiteral("Desktop Entry")); if (group.isValid()) { diff --git a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch deleted file mode 100644 index 730d5b0fe2612..0000000000000 --- a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp -index b86fc3a..8af72f4 100644 ---- a/src/grantleetheme.cpp -+++ b/src/grantleetheme.cpp -@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason, - Grantlee::Context ctx = createContext(); - ctx.insert(QStringLiteral("error"), reason); - ctx.insert(QStringLiteral("templateName"), origTemplateName); -- ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString()); -+ const QString errorString = failedTemplate -+ ? failedTemplate->errorString() -+ : QStringLiteral("(null template)"); -+ ctx.insert(QStringLiteral("errorMessage"), errorString); - return tpl->render(&ctx); - } - -@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con - } - - Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine); -- if (tpl->error()) { -+ if (!tpl || tpl->error()) { - return d->errorTemplate(i18n("Template parsing error"), templateName, tpl); - } - diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series index 5c38848de7134..9095599ea56b1 100644 --- a/pkgs/applications/kde/grantleetheme/series +++ b/pkgs/applications/kde/grantleetheme/series @@ -1,2 +1 @@ -grantleetheme_check_null.patch grantlee-merge-theme-dirs.patch diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 01683a6315c1e..0fde861a02378 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -5,7 +5,7 @@ akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - qtwebengine, + pimcommon, qtwebengine, }: mkDerivation { @@ -19,6 +19,7 @@ mkDerivation { akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + pimcommon ]; # Attempts to build some files before dependencies have been generated enableParallelBuilding = false; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index ec8c989277954..acb200c59708c 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, - kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, + kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim, kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, @@ -20,7 +20,7 @@ mkDerivation { buildInputs = [ akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n - kiconthemes kinit kio kldap kmail-account-wizard kmailtransport + kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim knotifications knotifyconfig kontactinterface kparts kpty kservice ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix index ee958d701b34e..44edea8f55e90 100644 --- a/pkgs/applications/kde/mailcommon.nix +++ b/pkgs/applications/kde/mailcommon.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap, - kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, + kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, libkdepim }: mkDerivation { @@ -16,7 +16,7 @@ mkDerivation { buildInputs = [ akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport - kwindowsystem mailimporter messagelib phonon + kwindowsystem mailimporter messagelib phonon libkdepim ]; outputs = [ "out" "dev" ]; } -- cgit 1.4.1