Date: Tue, 3 Jan 2017 21:04:28 +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: r430521 - in head/print/hpijs: . files Message-ID: <201701032104.v03L4S64097305@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jan 3 21:04:28 2017 New Revision: 430521 URL: https://svnweb.freebsd.org/changeset/ports/430521 Log: print/hpijs: unbreak with libc++ 3.9 registry.cpp:249:9: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *' char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dj3320.cpp:429:24: error: assigning to 'char *' from incompatible type 'const char *' if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL) ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 212343 Regressed by: https://github.com/llvm-mirror/libcxx/commit/b4aa97130b8b Added: head/print/hpijs/files/patch-dj3320.cpp (contents, props changed) head/print/hpijs/files/patch-registry.cpp (contents, props changed) Modified: head/print/hpijs/Makefile (contents, props changed) Modified: head/print/hpijs/Makefile ============================================================================== --- head/print/hpijs/Makefile Tue Jan 3 21:04:19 2017 (r430520) +++ head/print/hpijs/Makefile Tue Jan 3 21:04:28 2017 (r430521) @@ -2,7 +2,7 @@ PORTNAME= hpijs PORTVERSION= 2.1.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION} Added: head/print/hpijs/files/patch-dj3320.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/hpijs/files/patch-dj3320.cpp Tue Jan 3 21:04:28 2017 (r430521) @@ -0,0 +1,11 @@ +--- dj3320.cpp.orig 2005-08-22 18:47:00 UTC ++++ dj3320.cpp +@@ -400,7 +400,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE + { + DRIVER_ERROR err = NO_ERROR; + BYTE byDevIDBuffer[DevIDBuffSize]; +- char *pcStr = NULL; ++ const char *pcStr = NULL; + BYTE byStatus1, byStatus2; + + memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer)); Added: head/print/hpijs/files/patch-registry.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/hpijs/files/patch-registry.cpp Tue Jan 3 21:04:28 2017 (r430521) @@ -0,0 +1,11 @@ +--- registry.cpp.orig 2005-08-22 18:47:00 UTC ++++ registry.cpp +@@ -246,7 +246,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic + device = eDJ3320; + match = TRUE; + } +- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); ++ const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); + if (!cmdStr) + { + cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701032104.v03L4S64097305>