From owner-svn-ports-head@freebsd.org Sun Mar 14 19:42:05 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C0705B0151; Sun, 14 Mar 2021 19:42:05 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dz9193ZWPz4fL1; Sun, 14 Mar 2021 19:42:05 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DD3C2339B; Sun, 14 Mar 2021 19:42:05 +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 12EJg5WZ026409; Sun, 14 Mar 2021 19:42:05 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12EJg4sg026406; Sun, 14 Mar 2021 19:42:04 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202103141942.12EJg4sg026406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 14 Mar 2021 19:42:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568411 - 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: 568411 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2021 19:42:05 -0000 Author: brnrd Date: Sun Mar 14 19:42:04 2021 New Revision: 568411 URL: https://svnweb.freebsd.org/changeset/ports/568411 Log: sysutils/passwordsafe: Update to 1.12.0 Added: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp - copied, changed from r568410, head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp Deleted: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_passwordsubset.cpp head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp Modified: head/sysutils/passwordsafe/Makefile head/sysutils/passwordsafe/distinfo Modified: head/sysutils/passwordsafe/Makefile ============================================================================== --- head/sysutils/passwordsafe/Makefile Sun Mar 14 19:28:19 2021 (r568410) +++ head/sysutils/passwordsafe/Makefile Sun Mar 14 19:42:04 2021 (r568411) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= passwordsafe -DISTVERSION= 1.03BETA -PORTREVISION= 3 +DISTVERSION= 1.12.0 CATEGORIES= sysutils MAINTAINER= brnrd@FreeBSD.org @@ -20,7 +19,7 @@ BUILD_DEPENDS= zip:archivers/zip CONFLICTS= pwsafe-[0-9]* -USES= gmake xorg +USES= gmake pkgconfig xorg USE_GITHUB= yes USE_WX= 3.0+ USE_XORG= x11 xtst @@ -33,6 +32,8 @@ NLS_USES= gettext YUBIKEY_LIB_DEPENDS= libykpers-1.so:security/ykpers YUBIKEY_MAKE_ENV_OFF= NO_YUBI=yes +MAKE_ENV= NO_QR=yes + GH_ACCOUNT= pwsafe GH_PROJECT= ${GH_ACCOUNT} @@ -53,8 +54,7 @@ USES+= compiler:c++11-lang post-patch: . for f in Makefile.freebsd help/Makefile.freebsd src/os/unix/Makefile \ - src/os/unix/dir.cpp src/ui/wxWidgets/pwsafeapp.cpp \ - src/ui/wxWidgets/Makefile + src/os/unix/dir.cpp src/ui/wxWidgets/Makefile ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/$f . endfor Modified: head/sysutils/passwordsafe/distinfo ============================================================================== --- head/sysutils/passwordsafe/distinfo Sun Mar 14 19:28:19 2021 (r568410) +++ head/sysutils/passwordsafe/distinfo Sun Mar 14 19:42:04 2021 (r568411) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512977443 -SHA256 (pwsafe-pwsafe-1.03BETA_GH0.tar.gz) = 36d64d748a63825cb17e247628f6a378f131d952d4c1715cc6304e4d07b3e0ed -SIZE (pwsafe-pwsafe-1.03BETA_GH0.tar.gz) = 14391644 +TIMESTAMP = 1615744771 +SHA256 (pwsafe-pwsafe-1.12.0_GH0.tar.gz) = 8d331019170f2920a28ccda08ae420c78e016f41d3ccedb7b4dba1f5f7f25bcb +SIZE (pwsafe-pwsafe-1.12.0_GH0.tar.gz) = 14937705 Copied and modified: head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp (from r568410, head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp) ============================================================================== --- head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxutils.cpp Sun Mar 14 19:28:19 2021 (r568410, copy source) +++ head/sysutils/passwordsafe/files/patch-src_ui_wxWidgets_wxUtilities.cpp Sun Mar 14 19:42:04 2021 (r568411) @@ -5,20 +5,14 @@ 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; } +--- src/ui/wxWidgets/wxUtilities.cpp.orig 2020-10-28 19:48:24 UTC ++++ src/ui/wxWidgets/wxUtilities.cpp +@@ -203,7 +203,7 @@ int pless(int* first, int* second) { return *first - * // on Fedora or Ubuntu bool IsTaskBarIconAvailable() { --#ifdef __WXGTK__ +-#if defined(__WXGTK__) +#if defined(__WXGTK__) && defined(LINUX) - const wxLinuxDistributionInfo ldi = wxGetLinuxDistributionInfo(); - if (ldi.Id.IsEmpty() || ldi.Id == wxT("Ubuntu") || ldi.Id == wxT("Fedora")) - return false; + const wxVersionInfo verInfo = wxGetLibraryVersionInfo(); + int major = verInfo.GetMajor(); + int minor = verInfo.GetMinor();