summaryrefslogtreecommitdiff
path: root/security/keepassxc
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2019-03-25 09:36:31 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2019-03-25 09:36:31 +0000
commit89e14cfcdea293110cb2e7694ed9d9b58343a14f (patch)
tree1f856123d432857ee3694173ec8fbf6fa4afb6df /security/keepassxc
parent- Add LICENSE (diff)
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
Notes
Notes: svn path=/head/; revision=496805
Diffstat (limited to 'security/keepassxc')
-rw-r--r--security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp35
1 files changed, 35 insertions, 0 deletions
diff --git a/security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp b/security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp
new file mode 100644
index 000000000000..169a8a8c8762
--- /dev/null
+++ b/security/keepassxc/files/patch-src_gui_DatabaseWidget.cpp
@@ -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();
+ }