Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 11:33:50 +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: r494587 - head/net-p2p/torrent-file-editor
Message-ID:  <201903041133.x24BXo17036033@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Mar  4 11:33:50 2019
New Revision: 494587
URL: https://svnweb.freebsd.org/changeset/ports/494587

Log:
  net-p2p/torrent-file-editor: unbreak with libc++ 8
  
  In file included from application.cpp:24:
  In file included from application.h:24:
  In file included from /usr/local/include/qt4/QtGui/QApplication:1:
  In file included from /usr/local/include/qt4/QtGui/qapplication.h:45:
  In file included from /usr/local/include/qt4/QtCore/qcoreapplication.h:45:
  In file included from /usr/local/include/qt4/QtCore/qobject.h:47:
  In file included from /usr/local/include/qt4/QtCore/qobjectdefs.h:45:
  In file included from /usr/local/include/qt4/QtCore/qnamespace.h:45:
  In file included from /usr/local/include/qt4/QtCore/qglobal.h:68:
  In file included from /usr/include/c++/v1/algorithm:640:
  In file included from /usr/include/c++/v1/initializer_list:47:
  In file included from /usr/include/c++/v1/cstddef:38:
  ./version:1:1: error: expected unqualified-id
  0.3.13
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/net-p2p/torrent-file-editor/Makefile   (contents, props changed)

Modified: head/net-p2p/torrent-file-editor/Makefile
==============================================================================
--- head/net-p2p/torrent-file-editor/Makefile	Mon Mar  4 11:33:40 2019	(r494586)
+++ head/net-p2p/torrent-file-editor/Makefile	Mon Mar  4 11:33:50 2019	(r494587)
@@ -41,4 +41,9 @@ DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 .endif
 
+post-patch:
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${REINPLACE_CMD} -i .c++20 '/file/s/version/&.txt/' \
+		${WRKSRC}/Version.cmake ${WRKSRC}/Dmg.cmake
+
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903041133.x24BXo17036033>