From owner-svn-ports-all@freebsd.org Mon Mar 25 09:36:32 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B76481558D09; Mon, 25 Mar 2019 09:36:32 +0000 (UTC) (envelope-from madpilot@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E86988CD4; Mon, 25 Mar 2019 09:36:32 +0000 (UTC) (envelope-from madpilot@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 3362E5F92; Mon, 25 Mar 2019 09:36:32 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2P9aVTS081996; Mon, 25 Mar 2019 09:36:31 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2P9aVhx081995; Mon, 25 Mar 2019 09:36:31 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201903250936.x2P9aVhx081995@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 25 Mar 2019 09:36:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496805 - head/security/keepassxc/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/security/keepassxc/files X-SVN-Commit-Revision: 496805 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5E86988CD4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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, 25 Mar 2019 09:36:33 -0000 Author: madpilot Date: Mon Mar 25 09:36:31 2019 New Revision: 496805 URL: https://svnweb.freebsd.org/changeset/ports/496805 Log: Import upstream paatch which fixes build when KEESHARE is disabled. PR: 236774 Submitted by: myself Approved by: portmgr (blanket: bugfix, build/run fix) Obtained from: https://github.com/keepassxreboot/keepassxc/commit/eb9ff677d0c681a86a9ef296f5a363549b94c42c Added: head/security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp (contents, props changed) Added: head/security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp Mon Mar 25 09:36:31 2019 (r496805) @@ -0,0 +1,35 @@ +From eb9ff677d0c681a86a9ef296f5a363549b94c42c Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Wed, 20 Mar 2019 11:53:21 +0100 +Subject: [PATCH] src/gui/DatabaseWidget.cpp: Build fails without + WITH_XC_KEESHARE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp: In member function ‘void DatabaseWidget::search(const QString&)’: +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: error: ‘m_shareLabel’ was not declared in this scope + m_shareLabel->setVisible(false); + ^~~~~~~~~~~~ +/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: note: suggested alternative: ‘m_searchingLabel’ + m_shareLabel->setVisible(false); + ^~~~~~~~~~~~ + m_searchingLabel +--- + src/gui/DatabaseWidget.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp +index 8728c331f..e4196734b 100644 +--- src/gui/DatabaseWidget.cpp ++++ src/gui/DatabaseWidget.cpp +@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QString& searchtext) + } + + m_searchingLabel->setVisible(true); ++#ifdef WITH_XC_KEESHARE + m_shareLabel->setVisible(false); ++#endif + + emit searchModeActivated(); + }