Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 6 Jan 2017 20:05:45 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
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
Message-ID:  <201701062005.v06K5jIU064291@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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:");

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