From owner-svn-ports-all@freebsd.org Mon Dec 11 08:03:22 2017 Return-Path: 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 C95BAE895EF; Mon, 11 Dec 2017 08:03:22 +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 86F87764F6; Mon, 11 Dec 2017 08:03:22 +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 vBB83L7V010301; Mon, 11 Dec 2017 08:03:21 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBB83L3m010298; Mon, 11 Dec 2017 08:03:21 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201712110803.vBB83L3m010298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 11 Dec 2017 08:03:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455928 - in head/sysutils/passwordsafe: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/sysutils/passwordsafe: . files X-SVN-Commit-Revision: 455928 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2017 08:03:22 -0000 Author: brnrd Date: Mon Dec 11 08:03:21 2017 New Revision: 455928 URL: https://svnweb.freebsd.org/changeset/ports/455928 Log: sysutils/passwordsafe: Update to 1.03BETA - Adds QR-code feature Added: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp (contents, props changed) Modified: head/sysutils/passwordsafe/Makefile head/sysutils/passwordsafe/distinfo Modified: head/sysutils/passwordsafe/Makefile ============================================================================== --- head/sysutils/passwordsafe/Makefile Mon Dec 11 07:18:48 2017 (r455927) +++ head/sysutils/passwordsafe/Makefile Mon Dec 11 08:03:21 2017 (r455928) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= passwordsafe -DISTVERSION= 1.02.1BETA +DISTVERSION= 1.03BETA CATEGORIES= sysutils MAINTAINER= brnrd@FreeBSD.org @@ -10,7 +10,8 @@ COMMENT= Popular secure and convenient password manage LICENSE= ART20 LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ - libxerces-c.so:textproc/xerces-c3 + libxerces-c.so:textproc/xerces-c3 \ + libqrencode.so:graphics/libqrencode BUILD_DEPENDS= zip:archivers/zip NOT_FOR_ARCHS= aarch64 armv6 armv7 @@ -36,6 +37,8 @@ GH_PROJECT= ${GH_ACCOUNT} WX_COMP= wx WANT_WX_VER= 3.0 + +LDFLAGS= -L${PREFIX}/lib -lqrencode ALL_TARGET= unicoderelease Modified: head/sysutils/passwordsafe/distinfo ============================================================================== --- head/sysutils/passwordsafe/distinfo Mon Dec 11 07:18:48 2017 (r455927) +++ head/sysutils/passwordsafe/distinfo Mon Dec 11 08:03:21 2017 (r455928) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505567310 -SHA256 (pwsafe-pwsafe-1.02.1BETA_GH0.tar.gz) = cd376032947c705fbbdbecb763eea760cc7ce2e1eb539df04bda3fad34ad9e27 -SIZE (pwsafe-pwsafe-1.02.1BETA_GH0.tar.gz) = 14068085 +TIMESTAMP = 1512977443 +SHA256 (pwsafe-pwsafe-1.03BETA_GH0.tar.gz) = 36d64d748a63825cb17e247628f6a378f131d952d4c1715cc6304e4d07b3e0ed +SIZE (pwsafe-pwsafe-1.03BETA_GH0.tar.gz) = 14391644 Added: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp Mon Dec 11 08:03:21 2017 (r455928) @@ -0,0 +1,24 @@ +From b5c12954802f733cbef5a83b1b2d07b8fde8a6b0 Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Sun, 19 Nov 2017 20:53:11 +0100 +Subject: [PATCH] Unbreak build on FreeBSD + +The function wxLinuxDistributionInfo is only available on Linux. Add check for LINUX symbol as per [documentation](http://docs.wxwidgets.org/3.0/group__group__funcmacro__networkuseros.html#ga06f6fb212c396bd20865ee4e2f69aa1f) +`This function is Linux-specific and is only available when the LINUX symbol is defined. ` +--- + src/ui/wxWidgets/wxutils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ui/wxWidgets/wxutils.cpp b/src/ui/wxWidgets/wxutils.cpp +index 25faa5310..027ee69b4 100644 +--- src/ui/wxWidgets/wxutils.cpp.orig ++++ src/ui/wxWidgets/wxutils.cpp +@@ -203,7 +203,7 @@ int pless(int* first, int* second) { return *first - *second; } + // on Fedora or Ubuntu + bool IsTaskBarIconAvailable() + { +-#ifdef __WXGTK__ ++#if defined(__WXGTK__) && defined(LINUX) + const wxLinuxDistributionInfo ldi = wxGetLinuxDistributionInfo(); + if (ldi.Id.IsEmpty() || ldi.Id == wxT("Ubuntu") || ldi.Id == wxT("Fedora")) + return false;