Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 20:21:10 +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: r433091 - head/graphics/inventor/files
Message-ID:  <201702012021.v11KLAOf064646@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Feb  1 20:21:10 2017
New Revision: 433091
URL: https://svnweb.freebsd.org/changeset/ports/433091

Log:
  graphics/inventor: unbreak with libc++ 3.9
  
  ./SoInput.c++:2813:8: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
          char *firstPlus = strchr(n, '+');
                ^           ~~~~~~~~~~~~~~
  SoInteractionKit.c++:857:12: error: cannot initialize a variable of type 'char *' with an rvalue of
        type 'const char *'
              char *dotPtr   = strchr( partName.getString(), '.' );
                    ^          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  SoInteractionKit.c++:858:12: error: cannot initialize a variable of type 'char *' with an rvalue of
        type 'const char *'
              char *brackPtr = strchr( partName.getString(), '[' );
                    ^          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  Reported by:	pkg-fallout

Added:
  head/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++   (contents, props changed)
  head/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++   (contents, props changed)

Added: head/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++	Wed Feb  1 20:21:10 2017	(r433091)
@@ -0,0 +1,11 @@
+--- lib/database/src/so/SoInput.c++.orig	2000-10-25 23:47:47 UTC
++++ lib/database/src/so/SoInput.c++
+@@ -2810,7 +2810,7 @@ SoInput::addReference(const SbName &name
+ 
+     if (addToGlobalDict) {
+ 	// Look for the first '+':
+-	char *firstPlus = strchr(n, '+');
++	const char *firstPlus = strchr(n, '+');
+ 
+ 	if (firstPlus == NULL) {
+ 	    base->setName(name);

Added: head/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++	Wed Feb  1 20:21:10 2017	(r433091)
@@ -0,0 +1,13 @@
+--- lib/interaction/src/nodekits/SoInteractionKit.c++.orig	2000-08-15 12:56:25 UTC
++++ lib/interaction/src/nodekits/SoInteractionKit.c++
+@@ -854,8 +854,8 @@ SoInteractionKit::setAnySurrogatePath( c
+ 	    // (as in "childList[0].appearance")
+ 	    // If so, get the string up to whichever came first.
+ 	    // This will be the 'intermediary' we look for.
+-	    char *dotPtr   = strchr( partName.getString(), '.' );
+-	    char *brackPtr = strchr( partName.getString(), '[' );
++	    const char *dotPtr   = strchr( partName.getString(), '.' );
++	    const char *brackPtr = strchr( partName.getString(), '[' );
+ 
+ 	    if ( dotPtr != NULL || brackPtr != NULL ) {
+ 		char *nameCopy = strdup( partName.getString() );



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