aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2017-02-02 04:21:10 +0800
committerjbeich <jbeich@FreeBSD.org>2017-02-02 04:21:10 +0800
commit6aad5579c00ce339506b48718c3b77106a92b37f (patch)
treee74666ea48bb256677fd0426520e8c13a410864b
parent40990cdc2eedf14b467a6b1c3c2c7be82f8b7a0e (diff)
downloadfreebsd-ports-gnome-6aad5579c00ce339506b48718c3b77106a92b37f.tar.gz
freebsd-ports-gnome-6aad5579c00ce339506b48718c3b77106a92b37f.tar.zst
freebsd-ports-gnome-6aad5579c00ce339506b48718c3b77106a92b37f.zip
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
-rw-r--r--graphics/inventor/files/patch-lib_database_src_so_SoInput.c++11
-rw-r--r--graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++13
2 files changed, 24 insertions, 0 deletions
diff --git a/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++ b/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++
new file mode 100644
index 000000000000..24660da409f6
--- /dev/null
+++ b/graphics/inventor/files/patch-lib_database_src_so_SoInput.c++
@@ -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);
diff --git a/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++ b/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++
new file mode 100644
index 000000000000..6f3b1a7a6307
--- /dev/null
+++ b/graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++
@@ -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() );