Date: Mon, 4 Mar 2019 11:33:40 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494586 - head/net-im/psi Message-ID: <201903041133.x24BXenB035861@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Mar 4 11:33:40 2019 New Revision: 494586 URL: https://svnweb.freebsd.org/changeset/ports/494586 Log: net-im/psi: unbreak with libc++ 8 In file included from src/Certificates/moc_CertificateDisplayDialog.cpp:9: In file included from src/Certificates/../../../psi-1.3/src/Certificates/CertificateDisplayDialog.h:23: In file included from /usr/local/include/Qca-qt5/QtCrypto/QtCrypto:1: In file included from /usr/local/include/Qca-qt5/QtCrypto/qca.h:36: In file included from /usr/local/include/Qca-qt5/QtCrypto/qca_core.h:36: In file included from /usr/local/include/qt5/QtCore/QString:1: In file included from /usr/local/include/qt5/QtCore/qstring.h:48: In file included from /usr/local/include/qt5/QtCore/qchar.h:43: In file included from /usr/local/include/qt5/QtCore/qglobal.h:45: In file included from /usr/include/c++/v1/type_traits:406: In file included from /usr/include/c++/v1/cstddef:38: version:1:1: error: expected unqualified-id 1.3 ^ PR: 236192 Modified: head/net-im/psi/Makefile (contents, props changed) Modified: head/net-im/psi/Makefile ============================================================================== --- head/net-im/psi/Makefile Mon Mar 4 11:21:02 2019 (r494585) +++ head/net-im/psi/Makefile Mon Mar 4 11:33:40 2019 (r494586) @@ -40,4 +40,10 @@ ENCHANT_DESC= Use Enchant for spell checking ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant ENCHANT_CMAKE_BOOL= USE_ENCHANT +post-patch: +# Avoid conflict with C++20 <version> by adding .txt suffix + @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt + @${REINPLACE_CMD} -i .c++20 's,SOURCE_DIR}/version,&.txt,' \ + ${WRKSRC}/CMakeLists.txt + .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041133.x24BXenB035861>