From owner-svn-ports-branches@freebsd.org Fri Jan 6 20:05:47 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B796CA2789; Fri, 6 Jan 2017 20:05:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA38713AB; Fri, 6 Jan 2017 20:05:46 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v06K5kro064293; Fri, 6 Jan 2017 20:05:46 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v06K5jIU064291; Fri, 6 Jan 2017 20:05:45 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201701062005.v06K5jIU064291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 6 Jan 2017 20:05:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430748 - in branches/2017Q1/print/hpijs: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2017 20:05:47 -0000 Author: antoine Date: Fri Jan 6 20:05:45 2017 New Revision: 430748 URL: https://svnweb.freebsd.org/changeset/ports/430748 Log: MFH: r430521 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: branches/2017Q1/print/hpijs/files/patch-dj3320.cpp - copied unchanged from r430521, head/print/hpijs/files/patch-dj3320.cpp branches/2017Q1/print/hpijs/files/patch-registry.cpp - copied unchanged from r430521, head/print/hpijs/files/patch-registry.cpp Modified: branches/2017Q1/print/hpijs/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/print/hpijs/Makefile ============================================================================== --- branches/2017Q1/print/hpijs/Makefile Fri Jan 6 20:03:03 2017 (r430747) +++ branches/2017Q1/print/hpijs/Makefile Fri Jan 6 20:05:45 2017 (r430748) @@ -2,7 +2,7 @@ PORTNAME= hpijs PORTVERSION= 2.1.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION} Copied: branches/2017Q1/print/hpijs/files/patch-dj3320.cpp (from r430521, head/print/hpijs/files/patch-dj3320.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/print/hpijs/files/patch-dj3320.cpp Fri Jan 6 20:05:45 2017 (r430748, copy of r430521, head/print/hpijs/files/patch-dj3320.cpp) @@ -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)); Copied: branches/2017Q1/print/hpijs/files/patch-registry.cpp (from r430521, head/print/hpijs/files/patch-registry.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/print/hpijs/files/patch-registry.cpp Fri Jan 6 20:05:45 2017 (r430748, copy of r430521, head/print/hpijs/files/patch-registry.cpp) @@ -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:");