Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 12:25:46 +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: r433009 - in head/games/xmemory: . files
Message-ID:  <201702011225.v11CPkHt063086@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Feb  1 12:25:46 2017
New Revision: 433009
URL: https://svnweb.freebsd.org/changeset/ports/433009

Log:
  games/xmemory: unbreak with libc++ 3.9
  
  gif_image.C:61:7: error: assigning to 'char *' from incompatible type 'const char *'
          name = strrchr(filename,'/');
               ^ ~~~~~~~~~~~~~~~~~~~~~
  
  Reported by:	pkg-fallout

Added:
  head/games/xmemory/files/patch-gif__image.C   (contents, props changed)
Modified:
  head/games/xmemory/Makefile   (contents, props changed)

Modified: head/games/xmemory/Makefile
==============================================================================
--- head/games/xmemory/Makefile	Wed Feb  1 12:06:15 2017	(r433008)
+++ head/games/xmemory/Makefile	Wed Feb  1 12:25:46 2017	(r433009)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmemory
 PORTVERSION=	3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/multiplayer
 

Added: head/games/xmemory/files/patch-gif__image.C
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xmemory/files/patch-gif__image.C	Wed Feb  1 12:25:46 2017	(r433009)
@@ -0,0 +1,13 @@
+--- gif_image.C.orig	1996-07-04 20:36:15 UTC
++++ gif_image.C
+@@ -58,8 +58,8 @@ GifImage::GifImage(const char *filename,
+ : lockcount(0) {
+ 	first=0;
+ 	LoadGIF( filename );
+-	name = strrchr(filename,'/');
+-	if (name)	name=strdup(name+1);
++	const char *pos = strrchr(filename,'/');
++	if (pos)		name=strdup(pos+1);
+ 	else			name=strdup(filename);
+ 
+ 	if (autocrop&&!fastinfo_flag)	CropImage();



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