summaryrefslogtreecommitdiffstats
path: root/freebsd/tdeedu/files
diff options
context:
space:
mode:
Diffstat (limited to 'freebsd/tdeedu/files')
-rw-r--r--freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff13
-rw-r--r--freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff40
2 files changed, 53 insertions, 0 deletions
diff --git a/freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff b/freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff
new file mode 100644
index 000000000..1d442f1c8
--- /dev/null
+++ b/freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff
@@ -0,0 +1,13 @@
+diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
+index 1817b1cb..4d971fbd 100644
+--- a/kmplot/kmplot/Makefile.am
++++ b/kmplot/kmplot/Makefile.am
+@@ -28,6 +28,8 @@ kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel
+ kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP
+ kmplot_LDADD = $(LIB_TDEPARTS)
+
++kmplot_COMPILE_FIRST = FktDlgData.h qminmax.h settings.h
++
+ # this is where the desktop file will go
+ appmimedir = $(kde_mimedir)/application
+ appmime_DATA = x-kmplot.desktop
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;
+ }
+