summaryrefslogtreecommitdiffstats
path: root/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-08-06 01:30:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-08-06 01:31:02 +0200
commit9010047840d810d9ccba3d00b7943a842e125291 (patch)
tree7698717495c9bc52be2bc8ab526071f3063b466d /freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff
parentb4f5663d87c16e08aaef66346f4b22eba2de80bd (diff)
downloadtde-packaging-r14.0.5.tar.gz
tde-packaging-r14.0.5.zip
FreeBSD: Update for final release R14.0.5r14.0.5
Additional patches due to stricter C++11 in Clang A new mkspec for Clang is used to build TQt Akode is now part of the TDE repository Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff')
-rw-r--r--freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff40
1 files changed, 40 insertions, 0 deletions
diff --git a/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff b/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..b8fd21342
--- /dev/null
+++ b/freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,40 @@
+diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
+index acf7ecdb..4ab4300f 100644
+--- a/kmplot/kmplot/xparser.cpp
++++ b/kmplot/kmplot/xparser.cpp
+@@ -521,7 +521,7 @@ TQString XParser::functionMinValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_dmin;
+ }
+
+@@ -539,7 +539,7 @@ TQString XParser::functionMaxValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_dmax;
+ }
+
+@@ -557,7 +557,7 @@ TQString XParser::functionStartXValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_startx;
+ }
+
+@@ -575,7 +575,7 @@ TQString XParser::functionStartYValue(uint id)
+ {
+ int const ix = ixValue(id);
+ if (ix==-1)
+- return int();
++ return TQString();
+ return ufkt[ix].str_starty;
+ }
+