From 9010047840d810d9ccba3d00b7943a842e125291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 6 Aug 2018 01:30:47 +0200 Subject: FreeBSD: Update for final release R14.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- freebsd/dependencies/tqmake/Makefile | 9 +-- freebsd/dependencies/tqmake/distinfo | 6 +- freebsd/dependencies/tqmake/files/Makefile.bsd | 2 +- .../files/patch-bp000-fix-ftbfs-on-c++11.diff | 78 ++++++++++++++++++++++ freebsd/dependencies/tqmake/pkg-plist | 4 ++ 5 files changed, 89 insertions(+), 10 deletions(-) create mode 100644 freebsd/dependencies/tqmake/files/patch-bp000-fix-ftbfs-on-c++11.diff (limited to 'freebsd/dependencies/tqmake') diff --git a/freebsd/dependencies/tqmake/Makefile b/freebsd/dependencies/tqmake/Makefile index 613bac150..fe669c105 100644 --- a/freebsd/dependencies/tqmake/Makefile +++ b/freebsd/dependencies/tqmake/Makefile @@ -5,7 +5,7 @@ PORTNAME= tqmake COMMENT= The build utility of the TQt from Trinity -TDE_PREVERSION= ~pre6+77ba1370 +TDE_PREVERSION= MASTER_SITE_SUBDIR= t/tqt-x11-free DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1} DISTSRC= tqt3-trinity-${TDE_VERSION}${TDE_PREVERSION} @@ -43,17 +43,14 @@ PLIST_SUB+= DOCSDIR="${DOCSDIR}" post-patch: @${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial @${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \ - -e 's|gcc|${CC}|' \ - -e 's|g++|${CXX}|' \ -e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|$$(QTDIR)/bin|${PREFIX}/bin|g' \ -e 's|$$(QTDIR)/include|${PREFIX}/include/tqt3|g' \ -e 's|$$(QTDIR)/lib|${PREFIX}/lib|g' \ -e 's|$$(QTDIR)|${PREFIX}/share/tqt3|' \ - -e 's|release|release thread|' \ - ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf - ${LN} -s freebsd-g++ ${WRKSRC}/../mkspecs/default + ${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf + ${LN} -s freebsd-clang ${WRKSRC}/../mkspecs/default @${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix do-configure: diff --git a/freebsd/dependencies/tqmake/distinfo b/freebsd/dependencies/tqmake/distinfo index a172e1f40..e8e085970 100644 --- a/freebsd/dependencies/tqmake/distinfo +++ b/freebsd/dependencies/tqmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527510429 -SHA256 (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 950180520c1c93762d152bac20d568f01d53ee5442ca406f0cc1b08527da6f53 -SIZE (TDE/dependencies/tqt-x11-free_14.0.5~pre6.orig.tar.xz) = 10959680 +TIMESTAMP = 1531032635 +SHA256 (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = affe00b9da7190fdbadcae2352b7e8b87d49ce10d4ff6e511714c39babbe038a +SIZE (TDE/dependencies/tqt-x11-free_14.0.5.orig.tar.xz) = 10957072 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"]; + diff --git a/freebsd/dependencies/tqmake/pkg-plist b/freebsd/dependencies/tqmake/pkg-plist index 1bf4208aa..1075de326 100644 --- a/freebsd/dependencies/tqmake/pkg-plist +++ b/freebsd/dependencies/tqmake/pkg-plist @@ -17,6 +17,8 @@ share/tqt3/mkspecs/darwin-g++/qplatformdefs.h share/tqt3/mkspecs/default share/tqt3/mkspecs/dgux-g++/qmake.conf share/tqt3/mkspecs/dgux-g++/qplatformdefs.h +share/tqt3/mkspecs/freebsd-clang/qmake.conf +share/tqt3/mkspecs/freebsd-clang/qplatformdefs.h share/tqt3/mkspecs/freebsd-g++/qmake.conf share/tqt3/mkspecs/freebsd-g++/qplatformdefs.h share/tqt3/mkspecs/freebsd-g++34/qmake.conf @@ -49,6 +51,8 @@ share/tqt3/mkspecs/irix-cc/qmake.conf share/tqt3/mkspecs/irix-cc/qplatformdefs.h share/tqt3/mkspecs/irix-g++/qmake.conf share/tqt3/mkspecs/irix-g++/qplatformdefs.h +share/tqt3/mkspecs/linux-clang/qmake.conf +share/tqt3/mkspecs/linux-clang/qplatformdefs.h share/tqt3/mkspecs/linux-cxx/qmake.conf share/tqt3/mkspecs/linux-cxx/qplatformdefs.h share/tqt3/mkspecs/linux-ecc-64/qmake.conf -- cgit v1.2.3