From 34c265584dfbfd3c49e3f3a58fa45d98f10fed89 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
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 -
 3 files changed, 37 deletions(-)
 delete mode 100644 pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch

(limited to 'pkgs/applications/kde/grantleetheme')

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
-- 
cgit 1.4.1