From owner-svn-ports-all@freebsd.org  Mon Nov 20 10:40:59 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 2F041DE7AED;
 Mon, 20 Nov 2017 10:40:59 +0000 (UTC)
 (envelope-from brnrd@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 EFDBA78F21;
 Mon, 20 Nov 2017 10:40:58 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAKAevaB099786;
 Mon, 20 Nov 2017 10:40:57 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAKAevSW099785;
 Mon, 20 Nov 2017 10:40:57 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201711201040.vAKAevSW099785@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Mon, 20 Nov 2017 10:40:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r454537 - head/sysutils/passwordsafe/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: head/sysutils/passwordsafe/files
X-SVN-Commit-Revision: 454537
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Nov 2017 10:40:59 -0000

Author: brnrd
Date: Mon Nov 20 10:40:57 2017
New Revision: 454537
URL: https://svnweb.freebsd.org/changeset/ports/454537

Log:
  sysutils/passwordsafe: Fix build with wx 3.0.3.1
  
  PR:		223757
  Submitted by:	rozhuk im gmail.com

Added:
  head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp   (contents, props changed)

Added: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp	Mon Nov 20 10:40:57 2017	(r454537)
@@ -0,0 +1,20 @@
+--- src/ui/wxWidgets/passwordsubset.cpp.orig	2017-11-20 03:11:40.369984000 +0300
++++ src/ui/wxWidgets/passwordsubset.cpp	2017-11-20 03:12:19.012627000 +0300
+@@ -240,7 +240,7 @@
+       m_vals->Clear();
+       m_error->SetLabel(wxEmptyString);
+       
+-      std::wistringstream is(pos_str.wc_str());
++      std::wistringstream is(static_cast<const wchar_t*>(pos_str.wc_str()));
+       int pos;
+       while (is >> pos) {
+ 	if (pos > 0 && pos <= N)
+@@ -280,7 +280,7 @@
+     wxASSERT(val_str.length() % 2 == 0);
+     for (size_t i = 0; i < val_str.length(); i += 2)
+       reduced_str += val_str[i];
+-    PWSclipboard::GetInstance()->SetData(reduced_str.wc_str());
++    PWSclipboard::GetInstance()->SetData(static_cast<const wchar_t*>(reduced_str.wc_str()));
+   }
+ }
+