ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 14:18:13 +03:00
Code Issues Projects Releases Wiki Activity

cantor: patch to fix filename string type

Browse Source
This commit is contained in:
Thomas Tuegel 2015-08-30 07:23:44 -05:00
parent b2c3c58476
commit 29ee3ec8c4
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch Normal file
View File

@ -0,0 +1,28 @@
From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 30 Aug 2015 07:05:03 -0500
Subject: [PATCH] qalculate filename string type
---
src/backends/qalculate/qalculateexpression.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp
index 1891baa..b2a1984 100644
--- a/src/backends/qalculate/qalculateexpression.cpp
+++ b/src/backends/qalculate/qalculateexpression.cpp
@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand()
if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
plotParameters.filetype == PLOT_FILETYPE_PS ||
(plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
+ plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) ||
(plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
+ plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps")))
setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
else
setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
--
2.5.0

4
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -223,6 +223,10 @@ let
'';
};
cantor = extendDerivation (kde4Package super.cantor) {
patches = [ ./cantor/0001-qalculate-filename-string-type.patch ];
};
cervisia = kde4Package super.cervisia;
dolphin-plugins = kde4Package super.dolphin-plugins;