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>

2 files changed, 79 insertions, 1 deletions

diff --git a/freebsd/dependencies/tqmake/files/Makefile.bsd b/freebsd/dependencies/tqmake/files/Makefile.bsd
index 7f14700ed..8db711ce1 100644
--- a/freebsd/dependencies/tqmake/files/Makefile.bsd
+++ b/freebsd/dependencies/tqmake/files/Makefile.bsd
@@ -8,7 +8,7 @@ SRCS:=	${_OBJS:.o=.cpp}
 NO_MAN=	true	# qmake.1 anyone?
 
 .PATH:	${.CURDIR} ${.CURDIR:H}/src/tools
-CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
+CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-clang
 
 .for s in tools kernel codecs
 CXXFLAGS+=-I${.CURDIR:H}/src/$s
diff --git a/freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff b/freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff
new file mode 100644
index 000000000..23797c5f4
--- /dev/null
+++ b/freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff
@@ -0,0 +1,78 @@
+diff --git a/generators/win32/borland_bmake.cpp b/generators/win32/borland_bmake.cpp
+index b7ca9c1a..41666e3a 100644
+--- a/generators/win32/borland_bmake.cpp
++++ b/generators/win32/borland_bmake.cpp
+@@ -386,7 +386,7 @@ BorlandMakefileGenerator::init()
+     if(project->isEmpty("QMAKE_INSTALL_DIR"))
+ 	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+ 
+-    bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "qtmt"TQTDLL_POSTFIX);
++    bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "qtmt" TQTDLL_POSTFIX);
+     TQStringList &configs = project->variables()["CONFIG"];
+     if (project->isActiveConfig("shared"))
+ 	project->variables()["DEFINES"].append("QT_DLL");
+diff --git a/generators/win32/mingw_make.cpp b/generators/win32/mingw_make.cpp
+index 06cc0f76..a082a4aa 100644
+--- a/generators/win32/mingw_make.cpp
++++ b/generators/win32/mingw_make.cpp
+@@ -397,7 +397,7 @@ MingwMakefileGenerator::init()
+     if(project->isEmpty("QMAKE_INSTALL_DIR"))
+ 	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+ 
+-    bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
++    bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX);
+     project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+ 
+     // LIBS defined in Profile comes first for gcc
+diff --git a/generators/win32/msvc_dsp.cpp b/generators/win32/msvc_dsp.cpp
+index 01000737..f28969be 100644
+--- a/generators/win32/msvc_dsp.cpp
++++ b/generators/win32/msvc_dsp.cpp
+@@ -623,7 +623,7 @@ DspMakefileGenerator::init()
+     if ( project->variables()["QMAKESPEC"].isEmpty() )
+ 	project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
+ 
+-    bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
++    bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX);
+     project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+ 
+     TQStringList &configs = project->variables()["CONFIG"];
+diff --git a/generators/win32/msvc_nmake.cpp b/generators/win32/msvc_nmake.cpp
+index 2422a8a6..75138b6c 100644
+--- a/generators/win32/msvc_nmake.cpp
++++ b/generators/win32/msvc_nmake.cpp
+@@ -482,7 +482,7 @@ NmakeMakefileGenerator::init()
+     if(project->isEmpty("QMAKE_INSTALL_DIR"))
+ 	project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
+ 
+-    bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX);
++    bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX);
+     project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
+ 
+     TQString targetfilename = project->variables()["TARGET"].first();
+diff --git a/generators/win32/msvc_vcproj.cpp b/generators/win32/msvc_vcproj.cpp
+index ae0657ac..625ccf37 100644
+--- a/generators/win32/msvc_vcproj.cpp
++++ b/generators/win32/msvc_vcproj.cpp
+@@ -459,8 +459,8 @@ void VcprojGenerator::init()
+ 
+     // Are we building TQt?
+     bool is_qt =
+-	( project->first("TARGET") == "qt"TQTDLL_POSTFIX ||
+-	  project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX );
++	( project->first("TARGET") == "qt" TQTDLL_POSTFIX ||
++	  project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX );
+ 
+     // Are we using TQt?
+     bool isTQtActive = project->isActiveConfig("qt");
+@@ -1097,8 +1097,8 @@ void VcprojGenerator::initOld()
+ 	project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
+ 
+     bool is_qt =
+-	( project->first("TARGET") == "qt"TQTDLL_POSTFIX ||
+-	  project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX );
++	( project->first("TARGET") == "qt" TQTDLL_POSTFIX ||
++	  project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX );
+ 
+    TQStringList &configs = project->variables()["CONFIG"];
+