diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:30:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-06 01:31:02 +0200 |
| commit | 9010047840d810d9ccba3d00b7943a842e125291 (patch) | |
| tree | 7698717495c9bc52be2bc8ab526071f3063b466d /freebsd/tdeedu | |
| parent | b4f5663d87c16e08aaef66346f4b22eba2de80bd (diff) | |
| download | tde-packaging-9010047840d810d9ccba3d00b7943a842e125291.tar.gz tde-packaging-9010047840d810d9ccba3d00b7943a842e125291.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')
| -rw-r--r-- | freebsd/tdeedu/Makefile | 2 | ||||
| -rw-r--r-- | freebsd/tdeedu/distinfo | 6 | ||||
| -rw-r--r-- | freebsd/tdeedu/files/patch-bp000-fix-build-dependencies.diff | 13 | ||||
| -rw-r--r-- | freebsd/tdeedu/files/patch-bp001-fix-ftbfs-on-c++11.diff | 40 |
4 files changed, 57 insertions, 4 deletions
diff --git a/freebsd/tdeedu/Makefile b/freebsd/tdeedu/Makefile index a91ff93ba..d0b4131b8 100644 --- a/freebsd/tdeedu/Makefile +++ b/freebsd/tdeedu/Makefile @@ -7,7 +7,7 @@ PORTNAME= tdeedu-trinity COMMENT= Trinity educational apps -TDE_PREVERSION= ~pre5+aa394f1f +TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} PORTREVISION= 0 CATEGORIES= x11 misc diff --git a/freebsd/tdeedu/distinfo b/freebsd/tdeedu/distinfo index d7ed5578f..805d2d07c 100644 --- a/freebsd/tdeedu/distinfo +++ b/freebsd/tdeedu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495991862 -SHA256 (TDE/tdeedu-trinity_14.0.5~pre5.orig.tar.xz) = 5439e05c29946c2009bb459931b1b7ece7070b5b4a0ceacd96417a42ff286dc1 -SIZE (TDE/tdeedu-trinity_14.0.5~pre5.orig.tar.xz) = 24718584 +TIMESTAMP = 1533388191 +SHA256 (TDE/tdeedu-trinity_14.0.5.orig.tar.xz) = f97d808eaa3b4ec713a2eea6a0024eba402f23fd6443620999fad9150e565f9b +SIZE (TDE/tdeedu-trinity_14.0.5.orig.tar.xz) = 24717996 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; + } + |