Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Mar 2019 09:36:31 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r496805 - head/security/keepassxc/files
Message-ID:  <201903250936.x2P9aVhx081995@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <polynomial-c@gentoo.org>
+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();
+ }



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