* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2018-05-16 9:09 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-05-16 9:09 UTC (permalink / raw
To: gentoo-commits
commit: eaae19a90dacd1d96a8c6c28de9b1968ee77cb88
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 09:08:33 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 16 09:09:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaae19a9
app-admin/keepassxc: Fixed compilation with qt-5.11
Thanks to Markus Rathgeb for reporting the bug and providing the fix.
Closes: https://bugs.gentoo.org/655844
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch | 10 ++++++++++
app-admin/keepassxc/keepassxc-2.3.3.ebuild | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
new file mode 100644
index 00000000000..c382db5873f
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
@@ -0,0 +1,10 @@
+--- a/src/gui/entry/EditEntryWidget.cpp
++++ b/src/gui/entry/EditEntryWidget.cpp
+@@ -32,6 +32,7 @@
+ #include <QMimeData>
+ #include <QEvent>
+ #include <QColorDialog>
++#include <QButtonGroup>
+
+ #include "autotype/AutoType.h"
+ #include "core/Config.h"
diff --git a/app-admin/keepassxc/keepassxc-2.3.3.ebuild b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
index 69a10050827..3641f74e736 100644
--- a/app-admin/keepassxc/keepassxc-2.3.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
@@ -47,6 +47,10 @@ DEPEND="
dev-qt/qtconcurrent:5
"
+PATCHES=(
+ "${FILESDIR}/${P}-qt-5.11-edit-entry-widget-includes.patch" #655844
+)
+
src_prepare() {
use test || \
sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2019-03-08 13:56 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-03-08 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 1940f4b7f0d20a8bd73448e5a652e64fe7e0a100
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 13:55:42 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 13:56:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1940f4b7
app-admin/keepassxc: Don't call mandb
Closes: https://bugs.gentoo.org/679766
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/keepassxc-dont_call_mandb.patch | 25 ++++++++++++++++++++++
app-admin/keepassxc/keepassxc-2.3.3.ebuild | 3 ++-
app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild | 1 +
app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild | 4 ++++
4 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
new file mode 100644
index 00000000000..f966ae5ff28
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
@@ -0,0 +1,25 @@
+From f3e52d89b20a8740d18cd9f1124f299b64f06b36 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 8 Mar 2019 14:48:13 +0100
+Subject: [PATCH] Don't call mandb
+
+There are other man implementateions beside man-db so it is not even sure
+that the "mandb" binary even exists on all unices. Other than that, usually
+there's a cron job running "mandb" on a daily basis.
+---
+ src/cli/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index e59a911a..c3f97a2c 100644
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -94,5 +94,4 @@ endif()
+
+ if(APPLE OR UNIX)
+ install(FILES keepassxc-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
+- execute_process(COMMAND mandb -q)
+ endif()
+--
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.3.3.ebuild b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
index 3b2a5255c88..bf0e88ca357 100644
--- a/app-admin/keepassxc/keepassxc-2.3.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -49,6 +49,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${P}-qt-5.11-edit-entry-widget-includes.patch" #655844
+ "${FILESDIR}/${PN}-dont_call_mandb.patch"
)
src_prepare() {
diff --git a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
index 222a7249efa..bf07bec346a 100644
--- a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
@@ -54,6 +54,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844
+ "${FILESDIR}/${PN}-dont_call_mandb.patch"
)
src_prepare() {
diff --git a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
index 1b5f2654570..b05a5089d56 100644
--- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
@@ -57,6 +57,10 @@ PDEPEND="
x11-misc/xsel
"
+PATCHES=(
+ "${FILESDIR}/${PN}-dont_call_mandb.patch"
+)
+
src_prepare() {
use test || \
sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2019-03-20 11:01 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-03-20 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 0012625aa824c6f970d272b2fb6b67c282d2257b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 11:00:39 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 11:01:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0012625a
app-admin/keepassxc: Bump to version 2.4.0. Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-admin/keepassxc/Manifest | 2 +-
.../files/keepassxc-2.4.0-build_fix.patch | 38 ++++++++++++++++++++++
...c-2.4.0_beta2.ebuild => keepassxc-2.4.0.ebuild} | 8 ++---
3 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index a434365f41e..3cc0130cc13 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,2 @@
DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-DIST keepassxc-2.4.0_beta2.tar.gz 4740311 BLAKE2B 071edbf9d985671d70c381bd4863a704af6ad172a22fcf23ee0e12c8ea2a723029626669ed37e2e2739e3a66106b00b4c73cdbaa8e43496d950363422d6df8cc SHA512 5db8eb11a6aa42632bf2642af121063cb0df32fa1cda1beaea7c18e07c65049d3fa9a1a76643bd97ded80b7e5b2d403e9cd414c808faffdf2cb7e75c7f0578b1
+DIST keepassxc-2.4.0.tar.gz 4790634 BLAKE2B 5298baf80c48f27da16274f815dc6d83031586e3fec20356569c4d7eb652ed68f22b849595c837e736b7b3adb7636bf1f50c89626a093eecf236e3a94d89f33b SHA512 a50e90389bb53ffca28d322958c01db09472bf5e3d21075ab09db7cc1ed2e8aa0ac9ff310d79c06da4f429aef0427e3706931ce5d4d02b54a52b0209ba5ab853
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
new file mode 100644
index 00000000000..486c8e2dd9a
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
@@ -0,0 +1,38 @@
+From ff43f3ff8a8a1630d10e7117c45048623d215616 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 8728c331..e4196734 100644
+--- a/src/gui/DatabaseWidget.cpp
++++ b/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();
+ }
+--
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild b/app-admin/keepassxc/keepassxc-2.4.0.ebuild
similarity index 87%
rename from app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
rename to app-admin/keepassxc/keepassxc-2.4.0.ebuild
index 4d05c7804c8..7329f7db6fb 100644
--- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.0.ebuild
@@ -13,8 +13,8 @@ if [[ "${PV}" != 9999 ]] ; then
SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P/_/-}"
else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
else
@@ -59,6 +59,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-dont_call_mandb.patch"
+ "${FILESDIR}/${P}-build_fix.patch"
)
src_prepare() {
@@ -74,12 +75,11 @@ src_configure() {
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_HTTP=OFF
-DWITH_XC_NETWORKING="$(usex network)"
-DWITH_XC_SSHAGENT=ON
-DWITH_XC_YUBIKEY="$(usex yubikey)"
)
- if [[ "${PV}" == *_beta* ]] ; then
+ if [[ "${PV}" != 9999 ]] ; then
mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
fi
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2019-04-11 16:55 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-04-11 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 3d143186fdafa5a2041c6172845b486a55607be8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 16:52:09 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 16:55:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d143186
app-admin/keepassxc: Revbump to disable update checker
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../keepassxc-2.4.0-update_checker_toggle.patch | 444 +++++++++++++++++++++
app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild | 102 +++++
2 files changed, 546 insertions(+)
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
new file mode 100644
index 00000000000..bca65f3b4ae
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
@@ -0,0 +1,444 @@
+From 64fe9de385be43212a83c0c89791a95af203eef9 Mon Sep 17 00:00:00 2001
+From: Jonathan White <support@dmapps.us>
+Date: Tue, 9 Apr 2019 21:06:13 -0400
+Subject: [PATCH] Enhance update checker
+
+* Reduce initial update check notification to 500 ms to prevent inappropriately stealing focus from user
+* Add build flag WITH_XC_UPDATECHECK which defaults to ON
+* Update checks are resolved every 7 days instead of every time the application is started
+* Better checks for beta builds; ignore snapshots
+* Increase test cases
+---
+ CMakeLists.txt | 5 ++
+ src/CMakeLists.txt | 1 +
+ src/config-keepassx.h.cmake | 1 +
+ src/core/Clock.cpp | 1 +
+ src/gui/ApplicationSettingsWidget.cpp | 25 ++++++-
+ src/gui/ApplicationSettingsWidget.h | 1 +
+ src/gui/ApplicationSettingsWidgetGeneral.ui | 39 +++++++---
+ src/gui/MainWindow.cpp | 12 ++--
+ src/updatecheck/UpdateChecker.cpp | 79 +++++++++++++--------
+ src/updatecheck/UpdateChecker.h | 2 +-
+ tests/TestUpdateCheck.cpp | 35 ++++++---
+ 11 files changed, 146 insertions(+), 55 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 658548f7..4f8a419c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,6 +49,7 @@ option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
+ option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
+ option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
+ option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
++option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
+ if(APPLE)
+ option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
+ endif()
+@@ -76,6 +77,10 @@ else()
+ set(WITH_XC_CRYPTO_SSH OFF)
+ endif()
+
++if(WITH_XC_UPDATECHECK)
++ set(WITH_XC_NETWORKING ON)
++endif()
++
+ set(KEEPASSXC_VERSION_MAJOR "2")
+ set(KEEPASSXC_VERSION_MINOR "4")
+ set(KEEPASSXC_VERSION_PATCH "0")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 110dc606..31f29033 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -195,6 +195,7 @@ add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible wit
+ add_feature_info(KeeShare WITH_XC_KEESHARE "Sharing integration with KeeShare")
+ add_feature_info(KeeShare-Secure WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources")
+ add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
++add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
+ if(APPLE)
+ add_feature_info(TouchID WITH_XC_TOUCHID "TouchID integration")
+ endif()
+diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
+index 7d701886..2acff446 100644
+--- a/src/config-keepassx.h.cmake
++++ b/src/config-keepassx.h.cmake
+@@ -20,6 +20,7 @@
+ #cmakedefine WITH_XC_KEESHARE
+ #cmakedefine WITH_XC_KEESHARE_INSECURE
+ #cmakedefine WITH_XC_KEESHARE_SECURE
++#cmakedefine WITH_XC_UPDATECHECK
+ #cmakedefine WITH_XC_TOUCHID
+
+ #cmakedefine KEEPASSXC_BUILD_TYPE "@KEEPASSXC_BUILD_TYPE@"
+diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
+index 88ac4fb7..be9e91dc 100644
+--- a/src/core/Clock.cpp
++++ b/src/core/Clock.cpp
+@@ -30,6 +30,7 @@ QDateTime Clock::currentDateTime()
+
+ uint Clock::currentSecondsSinceEpoch()
+ {
++ // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
+ return instance().currentDateTimeImpl().toTime_t();
+ }
+
+diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
+index 90b851bd..e6a7068d 100644
+--- a/src/gui/ApplicationSettingsWidget.cpp
++++ b/src/gui/ApplicationSettingsWidget.cpp
+@@ -91,8 +91,15 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
+ m_secUi->touchIDResetSpinBox, SLOT(setEnabled(bool)));
+ // clang-format on
+
+-#ifndef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
++ connect(m_generalUi->checkForUpdatesOnStartupCheckBox, SIGNAL(toggled(bool)), SLOT(checkUpdatesToggled(bool)));
++#else
+ m_generalUi->checkForUpdatesOnStartupCheckBox->setVisible(false);
++ m_generalUi->checkForUpdatesIncludeBetasCheckBox->setVisible(false);
++ m_generalUi->checkUpdatesSpacer->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
++#endif
++
++#ifndef WITH_XC_NETWORKING
+ m_secUi->privacy->setVisible(false);
+ #endif
+
+@@ -336,3 +343,19 @@ void ApplicationSettingsWidget::enableToolbarSettings(bool checked)
+ m_generalUi->toolButtonStyleComboBox->setEnabled(!checked);
+ m_generalUi->toolButtonStyleLabel->setEnabled(!checked);
+ }
++
++void ApplicationSettingsWidget::rememberDatabasesToggled(bool checked)
++{
++ if (!checked) {
++ m_generalUi->rememberLastKeyFilesCheckBox->setChecked(false);
++ m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(false);
++ }
++
++ m_generalUi->rememberLastKeyFilesCheckBox->setEnabled(checked);
++ m_generalUi->openPreviousDatabasesOnStartupCheckBox->setEnabled(checked);
++}
++
++void ApplicationSettingsWidget::checkUpdatesToggled(bool checked)
++{
++ m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
++}
+diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h
+index ffcfea2b..8cdc7ed7 100644
+--- a/src/gui/ApplicationSettingsWidget.h
++++ b/src/gui/ApplicationSettingsWidget.h
+@@ -56,6 +56,7 @@ private slots:
+ void autoSaveToggled(bool checked);
+ void systrayToggled(bool checked);
+ void enableToolbarSettings(bool checked);
++ void checkUpdatesToggled(bool checked);
+
+ private:
+ QWidget* const m_secWidget;
+diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
+index 798971bf..678b55fa 100644
+--- a/src/gui/ApplicationSettingsWidgetGeneral.ui
++++ b/src/gui/ApplicationSettingsWidgetGeneral.ui
+@@ -86,10 +86,40 @@
+ <item>
+ <widget class="QCheckBox" name="checkForUpdatesOnStartupCheckBox">
+ <property name="text">
+- <string>Check for updates at application startup</string>
++ <string>Check for updates at application startup once per week</string>
+ </property>
+ </widget>
+ </item>
++ <item>
++ <layout class="QHBoxLayout" name="checkUpdatesSubLayout">
++ <property name="spacing">
++ <number>0</number>
++ </property>
++ <item>
++ <spacer name="checkUpdatesSpacer">
++ <property name="orientation">
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeType">
++ <enum>QSizePolicy::Fixed</enum>
++ </property>
++ <property name="sizeHint" stdset="0">
++ <size>
++ <width>20</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item>
++ <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
++ <property name="text">
++ <string>Include beta releases when checking for updates</string>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </item>
+ </layout>
+ </widget>
+ </item>
+@@ -186,13 +216,6 @@
+ <string>General</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+- <item>
+- <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
+- <property name="text">
+- <string>Include pre-releases when checking for updates</string>
+- </property>
+- </widget>
+- </item>
+ <item>
+ <widget class="QCheckBox" name="toolbarHideCheckBox">
+ <property name="text">
+diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
+index 6e3c96af..6776a59d 100644
+--- a/src/gui/MainWindow.cpp
++++ b/src/gui/MainWindow.cpp
+@@ -41,7 +41,7 @@
+ #include "keys/FileKey.h"
+ #include "keys/PasswordKey.h"
+
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ #include "gui/MessageBox.h"
+ #include "gui/UpdateCheckDialog.h"
+ #include "updatecheck/UpdateChecker.h"
+@@ -372,12 +372,12 @@ MainWindow::MainWindow()
+ setUnifiedTitleAndToolBarOnMac(true);
+ #endif
+
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog()));
+ connect(UpdateChecker::instance(),
+ SIGNAL(updateCheckFinished(bool, QString, bool)),
+ SLOT(hasUpdateAvailable(bool, QString, bool)));
+- QTimer::singleShot(3000, this, SLOT(showUpdateCheckStartup()));
++ QTimer::singleShot(500, this, SLOT(showUpdateCheckStartup()));
+ #else
+ m_ui->actionCheckForUpdates->setVisible(false);
+ #endif
+@@ -687,7 +687,7 @@ void MainWindow::showAboutDialog()
+
+ void MainWindow::showUpdateCheckStartup()
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ if (!config()->get("UpdateCheckMessageShown", false).toBool()) {
+ auto result =
+ MessageBox::question(this,
+@@ -710,7 +710,7 @@ void MainWindow::showUpdateCheckStartup()
+
+ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool isManuallyRequested)
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ if (hasUpdate && !isManuallyRequested) {
+ auto* updateCheckDialog = new UpdateCheckDialog(this);
+ updateCheckDialog->showUpdateCheckResponse(hasUpdate, version);
+@@ -725,7 +725,7 @@ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool
+
+ void MainWindow::showUpdateCheckDialog()
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ updateCheck()->checkForUpdates(true);
+ auto* updateCheckDialog = new UpdateCheckDialog(this);
+ updateCheckDialog->show();
+diff --git a/src/updatecheck/UpdateChecker.cpp b/src/updatecheck/UpdateChecker.cpp
+index 4272410b..14531290 100644
+--- a/src/updatecheck/UpdateChecker.cpp
++++ b/src/updatecheck/UpdateChecker.cpp
+@@ -17,6 +17,7 @@
+
+ #include "UpdateChecker.h"
+ #include "config-keepassx.h"
++#include "core/Clock.h"
+ #include "core/Config.h"
+ #include <QJsonObject>
+ #include <QNetworkAccessManager>
+@@ -38,24 +39,28 @@ UpdateChecker::~UpdateChecker()
+
+ void UpdateChecker::checkForUpdates(bool manuallyRequested)
+ {
++ auto nextCheck = config()->get("GUI/CheckForUpdatesNextCheck", 0).toULongLong();
+ m_isManuallyRequested = manuallyRequested;
+- m_bytesReceived.clear();
+
+- QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
++ if (m_isManuallyRequested || Clock::currentSecondsSinceEpoch() >= nextCheck) {
++ m_bytesReceived.clear();
+
+- if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
+- apiUrlStr += "/latest";
+- }
++ QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
++
++ if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
++ apiUrlStr += "/latest";
++ }
+
+- QUrl apiUrl = QUrl(apiUrlStr);
++ QUrl apiUrl = QUrl(apiUrlStr);
+
+- QNetworkRequest request(apiUrl);
+- request.setRawHeader("Accept", "application/json");
++ QNetworkRequest request(apiUrl);
++ request.setRawHeader("Accept", "application/json");
+
+- m_reply = m_netMgr->get(request);
++ m_reply = m_netMgr->get(request);
+
+- connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
+- connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
++ connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
++ connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
++ }
+ }
+
+ void UpdateChecker::fetchReadyRead()
+@@ -84,8 +89,12 @@ void UpdateChecker::fetchFinished()
+
+ if (!jsonObject.value("tag_name").isUndefined()) {
+ version = jsonObject.value("tag_name").toString();
+- hasNewVersion = compareVersions(version, QString(KEEPASSXC_VERSION));
++ hasNewVersion = compareVersions(QString(KEEPASSXC_VERSION), version);
+ }
++
++ // Check again in 7 days
++ // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
++ config()->set("GUI/CheckForUpdatesNextCheck", Clock::currentDateTime().addDays(7).toTime_t());
+ } else {
+ version = "error";
+ }
+@@ -93,38 +102,46 @@ void UpdateChecker::fetchFinished()
+ emit updateCheckFinished(hasNewVersion, version, m_isManuallyRequested);
+ }
+
+-bool UpdateChecker::compareVersions(const QString& remoteVersion, const QString& localVersion)
++bool UpdateChecker::compareVersions(const QString& localVersion, const QString& remoteVersion)
+ {
++ // Quick full-string equivalence check
+ if (localVersion == remoteVersion) {
+- return false; // Currently using updated version
++ return false;
+ }
+
+- QRegularExpression verRegex("^(\\d+(\\.\\d+){0,2})(-\\w+)?$", QRegularExpression::CaseInsensitiveOption);
++ QRegularExpression verRegex(R"(^((?:\d+\.){2}\d+)(?:-(\w+?)(\d+)?)?$)");
+
+- QRegularExpressionMatch lmatch = verRegex.match(localVersion);
+- QRegularExpressionMatch rmatch = verRegex.match(remoteVersion);
++ auto lmatch = verRegex.match(localVersion);
++ auto rmatch = verRegex.match(remoteVersion);
+
+- if (!lmatch.captured(1).isNull() && !rmatch.captured(1).isNull()) {
+- if (lmatch.captured(1) == rmatch.captured(1) && !lmatch.captured(3).isNull()) {
+- // Same version, but installed version has snapshot/beta suffix and should be updated to stable
+- return true;
+- }
++ auto lVersion = lmatch.captured(1).split(".");
++ auto lSuffix = lmatch.captured(2);
++ auto lBetaNum = lmatch.captured(3);
+
+- QStringList lparts = lmatch.captured(1).split(".");
+- QStringList rparts = rmatch.captured(1).split(".");
++ auto rVersion = rmatch.captured(1).split(".");
++ auto rSuffix = rmatch.captured(2);
++ auto rBetaNum = rmatch.captured(3);
+
+- if (lparts.length() < 3)
+- lparts << "0";
++ if (!lVersion.isEmpty() && !rVersion.isEmpty()) {
++ if (lSuffix.compare("snapshot", Qt::CaseInsensitive) == 0) {
++ // Snapshots are not checked for version updates
++ return false;
++ }
+
+- if (rparts.length() < 3)
+- rparts << "0";
++ // Check "-beta[X]" versions
++ if (lVersion == rVersion && !lSuffix.isEmpty()) {
++ // Check if stable version has been released or new beta is available
++ // otherwise the version numbers are equal
++ return rSuffix.isEmpty() || lBetaNum.toInt() < rBetaNum.toInt();
++ }
+
+ for (int i = 0; i < 3; i++) {
+- int l = lparts[i].toInt();
+- int r = rparts[i].toInt();
++ int l = lVersion[i].toInt();
++ int r = rVersion[i].toInt();
+
+- if (l == r)
++ if (l == r) {
+ continue;
++ }
+
+ if (l > r) {
+ return false; // Installed version is newer than release
+diff --git a/src/updatecheck/UpdateChecker.h b/src/updatecheck/UpdateChecker.h
+index ac6471d6..64430bda 100644
+--- a/src/updatecheck/UpdateChecker.h
++++ b/src/updatecheck/UpdateChecker.h
+@@ -31,7 +31,7 @@ public:
+ ~UpdateChecker() override;
+
+ void checkForUpdates(bool manuallyRequested);
+- static bool compareVersions(const QString& remoteVersion, const QString& localVersion);
++ static bool compareVersions(const QString& localVersion, const QString& remoteVersion);
+ static UpdateChecker* instance();
+
+ signals:
+diff --git a/tests/TestUpdateCheck.cpp b/tests/TestUpdateCheck.cpp
+index 8cba43b1..ff709cd5 100644
+--- a/tests/TestUpdateCheck.cpp
++++ b/tests/TestUpdateCheck.cpp
+@@ -29,13 +29,32 @@ void TestUpdateCheck::initTestCase()
+
+ void TestUpdateCheck::testCompareVersion()
+ {
+- // Remote Version , Installed Version
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), true);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.4.0")), false);
++ // No upgrade
+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0")), false);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), true);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), true);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0-snapshot")), false);
+- QCOMPARE(UpdateChecker::compareVersions(QString("invalid"), QString("2.4.0")), false);
+- QCOMPARE(UpdateChecker::compareVersions(QString(""), QString("2.4.0")), false);
++
++ // First digit upgrade
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("3.0.0")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("3.0.0"), QString("2.4.0")), false);
++
++ // Second digit upgrade
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), false);
++
++ // Third digit upgrade
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.1"), QString("2.3.0")), false);
++
++ // Beta builds
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1-beta1")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta"), QString("2.3.0-beta1")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta2")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), false);
++
++ // Snapshot and invalid data
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4-snapshot"), QString("2.4.0")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("invalid")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("")), false);
+ }
+--
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
new file mode 100644
index 00000000000..1b2e8923803
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug network test yubikey"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ browser? ( >=dev-libs/libsodium-1.0.12 )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qttest:5
+ dev-qt/qtconcurrent:5
+"
+
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+ x11-misc/xsel
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-dont_call_mandb.patch"
+ "${FILESDIR}/${P}-build_fix.patch"
+ "${FILESDIR}/${P}-update_checker_toggle.patch"
+)
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake-utils_src_configure
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2019-06-03 12:22 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2019-06-03 12:22 UTC (permalink / raw
To: gentoo-commits
commit: a4f4108bd01a1ae114efd10ef0d97bd5948347b5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 12:22:02 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 12:22:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f4108b
app-admin/keepassxc: Removed old.
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-admin/keepassxc/Manifest | 1 -
.../files/keepassxc-2.4.0-build_fix.patch | 38 --
.../keepassxc-2.4.0-update_checker_toggle.patch | 445 ---------------------
app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild | 102 -----
4 files changed, 586 deletions(-)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index b5e380200e8..665ab5adedb 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,3 @@
DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-DIST keepassxc-2.4.0-src.tar.xz 3252104 BLAKE2B 7c82822f6fb0eaf6b5d086aebdf4927af215339f92e7f52104e05d5ff301461a1ad816d8a39b377c717e975001c9295ec6d8b2f2003a2215c05931eb9acb5c73 SHA512 b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559
DIST keepassxc-2.4.1-src.tar.xz 3277856 BLAKE2B 64ed15987f26fd884db8fec9dc8e5d9ecd1ab9c298c2c35ee41f5aacd51bf3cd512c8ca0370ccc294d4f1ac6214678d2a3a4d8c47441c01ae8e858252018ec97 SHA512 4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502
DIST keepassxc-2.4.2-src.tar.xz 3290468 BLAKE2B bcb4974729c771073b6ccf4f5af5ac94a237c349dacc10be5db698630e4fc8fc226a6911957c1ea4723dfce9aa348c11588aa1e5927487cdd36d9c8bae0d7758 SHA512 4ad7e559a36831ad715672d3cddcd3becd4f39847b7ad4451d920c76671e607f8ec9d65ed6f5450dd95e037d129cafe8faff8c1ecd9d20a22fed2c72b2dde9f2
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
deleted file mode 100644
index 486c8e2dd9a..00000000000
--- a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ff43f3ff8a8a1630d10e7117c45048623d215616 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 8728c331..e4196734 100644
---- a/src/gui/DatabaseWidget.cpp
-+++ b/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();
- }
---
-2.21.0
-
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
deleted file mode 100644
index 64e02066916..00000000000
--- a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
+++ /dev/null
@@ -1,445 +0,0 @@
-From 28994fef0d2c04690490f34b5da87c42e60a6b5e Mon Sep 17 00:00:00 2001
-From: Jonathan White <support@dmapps.us>
-Date: Tue, 9 Apr 2019 21:06:13 -0400
-Subject: [PATCH] Enhance update checker
-
-* Reduce initial update check notification to 500 ms to prevent inappropriately stealing focus from user
-* Add build flag WITH_XC_UPDATECHECK which defaults to ON
-* Update checks are resolved every 7 days instead of every time the application is started
-* Better checks for beta builds; ignore snapshots
-* Increase test cases
----
- CMakeLists.txt | 5 ++
- src/CMakeLists.txt | 1 +
- src/config-keepassx.h.cmake | 1 +
- src/core/Clock.cpp | 1 +
- src/gui/ApplicationSettingsWidget.cpp | 25 ++++++-
- src/gui/ApplicationSettingsWidget.h | 2 +
- src/gui/ApplicationSettingsWidgetGeneral.ui | 39 +++++++---
- src/gui/MainWindow.cpp | 12 ++--
- src/updatecheck/UpdateChecker.cpp | 79 +++++++++++++--------
- src/updatecheck/UpdateChecker.h | 2 +-
- tests/TestUpdateCheck.cpp | 35 ++++++---
- 11 files changed, 147 insertions(+), 55 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 658548f7..4f8a419c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,6 +49,7 @@ option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
- option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
- option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
- option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
-+option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
- if(APPLE)
- option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
- endif()
-@@ -76,6 +77,10 @@ else()
- set(WITH_XC_CRYPTO_SSH OFF)
- endif()
-
-+if(WITH_XC_UPDATECHECK)
-+ set(WITH_XC_NETWORKING ON)
-+endif()
-+
- set(KEEPASSXC_VERSION_MAJOR "2")
- set(KEEPASSXC_VERSION_MINOR "4")
- set(KEEPASSXC_VERSION_PATCH "0")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 110dc606..31f29033 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -195,6 +195,7 @@ add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible wit
- add_feature_info(KeeShare WITH_XC_KEESHARE "Sharing integration with KeeShare")
- add_feature_info(KeeShare-Secure WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources")
- add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
-+add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
- if(APPLE)
- add_feature_info(TouchID WITH_XC_TOUCHID "TouchID integration")
- endif()
-diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
-index 7d701886..2acff446 100644
---- a/src/config-keepassx.h.cmake
-+++ b/src/config-keepassx.h.cmake
-@@ -20,6 +20,7 @@
- #cmakedefine WITH_XC_KEESHARE
- #cmakedefine WITH_XC_KEESHARE_INSECURE
- #cmakedefine WITH_XC_KEESHARE_SECURE
-+#cmakedefine WITH_XC_UPDATECHECK
- #cmakedefine WITH_XC_TOUCHID
-
- #cmakedefine KEEPASSXC_BUILD_TYPE "@KEEPASSXC_BUILD_TYPE@"
-diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
-index 88ac4fb7..be9e91dc 100644
---- a/src/core/Clock.cpp
-+++ b/src/core/Clock.cpp
-@@ -30,6 +30,7 @@ QDateTime Clock::currentDateTime()
-
- uint Clock::currentSecondsSinceEpoch()
- {
-+ // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
- return instance().currentDateTimeImpl().toTime_t();
- }
-
-diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
-index 90b851bd..e6a7068d 100644
---- a/src/gui/ApplicationSettingsWidget.cpp
-+++ b/src/gui/ApplicationSettingsWidget.cpp
-@@ -91,8 +91,15 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
- m_secUi->touchIDResetSpinBox, SLOT(setEnabled(bool)));
- // clang-format on
-
--#ifndef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
-+ connect(m_generalUi->checkForUpdatesOnStartupCheckBox, SIGNAL(toggled(bool)), SLOT(checkUpdatesToggled(bool)));
-+#else
- m_generalUi->checkForUpdatesOnStartupCheckBox->setVisible(false);
-+ m_generalUi->checkForUpdatesIncludeBetasCheckBox->setVisible(false);
-+ m_generalUi->checkUpdatesSpacer->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
-+#endif
-+
-+#ifndef WITH_XC_NETWORKING
- m_secUi->privacy->setVisible(false);
- #endif
-
-@@ -336,3 +343,19 @@ void ApplicationSettingsWidget::enableToolbarSettings(bool checked)
- m_generalUi->toolButtonStyleComboBox->setEnabled(!checked);
- m_generalUi->toolButtonStyleLabel->setEnabled(!checked);
- }
-+
-+void ApplicationSettingsWidget::rememberDatabasesToggled(bool checked)
-+{
-+ if (!checked) {
-+ m_generalUi->rememberLastKeyFilesCheckBox->setChecked(false);
-+ m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(false);
-+ }
-+
-+ m_generalUi->rememberLastKeyFilesCheckBox->setEnabled(checked);
-+ m_generalUi->openPreviousDatabasesOnStartupCheckBox->setEnabled(checked);
-+}
-+
-+void ApplicationSettingsWidget::checkUpdatesToggled(bool checked)
-+{
-+ m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
-+}
-diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h
-index ffcfea2b..86688b70 100644
---- a/src/gui/ApplicationSettingsWidget.h
-+++ b/src/gui/ApplicationSettingsWidget.h
-@@ -56,6 +56,8 @@ private slots:
- void autoSaveToggled(bool checked);
- void systrayToggled(bool checked);
- void enableToolbarSettings(bool checked);
-+ void rememberDatabasesToggled(bool checked);
-+ void checkUpdatesToggled(bool checked);
-
- private:
- QWidget* const m_secWidget;
-diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
-index 798971bf..678b55fa 100644
---- a/src/gui/ApplicationSettingsWidgetGeneral.ui
-+++ b/src/gui/ApplicationSettingsWidgetGeneral.ui
-@@ -86,10 +86,40 @@
- <item>
- <widget class="QCheckBox" name="checkForUpdatesOnStartupCheckBox">
- <property name="text">
-- <string>Check for updates at application startup</string>
-+ <string>Check for updates at application startup once per week</string>
- </property>
- </widget>
- </item>
-+ <item>
-+ <layout class="QHBoxLayout" name="checkUpdatesSubLayout">
-+ <property name="spacing">
-+ <number>0</number>
-+ </property>
-+ <item>
-+ <spacer name="checkUpdatesSpacer">
-+ <property name="orientation">
-+ <enum>Qt::Horizontal</enum>
-+ </property>
-+ <property name="sizeType">
-+ <enum>QSizePolicy::Fixed</enum>
-+ </property>
-+ <property name="sizeHint" stdset="0">
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
-+ </property>
-+ </spacer>
-+ </item>
-+ <item>
-+ <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
-+ <property name="text">
-+ <string>Include beta releases when checking for updates</string>
-+ </property>
-+ </widget>
-+ </item>
-+ </layout>
-+ </item>
- </layout>
- </widget>
- </item>
-@@ -186,13 +216,6 @@
- <string>General</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_7">
-- <item>
-- <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
-- <property name="text">
-- <string>Include pre-releases when checking for updates</string>
-- </property>
-- </widget>
-- </item>
- <item>
- <widget class="QCheckBox" name="toolbarHideCheckBox">
- <property name="text">
-diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
-index 6e3c96af..6776a59d 100644
---- a/src/gui/MainWindow.cpp
-+++ b/src/gui/MainWindow.cpp
-@@ -41,7 +41,7 @@
- #include "keys/FileKey.h"
- #include "keys/PasswordKey.h"
-
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
- #include "gui/MessageBox.h"
- #include "gui/UpdateCheckDialog.h"
- #include "updatecheck/UpdateChecker.h"
-@@ -372,12 +372,12 @@ MainWindow::MainWindow()
- setUnifiedTitleAndToolBarOnMac(true);
- #endif
-
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
- connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog()));
- connect(UpdateChecker::instance(),
- SIGNAL(updateCheckFinished(bool, QString, bool)),
- SLOT(hasUpdateAvailable(bool, QString, bool)));
-- QTimer::singleShot(3000, this, SLOT(showUpdateCheckStartup()));
-+ QTimer::singleShot(500, this, SLOT(showUpdateCheckStartup()));
- #else
- m_ui->actionCheckForUpdates->setVisible(false);
- #endif
-@@ -687,7 +687,7 @@ void MainWindow::showAboutDialog()
-
- void MainWindow::showUpdateCheckStartup()
- {
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
- if (!config()->get("UpdateCheckMessageShown", false).toBool()) {
- auto result =
- MessageBox::question(this,
-@@ -710,7 +710,7 @@ void MainWindow::showUpdateCheckStartup()
-
- void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool isManuallyRequested)
- {
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
- if (hasUpdate && !isManuallyRequested) {
- auto* updateCheckDialog = new UpdateCheckDialog(this);
- updateCheckDialog->showUpdateCheckResponse(hasUpdate, version);
-@@ -725,7 +725,7 @@ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool
-
- void MainWindow::showUpdateCheckDialog()
- {
--#ifdef WITH_XC_NETWORKING
-+#ifdef WITH_XC_UPDATECHECK
- updateCheck()->checkForUpdates(true);
- auto* updateCheckDialog = new UpdateCheckDialog(this);
- updateCheckDialog->show();
-diff --git a/src/updatecheck/UpdateChecker.cpp b/src/updatecheck/UpdateChecker.cpp
-index 4272410b..14531290 100644
---- a/src/updatecheck/UpdateChecker.cpp
-+++ b/src/updatecheck/UpdateChecker.cpp
-@@ -17,6 +17,7 @@
-
- #include "UpdateChecker.h"
- #include "config-keepassx.h"
-+#include "core/Clock.h"
- #include "core/Config.h"
- #include <QJsonObject>
- #include <QNetworkAccessManager>
-@@ -38,24 +39,28 @@ UpdateChecker::~UpdateChecker()
-
- void UpdateChecker::checkForUpdates(bool manuallyRequested)
- {
-+ auto nextCheck = config()->get("GUI/CheckForUpdatesNextCheck", 0).toULongLong();
- m_isManuallyRequested = manuallyRequested;
-- m_bytesReceived.clear();
-
-- QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
-+ if (m_isManuallyRequested || Clock::currentSecondsSinceEpoch() >= nextCheck) {
-+ m_bytesReceived.clear();
-
-- if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
-- apiUrlStr += "/latest";
-- }
-+ QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
-+
-+ if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
-+ apiUrlStr += "/latest";
-+ }
-
-- QUrl apiUrl = QUrl(apiUrlStr);
-+ QUrl apiUrl = QUrl(apiUrlStr);
-
-- QNetworkRequest request(apiUrl);
-- request.setRawHeader("Accept", "application/json");
-+ QNetworkRequest request(apiUrl);
-+ request.setRawHeader("Accept", "application/json");
-
-- m_reply = m_netMgr->get(request);
-+ m_reply = m_netMgr->get(request);
-
-- connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
-- connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
-+ connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
-+ connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
-+ }
- }
-
- void UpdateChecker::fetchReadyRead()
-@@ -84,8 +89,12 @@ void UpdateChecker::fetchFinished()
-
- if (!jsonObject.value("tag_name").isUndefined()) {
- version = jsonObject.value("tag_name").toString();
-- hasNewVersion = compareVersions(version, QString(KEEPASSXC_VERSION));
-+ hasNewVersion = compareVersions(QString(KEEPASSXC_VERSION), version);
- }
-+
-+ // Check again in 7 days
-+ // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
-+ config()->set("GUI/CheckForUpdatesNextCheck", Clock::currentDateTime().addDays(7).toTime_t());
- } else {
- version = "error";
- }
-@@ -93,38 +102,46 @@ void UpdateChecker::fetchFinished()
- emit updateCheckFinished(hasNewVersion, version, m_isManuallyRequested);
- }
-
--bool UpdateChecker::compareVersions(const QString& remoteVersion, const QString& localVersion)
-+bool UpdateChecker::compareVersions(const QString& localVersion, const QString& remoteVersion)
- {
-+ // Quick full-string equivalence check
- if (localVersion == remoteVersion) {
-- return false; // Currently using updated version
-+ return false;
- }
-
-- QRegularExpression verRegex("^(\\d+(\\.\\d+){0,2})(-\\w+)?$", QRegularExpression::CaseInsensitiveOption);
-+ QRegularExpression verRegex(R"(^((?:\d+\.){2}\d+)(?:-(\w+?)(\d+)?)?$)");
-
-- QRegularExpressionMatch lmatch = verRegex.match(localVersion);
-- QRegularExpressionMatch rmatch = verRegex.match(remoteVersion);
-+ auto lmatch = verRegex.match(localVersion);
-+ auto rmatch = verRegex.match(remoteVersion);
-
-- if (!lmatch.captured(1).isNull() && !rmatch.captured(1).isNull()) {
-- if (lmatch.captured(1) == rmatch.captured(1) && !lmatch.captured(3).isNull()) {
-- // Same version, but installed version has snapshot/beta suffix and should be updated to stable
-- return true;
-- }
-+ auto lVersion = lmatch.captured(1).split(".");
-+ auto lSuffix = lmatch.captured(2);
-+ auto lBetaNum = lmatch.captured(3);
-
-- QStringList lparts = lmatch.captured(1).split(".");
-- QStringList rparts = rmatch.captured(1).split(".");
-+ auto rVersion = rmatch.captured(1).split(".");
-+ auto rSuffix = rmatch.captured(2);
-+ auto rBetaNum = rmatch.captured(3);
-
-- if (lparts.length() < 3)
-- lparts << "0";
-+ if (!lVersion.isEmpty() && !rVersion.isEmpty()) {
-+ if (lSuffix.compare("snapshot", Qt::CaseInsensitive) == 0) {
-+ // Snapshots are not checked for version updates
-+ return false;
-+ }
-
-- if (rparts.length() < 3)
-- rparts << "0";
-+ // Check "-beta[X]" versions
-+ if (lVersion == rVersion && !lSuffix.isEmpty()) {
-+ // Check if stable version has been released or new beta is available
-+ // otherwise the version numbers are equal
-+ return rSuffix.isEmpty() || lBetaNum.toInt() < rBetaNum.toInt();
-+ }
-
- for (int i = 0; i < 3; i++) {
-- int l = lparts[i].toInt();
-- int r = rparts[i].toInt();
-+ int l = lVersion[i].toInt();
-+ int r = rVersion[i].toInt();
-
-- if (l == r)
-+ if (l == r) {
- continue;
-+ }
-
- if (l > r) {
- return false; // Installed version is newer than release
-diff --git a/src/updatecheck/UpdateChecker.h b/src/updatecheck/UpdateChecker.h
-index ac6471d6..64430bda 100644
---- a/src/updatecheck/UpdateChecker.h
-+++ b/src/updatecheck/UpdateChecker.h
-@@ -31,7 +31,7 @@ public:
- ~UpdateChecker() override;
-
- void checkForUpdates(bool manuallyRequested);
-- static bool compareVersions(const QString& remoteVersion, const QString& localVersion);
-+ static bool compareVersions(const QString& localVersion, const QString& remoteVersion);
- static UpdateChecker* instance();
-
- signals:
-diff --git a/tests/TestUpdateCheck.cpp b/tests/TestUpdateCheck.cpp
-index 8cba43b1..ff709cd5 100644
---- a/tests/TestUpdateCheck.cpp
-+++ b/tests/TestUpdateCheck.cpp
-@@ -29,13 +29,32 @@ void TestUpdateCheck::initTestCase()
-
- void TestUpdateCheck::testCompareVersion()
- {
-- // Remote Version , Installed Version
-- QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), true);
-- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.4.0")), false);
-+ // No upgrade
- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0")), false);
-- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), true);
-- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), true);
-- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0-snapshot")), false);
-- QCOMPARE(UpdateChecker::compareVersions(QString("invalid"), QString("2.4.0")), false);
-- QCOMPARE(UpdateChecker::compareVersions(QString(""), QString("2.4.0")), false);
-+
-+ // First digit upgrade
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("3.0.0")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("3.0.0"), QString("2.4.0")), false);
-+
-+ // Second digit upgrade
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), false);
-+
-+ // Third digit upgrade
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.1"), QString("2.3.0")), false);
-+
-+ // Beta builds
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), false);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1-beta1")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta"), QString("2.3.0-beta1")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta")), false);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta2")), true);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), false);
-+
-+ // Snapshot and invalid data
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4-snapshot"), QString("2.4.0")), false);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("invalid")), false);
-+ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("")), false);
- }
---
-2.21.0
-
diff --git a/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
deleted file mode 100644
index 1b2e8923803..00000000000
--- a/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser debug network test yubikey"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/zlib
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- browser? ( >=dev-libs/libsodium-1.0.12 )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
- dev-qt/qtconcurrent:5
-"
-
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
- x11-misc/xsel
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-dont_call_mandb.patch"
- "${FILESDIR}/${P}-build_fix.patch"
- "${FILESDIR}/${P}-update_checker_toggle.patch"
-)
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2020-10-22 7:02 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-10-22 7:02 UTC (permalink / raw
To: gentoo-commits
commit: 64fe952caa63f4916a5e2f704ebd5306ff00198f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 07:02:27 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 07:02:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64fe952c
app-admin/keepassxc: Removed old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-admin/keepassxc/Manifest | 2 -
.../files/keepassxc-2.5.2-ccache_switch.patch | 59 -------------
app-admin/keepassxc/keepassxc-2.5.4.ebuild | 97 ----------------------
app-admin/keepassxc/keepassxc-2.6.0.ebuild | 90 --------------------
4 files changed, 248 deletions(-)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index fce57717135..d0348241f3e 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,2 @@
-DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd SHA512 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
-DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399 SHA512 c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17
DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf SHA512 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
diff --git a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
deleted file mode 100644
index 57d8b3d714c..00000000000
--- a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ae471bea14c8e05bcf368168649399b116a69992 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 7 Jan 2020 17:44:08 -0500
-Subject: [PATCH] CMakeLists.txt: Do not unconditionally use ccache
-
-This causes build failures in Gentoo because we don't allow access to ccache files if ccache is not enabled for build.
-
-Fix this by adding a WITH_CCACHE cmake option and change behavior so that cmake fails if WITH_CCACHE is enabled but ccache program cannot be found.
-
-Gentoo-bug: https://bugs.gentoo.org/704560
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- CMakeLists.txt | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2f9b5bfe..1c5746c59 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,13 +27,6 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
-
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
--# Use the Compiler Cache (ccache) if it is installed
--# (install with: sudo apt get ccache)
--find_program (CCACHE_FOUND ccache)
--if (CCACHE_FOUND)
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
--endif (CCACHE_FOUND)
--
- # Support Visual Studio Code
- include(CMakeToolsHelpers OPTIONAL)
- include(FeatureSummary)
-@@ -48,6 +41,7 @@ option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated
- option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
- option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
- option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
-+option(WITH_CCACHE "Use ccache for build" OFF)
-
- set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins")
-
-@@ -65,6 +59,17 @@ if(APPLE)
- option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
- endif()
-
-+if(WITH_CCACHE)
-+ # Use the Compiler Cache (ccache) program
-+ # (install with: sudo apt get ccache)
-+ find_program (CCACHE_FOUND ccache)
-+ if(CCACHE_FOUND)
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-+ else()
-+ message(FATAL_ERROR "ccache requested but cannot be found.")
-+ endif()
-+endif()
-+
- if(WITH_XC_ALL)
- # Enable all options (except update check)
- set(WITH_XC_AUTOTYPE ON)
diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
deleted file mode 100644
index 80d797e0a23..00000000000
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- >=dev-libs/libsodium-1.0.12:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/readline:0=
- sys-libs/zlib:=
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- keeshare? ( dev-libs/quazip )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
-"
-BDEPEND="
- ccache? ( dev-util/ccache )
-"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
- x11-misc/xsel
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
-)
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_FDOSECRETS=ON
- -DWITH_XC_KEESHARE="$(usex keeshare)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.6.0.ebuild b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
deleted file mode 100644
index a6d25729d32..00000000000
--- a/app-admin/keepassxc/keepassxc-2.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- >=dev-libs/libsodium-1.0.12:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/readline:0=
- sys-libs/zlib:=
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- keeshare? ( dev-libs/quazip )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
-"
-BDEPEND="
- ccache? ( dev-util/ccache )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_DOCS=OFF
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_FDOSECRETS=ON
- -DWITH_XC_KEESHARE="$(usex keeshare)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2022-10-26 13:40 Maciej Barć
0 siblings, 0 replies; 8+ messages in thread
From: Maciej Barć @ 2022-10-26 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 98a9e1bb66465f35d24eb9ee564277ecd782aed4
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 13:29:22 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 13:35:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a9e1bb
app-admin/keepassxc: bump to 2.7.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-admin/keepassxc/Manifest | 1 +
.../keepassxc/files/keepassxc-2.7.3-tests.patch | 14 +++
app-admin/keepassxc/keepassxc-2.7.3.ebuild | 101 +++++++++++++++++++++
3 files changed, 116 insertions(+)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f0479c7ab83a..b05501f8dc26 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1 +1,2 @@
DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
+DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
new file mode 100644
index 000000000000..52ca2b7eb610
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.3-tests.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 776c40d9..477bf179 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -233,9 +233,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+- LIBS testsupport cli ${TEST_LIBRARIES})
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)
diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
new file mode 100644
index 000000000000..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/"
+
+if [[ "${PV}" != *9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/botan:2=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ X? ( dev-qt/qtx11extras:5 )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ keeshare? ( sys-libs/zlib:=[minizip] )
+ yubikey? (
+ dev-libs/libusb:1
+ sys-apps/pcsc-lite
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+ printf '%s' "${PV}" > .version || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # https://github.com/keepassxreboot/keepassxc/issues/5801
+ filter-flags -flto*
+
+ local mycmakeargs=(
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS="$(usex doc)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_FDOSECRETS=ON
+ -DWITH_XC_KEESHARE="$(usex keeshare)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ -DWITH_XC_X11="$(usex X)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/
@ 2022-10-30 1:14 Maciej Barć
0 siblings, 0 replies; 8+ messages in thread
From: Maciej Barć @ 2022-10-30 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 4dcc7a47101df332b9a15face741c68901d0a525
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 01:12:52 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 01:14:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dcc7a47
app-admin/keepassxc: bump to 2.7.4
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-admin/keepassxc/Manifest | 1 +
.../keepassxc/files/keepassxc-2.7.4-tests.patch | 13 +++
app-admin/keepassxc/keepassxc-2.7.4.ebuild | 101 +++++++++++++++++++++
3 files changed, 115 insertions(+)
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index b05501f8dc26..40e3c23e67d0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,2 +1,3 @@
DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
new file mode 100644
index 000000000000..ccee26cb5ba9
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER)
+ LIBS ${TEST_LIBRARIES})
+ endif()
+
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+- LIBS testsupport cli ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+-
+ if(WITH_GUI_TESTS)
+ add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)
diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
new file mode 100644
index 000000000000..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+ https://github.com/keepassxreboot/keepassxc/"
+
+if [[ "${PV}" != *9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+ [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/botan:2=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ X? ( dev-qt/qtx11extras:5 )
+ autotype? (
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+ keeshare? ( sys-libs/zlib:=[minizip] )
+ yubikey? (
+ dev-libs/libusb:1
+ sys-apps/pcsc-lite
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+ if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+ printf '%s' "${PV}" > .version || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # https://github.com/keepassxreboot/keepassxc/issues/5801
+ filter-flags -flto*
+
+ local mycmakeargs=(
+ # Gentoo users enable ccache via e.g. FEATURES=ccache or
+ # other means. We don't want the build system to enable it for us.
+ -DWITH_CCACHE=OFF
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_DOCS="$(usex doc)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_FDOSECRETS=ON
+ -DWITH_XC_KEESHARE="$(usex keeshare)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ -DWITH_XC_X11="$(usex X)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-30 1:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-30 1:14 [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/, app-admin/keepassxc/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2022-10-26 13:40 Maciej Barć
2020-10-22 7:02 Lars Wendler
2019-06-03 12:22 Lars Wendler
2019-04-11 16:55 Lars Wendler
2019-03-20 11:01 Lars Wendler
2019-03-08 13:56 Lars Wendler
2018-05-16 9:09 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox