public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/
Date: Thu, 11 Apr 2019 18:38:47 +0000 (UTC)	[thread overview]
Message-ID: <1555007923.249cae16c7249498d39444376f8f057fff721f74.polynomial-c@gentoo> (raw)

commit:     249cae16c7249498d39444376f8f057fff721f74
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 18:38:07 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 18:38:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=249cae16

app-admin/keepassxc: Fixed incomplete patch

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/keepassxc-2.4.0-update_checker_toggle.patch         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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
index bca65f3b4ae..64e02066916 100644
--- 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
@@ -1,4 +1,4 @@
-From 64fe9de385be43212a83c0c89791a95af203eef9 Mon Sep 17 00:00:00 2001
+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
@@ -14,13 +14,13 @@ Subject: [PATCH] Enhance update checker
  src/config-keepassx.h.cmake                 |  1 +
  src/core/Clock.cpp                          |  1 +
  src/gui/ApplicationSettingsWidget.cpp       | 25 ++++++-
- src/gui/ApplicationSettingsWidget.h         |  1 +
+ 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, 146 insertions(+), 55 deletions(-)
+ 11 files changed, 147 insertions(+), 55 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 658548f7..4f8a419c 100644
@@ -123,13 +123,14 @@ index 90b851bd..e6a7068d 100644
 +    m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
 +}
 diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h
-index ffcfea2b..8cdc7ed7 100644
+index ffcfea2b..86688b70 100644
 --- a/src/gui/ApplicationSettingsWidget.h
 +++ b/src/gui/ApplicationSettingsWidget.h
-@@ -56,6 +56,7 @@ private slots:
+@@ -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:


             reply	other threads:[~2019-04-11 18:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11 18:38 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-05-22 17:38 [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/files/ Maciej Barć
2019-03-08 13:59 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1555007923.249cae16c7249498d39444376f8f057fff721f74.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox