[SCM] LabPlot Debian packaging. branch, master, updated. 51ae7876a403c83aa292a346432e3ee9e90561c6

Pino Toscano pino at moszumanska.debian.org
Sat May 21 05:51:35 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/labplot.git;a=commitdiff;h=51ae787

The following commit has been merged in the master branch:
commit 51ae7876a403c83aa292a346432e3ee9e90561c6
Author: Pino Toscano <pino at debian.org>
Date:   Sat May 21 07:50:49 2016 +0200

    fix build
    
    backport upstream commit e3b55c7f8ff492e2db27794af53a8ad36fcc3c79
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 .../upstream_Include-cmath-for-std-isfinite.patch  | 25 ++++++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e237d1a..3cad048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,7 @@ labplot (2.2.0-0r1) unstable; urgency=medium
 
   [ Pino Toscano ]
   * Re-add back to Debian.
+  * Backport upstream commit e3b55c7f8ff492e2db27794af53a8ad36fcc3c79 to fix
+    build; patch upstream_Include-cmath-for-std-isfinite.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 30 Mar 2016 22:32:06 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d035318
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Include-cmath-for-std-isfinite.patch
diff --git a/debian/patches/upstream_Include-cmath-for-std-isfinite.patch b/debian/patches/upstream_Include-cmath-for-std-isfinite.patch
new file mode 100644
index 0000000..531314b
--- /dev/null
+++ b/debian/patches/upstream_Include-cmath-for-std-isfinite.patch
@@ -0,0 +1,25 @@
+From e3b55c7f8ff492e2db27794af53a8ad36fcc3c79 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 21 May 2016 07:48:08 +0200
+Subject: [PATCH] Include <cmath> for std::isfinite()
+
+---
+ src/backend/gsl/ExpressionParser.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/backend/gsl/ExpressionParser.cpp b/src/backend/gsl/ExpressionParser.cpp
+index 2c5d1b6..1c19b7c 100644
+--- a/src/backend/gsl/ExpressionParser.cpp
++++ b/src/backend/gsl/ExpressionParser.cpp
+@@ -38,6 +38,8 @@
+ 
+ #include <klocale.h>
+ 
++#include <cmath>
++
+ ExpressionParser* ExpressionParser::instance = NULL;
+ 
+ ExpressionParser::ExpressionParser(){
+-- 
+2.8.1
+

-- 
LabPlot Debian packaging.



More information about the pkg-kde-commits mailing list