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/tqt3/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'freebsd/dependencies/tqt3/Makefile') diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile index 60f796230..c64b6cbe3 100644 --- a/freebsd/dependencies/tqt3/Makefile +++ b/freebsd/dependencies/tqt3/Makefile @@ -7,7 +7,7 @@ PORTNAME= tqt3 COMMENT= Multiplatform C++ application framework -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= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION} @@ -28,7 +28,7 @@ LIB_DEPENDS+= libmng.so:${PORTSDIR}/graphics/libmng \ libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo \ libglib-2.0.so:${PORTSDIR}/devel/glib20 -USE_XORG= xcursor xinerama sm inputproto xi +USE_XORG= xcursor xinerama sm xorgproto xi REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -120,16 +120,16 @@ CONFIGURE_ARGS+=-debug # The new trinity/dependencies/tqmake port installs them under LOCALBASE. We can use # either one here, but we prefer the newer: .for d in ${LOCALBASE} ${PREFIX} -. if exists($d/share/tqt3/mkspecs/freebsd-g++/qplatformdefs.h) +. if exists($d/share/tqt3/mkspecs/freebsd-clang/qplatformdefs.h) QTBASE=$d -PLATFORM=${QTBASE}/share/tqt3/mkspecs/freebsd-g++ +PLATFORM=${QTBASE}/share/tqt3/mkspecs/freebsd-clang . endif .endfor .if defined(PLATFORM) CONFIGURE_ARGS+=-platform ${PLATFORM} .else -CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/tqt3/mkspecs/freebsd-g++ +CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/tqt3/mkspecs/freebsd-clang .endif .if ${PORT_OPTIONS:MXRANDR} -- cgit v1.2.1