Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 06:43:06 +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: r494553 - head/audio/skype-call-recorder
Message-ID:  <201903040643.x246h6lJ080767@repo.freebsd.org>

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

Log:
  audio/skype-call-recorder: unbreak with libc++ 8
  
  In file included from call.cpp:24:
  In file included from /usr/local/include/qt4/QtCore/QStringList:1:
  In file included from /usr/local/include/qt4/QtCore/qstringlist.h:45:
  In file included from /usr/local/include/qt4/QtCore/qalgorithms.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.11
  ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/audio/skype-call-recorder/Makefile   (contents, props changed)

Modified: head/audio/skype-call-recorder/Makefile
==============================================================================
--- head/audio/skype-call-recorder/Makefile	Mon Mar  4 06:00:43 2019	(r494552)
+++ head/audio/skype-call-recorder/Makefile	Mon Mar  4 06:43:06 2019	(r494553)
@@ -31,5 +31,9 @@ post-patch:
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's,date --utc,TZ=UTC date,' \
 		${WRKSRC}/makeversion
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -i .c++20 's,src/version,&.txt,' \
+		${WRKSRC}/makeversion
 
 .include <bsd.port.mk>



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