kdeApplications: adapt deps and patches to new version

This commit is contained in:
Jos van den Oever 2017-08-20 11:54:35 +02:00
parent d5abffac81
commit 34c265584d
6 changed files with 6 additions and 42 deletions

View File

@ -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()) {

View File

@ -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);
}

View File

@ -1,2 +1 @@
grantleetheme_check_null.patch
grantlee-merge-theme-dirs.patch

View File

@ -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;

View File

@ -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

View File

@ -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" ];
}