From eb4cfcc0dd5800be94383e12943941e508fe2254 Mon Sep 17 00:00:00 2001 From: Dan Vrátil Date: Aug 26 2015 12:22:28 +0000 Subject: Add upstream patch to fix build of qalculate backend --- diff --git a/cantor-15.08.0-fix--buliding-the-qalculate-backend.patch b/cantor-15.08.0-fix--buliding-the-qalculate-backend.patch new file mode 100644 index 0000000..66609ac --- /dev/null +++ b/cantor-15.08.0-fix--buliding-the-qalculate-backend.patch @@ -0,0 +1,33 @@ +From: Heiko Becker +Date: Fri, 07 Aug 2015 17:02:55 +0000 +Subject: Fix building the qalculate backend +X-Git-Url: http://quickgit.kde.org/?p=cantor.git&a=commitdiff&h=ceadbd453cfb4263755931635cb9b02d7aa29efa +--- +Fix building the qalculate backend + +Thanks to Christoph Feck who suggested the fix. + +BUG: 350729 +REVIEW: 124829 +--- + + +--- a/src/backends/qalculate/qalculateexpression.cpp ++++ b/src/backends/qalculate/qalculateexpression.cpp +@@ -773,12 +773,12 @@ + 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) == ".eps") || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 && +- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps"))) ++ plotParameters.filename.substr(p-3,3) == ".ps")) + setResult(new Cantor::EpsResult(QUrl(QString::fromStdString(plotParameters.filename)))); + else +- setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename))); ++ setResult(new Cantor::ImageResult(QUrl(QString::fromStdString(plotParameters.filename)))); + #else + setResult(new Cantor::ImageResult(QUrl::fromLocalFile(QString::fromStdString(plotParameters.filename)))); + #endif + diff --git a/cantor.spec b/cantor.spec index 6e71e20..ec03b42 100644 --- a/cantor.spec +++ b/cantor.spec @@ -18,6 +18,7 @@ URL: https://projects.kde.org/projects/kde/kdeedu/cantor Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches +Patch1: cantor-15.08.0-fix--buliding-the-qalculate-backend.patch BuildRequires: analitza-devel >= 14.12 BuildRequires: desktop-file-utils @@ -70,6 +71,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %prep %setup -q +%patch1 -p1 -b .qalculate %build mkdir %{_target_platform}