Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 6 Jan 2017 19:57:32 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r430733 - in branches/2017Q1/emulators/snes9x: . files
Message-ID:  <201701061957.v06JvW0O058377@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: antoine
Date: Fri Jan  6 19:57:31 2017
New Revision: 430733
URL: https://svnweb.freebsd.org/changeset/ports/430733

Log:
  MFH: r430522
  
  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:
  branches/2017Q1/emulators/snes9x/Makefile
  branches/2017Q1/emulators/snes9x/files/patch-unix_unix.cpp
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/emulators/snes9x/Makefile
==============================================================================
--- branches/2017Q1/emulators/snes9x/Makefile	Fri Jan  6 19:56:11 2017	(r430732)
+++ branches/2017Q1/emulators/snes9x/Makefile	Fri Jan  6 19:57:31 2017	(r430733)
@@ -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: branches/2017Q1/emulators/snes9x/files/patch-unix_unix.cpp
==============================================================================
--- branches/2017Q1/emulators/snes9x/files/patch-unix_unix.cpp	Fri Jan  6 19:56:11 2017	(r430732)
+++ branches/2017Q1/emulators/snes9x/files/patch-unix_unix.cpp	Fri Jan  6 19:57:31 2017	(r430733)
@@ -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

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