svn commit: r430522 - in head/emulators/snes9x: . files
Jan Beich
jbeich at FreeBSD.org
Tue Jan 3 21:04:39 UTC 2017
Author: jbeich
Date: Tue Jan 3 21:04:37 2017
New Revision: 430522
URL: https://svnweb.freebsd.org/changeset/ports/430522
Log:
emulators/snes9x: unbreak with libc++ 3.9
unix/unix.cpp:1451:9: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *slash = strrchr(path, SLASH_CHAR);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~
unix/unix.cpp:1452:9: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *dot = strrchr(path, '.');
^ ~~~~~~~~~~~~~~~~~~
PR: 212343
Regressed by: https://github.com/llvm-mirror/libcxx/commit/b4aa97130b8b
Modified:
head/emulators/snes9x/Makefile (contents, props changed)
head/emulators/snes9x/files/patch-unix_unix.cpp (contents, props changed)
Modified: head/emulators/snes9x/Makefile
==============================================================================
--- head/emulators/snes9x/Makefile Tue Jan 3 21:04:28 2017 (r430521)
+++ head/emulators/snes9x/Makefile Tue Jan 3 21:04:37 2017 (r430522)
@@ -3,7 +3,7 @@
PORTNAME= snes9x
PORTVERSION= 1.51
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= emulators
MASTER_SITES= http://files.ipherswipsite.com/snes9x/ \
http://www.lysator.liu.se/snes9x/${PORTVERSION}/
Modified: head/emulators/snes9x/files/patch-unix_unix.cpp
==============================================================================
--- head/emulators/snes9x/files/patch-unix_unix.cpp Tue Jan 3 21:04:28 2017 (r430521)
+++ head/emulators/snes9x/files/patch-unix_unix.cpp Tue Jan 3 21:04:37 2017 (r430522)
@@ -417,6 +417,17 @@
#endif // defined (JOYSTICK_SUPPORT)
START_EXTERN_C
+@@ -1162,8 +1448,8 @@ void _splitpath(const char *path, char *
+ {
+ *drive = 0;
+
+- char *slash = strrchr(path, SLASH_CHAR);
+- char *dot = strrchr(path, '.');
++ const char *slash = strrchr(path, SLASH_CHAR);
++ const char *dot = strrchr(path, '.');
+
+ if (dot && slash && dot < slash)
+ {
@@ -1716,7 +2002,7 @@
}
#endif
More information about the svn-ports-head
mailing list