From owner-svn-ports-head@freebsd.org Wed Feb 1 20:22:07 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 269A6CCC7DA; Wed, 1 Feb 2017 20:22:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01366C21; Wed, 1 Feb 2017 20:22:06 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v11KM6aQ068991; Wed, 1 Feb 2017 20:22:06 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11KM5Zd068988; Wed, 1 Feb 2017 20:22:05 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702012022.v11KM5Zd068988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 1 Feb 2017 20:22:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433097 - in head/emulators/vba: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 20:22:07 -0000 Author: jbeich Date: Wed Feb 1 20:22:05 2017 New Revision: 433097 URL: https://svnweb.freebsd.org/changeset/ports/433097 Log: emulators/vba: unbreak with libc++ 3.9 ../GBA.cpp:1133:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../GBA.cpp:1148:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../GBA.cpp:1172:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../GBA.cpp:1192:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../Util.cpp:481:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../Util.cpp:505:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../Util.cpp:525:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ ../Util.cpp:555:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char * p = strrchr(file,'.'); ^ ~~~~~~~~~~~~~~~~~ In file included from expr.y:12: In file included from ../../src/System.h:24: In file included from ../../src/unzip.h:68: In file included from /usr/include/zlib.h:34: In file included from /usr/include/zconf.h:247: /usr/include/c++/v1/stddef.h:52:7: error: reference to 'std' is ambiguous using std::nullptr_t; ^ /usr/include/c++/v1/__nullptr:22:1: note: candidate found by name lookup is 'std' _LIBCPP_BEGIN_NAMESPACE_STD ^ /usr/include/c++/v1/__config:388:47: note: expanded from macro '_LIBCPP_BEGIN_NAMESPACE_STD' #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE { ^ /usr/include/c++/v1/__config:392:11: note: candidate found by name lookup is 'std::std' namespace std { ^ Reported by: pkg-fallout Added: head/emulators/vba/files/patch-src_GBA.cpp (contents, props changed) head/emulators/vba/files/patch-src_expr.cpp (contents, props changed) Modified: head/emulators/vba/Makefile (contents, props changed) head/emulators/vba/files/patch-src-Util.cpp (contents, props changed) Modified: head/emulators/vba/Makefile ============================================================================== --- head/emulators/vba/Makefile Wed Feb 1 20:21:56 2017 (r433096) +++ head/emulators/vba/Makefile Wed Feb 1 20:22:05 2017 (r433097) @@ -53,8 +53,6 @@ GTK2_DATA_FILES= ${WRKSRC}/src/gtk/vba.g post-patch: @${REINPLACE_CMD} -e '/for(int i = 0; i < 16; i++/s| i|&_|g' \ ${WRKSRC}/src/sdl/debugger.cpp - @${REINPLACE_CMD} -e '/^namespace std/ { x; \ - s|^|#include |; H; x; }' ${WRKSRC}/src/expr.cpp do-install: ${INSTALL_PROGRAM} ${PROG_FILES} ${STAGEDIR}${PREFIX}/bin Modified: head/emulators/vba/files/patch-src-Util.cpp ============================================================================== --- head/emulators/vba/files/patch-src-Util.cpp Wed Feb 1 20:21:56 2017 (r433096) +++ head/emulators/vba/files/patch-src-Util.cpp Wed Feb 1 20:22:05 2017 (r433097) @@ -9,6 +9,51 @@ png_destroy_write_struct(&png_ptr,NULL); fclose(fp); return false; +@@ -478,7 +478,7 @@ bool utilIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -502,7 +502,7 @@ bool utilIsGBAImage(const char * file) + bool utilIsGBImage(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gb") == 0) +@@ -522,7 +522,7 @@ bool utilIsGBImage(const char * file) + bool utilIsZipFile(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -537,7 +537,7 @@ bool utilIsZipFile(const char *file) + bool utilIsRarFile(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".rar") == 0) +@@ -552,7 +552,7 @@ bool utilIsRarFile(const char *file) + bool utilIsGzipFile(const char *file) + { + if(strlen(file) > 3) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gz") == 0) @@ -984,7 +984,7 @@ void utilWriteData(gzFile gzFile, variab gzFile utilGzOpen(const char *file, const char *mode) Added: head/emulators/vba/files/patch-src_GBA.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/vba/files/patch-src_GBA.cpp Wed Feb 1 20:22:05 2017 (r433097) @@ -0,0 +1,38 @@ +--- src/GBA.cpp.orig 2004-05-13 14:37:59 UTC ++++ src/GBA.cpp +@@ -1130,7 +1130,7 @@ bool CPUWriteBMPFile(const char *fileNam + bool CPUIsZipFile(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".zip") == 0) +@@ -1145,7 +1145,7 @@ bool CPUIsGBAImage(const char * file) + { + cpuIsMultiBoot = false; + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1169,7 +1169,7 @@ bool CPUIsGBAImage(const char * file) + bool CPUIsGBABios(const char * file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".gba") == 0) +@@ -1189,7 +1189,7 @@ bool CPUIsGBABios(const char * file) + bool CPUIsELF(const char *file) + { + if(strlen(file) > 4) { +- char * p = strrchr(file,'.'); ++ const char * p = strrchr(file,'.'); + + if(p != NULL) { + if(_stricmp(p, ".elf") == 0) Added: head/emulators/vba/files/patch-src_expr.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/vba/files/patch-src_expr.cpp Wed Feb 1 20:22:05 2017 (r433097) @@ -0,0 +1,19 @@ +--- src/expr.cpp.orig 2002-10-20 13:03:12 UTC ++++ src/expr.cpp +@@ -14,15 +14,12 @@ + + #line 1 "expr.y" + +-namespace std { ++#include + #include + #include + #include + #include +-} + +-using namespace std; +- + #include "System.h" + #include "elf.h" + #include "exprNode.h"