From 10b7a66bdf7181026914e753c5260a5adef04214 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 13 Feb 2025 20:02:34 +0100 Subject: ... --- overlays/keepassxc/database-open-dialog.patch | 47 ++++++++++++++------------- overlays/keepassxc/default.nix | 2 +- 2 files changed, 26 insertions(+), 23 deletions(-) (limited to 'overlays') diff --git a/overlays/keepassxc/database-open-dialog.patch b/overlays/keepassxc/database-open-dialog.patch index 4916dc1b..dff84846 100644 --- a/overlays/keepassxc/database-open-dialog.patch +++ b/overlays/keepassxc/database-open-dialog.patch @@ -1,7 +1,8 @@ -diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/BrowserService.cpp ---- source.orig/src/browser/BrowserService.cpp 2025-01-27 20:55:04.128198171 +0100 -+++ source/src/browser/BrowserService.cpp 2025-01-27 21:16:07.068959077 +0100 -@@ -249,7 +249,7 @@ +diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp +index 60412b5a..c0497d91 100644 +--- a/src/browser/BrowserService.cpp ++++ b/src/browser/BrowserService.cpp +@@ -249,7 +249,7 @@ QJsonObject BrowserService::createNewGroup(const QString& groupName) return result; } @@ -10,7 +11,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse tr("KeePassXC - Create a new group"), tr("A request for creating a new group \"%1\" has been received.\n" "Do you want to create this group?\n") -@@ -422,7 +422,7 @@ +@@ -422,7 +422,7 @@ QList BrowserService::confirmEntries(QList& entriesToConfirm, m_dialogActive = true; updateWindowState(); @@ -19,7 +20,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &accessControlDialog, SLOT(reject())); -@@ -512,7 +512,7 @@ +@@ -512,7 +512,7 @@ QString BrowserService::storeKey(const QString& key) QString id; do { @@ -28,7 +29,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &keyDialog, SLOT(reject())); keyDialog.setWindowTitle(tr("KeePassXC - New key association request")); keyDialog.setLabelText(tr("You have received an association request for the following database:\n%1\n\n" -@@ -535,7 +535,7 @@ +@@ -535,7 +535,7 @@ QString BrowserService::storeKey(const QString& key) contains = db->metadata()->customData()->contains(CustomData::BrowserKeyPrefix + id); if (contains) { @@ -37,7 +38,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse tr("KeePassXC - Overwrite existing key?"), tr("A shared encryption key with the name \"%1\" " "already exists.\nDo you want to overwrite it?") -@@ -595,7 +595,7 @@ +@@ -595,7 +595,7 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public const auto existingEntries = getPasskeyEntriesWithUserHandle(rpId, userId, keyList); raiseWindow(); @@ -46,7 +47,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse confirmDialog.registerCredential(username, rpId, existingEntries, timeout); auto dialogResult = confirmDialog.exec(); -@@ -612,7 +612,7 @@ +@@ -612,7 +612,7 @@ QJsonObject BrowserService::showPasskeysRegisterPrompt(const QJsonObject& public // If no entry is selected, show the import dialog for manual entry selection auto selectedEntry = confirmDialog.getSelectedEntry(); if (!selectedEntry) { @@ -55,7 +56,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse const auto result = passkeyImporter.showImportDialog(db, nullptr, origin, -@@ -683,7 +683,7 @@ +@@ -683,7 +683,7 @@ QJsonObject BrowserService::showPasskeysAuthenticationPrompt(const QJsonObject& const auto timeout = publicKeyOptions["timeout"].toInt(); raiseWindow(); @@ -64,7 +65,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse confirmDialog.authenticateCredential(entries, rpId, timeout); auto dialogResult = confirmDialog.exec(); if (dialogResult == QDialog::Accepted) { -@@ -760,7 +760,7 @@ +@@ -760,7 +760,7 @@ void BrowserService::addPasskeyToEntry(Entry* entry, // Ask confirmation if entry already contains a Passkey if (entry->hasPasskey()) { @@ -73,7 +74,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse tr("KeePassXC - Update passkey"), tr("Entry already has a passkey.\nDo you want to overwrite the passkey in %1 - %2?") .arg(entry->title(), passkeyUtils()->getUsernameFromEntry(entry)), -@@ -873,7 +873,7 @@ +@@ -873,7 +873,7 @@ bool BrowserService::updateEntry(const EntryParameters& entryParameters, const Q MessageBox::Button dialogResult = MessageBox::No; if (!browserSettings()->alwaysAllowUpdate()) { raiseWindow(); @@ -82,7 +83,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse tr("KeePassXC - Update Entry"), tr("Do you want to update the information in %1 - %2?") .arg(QUrl(entryParameters.siteUrl).host(), username), -@@ -909,7 +909,7 @@ +@@ -909,7 +909,7 @@ bool BrowserService::deleteEntry(const QString& uuid) return false; } @@ -91,7 +92,7 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse tr("KeePassXC - Delete entry"), tr("A request for deleting entry \"%1\" has been received.\n" "Do you want to delete the entry?\n") -@@ -1536,7 +1536,7 @@ +@@ -1536,7 +1536,7 @@ QSharedPointer BrowserService::selectedDatabase() } } @@ -100,10 +101,11 @@ diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/Browse int openDatabaseCount = browserEntrySaveDialog.setItems(databaseWidgets, m_currentDatabaseWidget); if (openDatabaseCount > 1) { int res = browserEntrySaveDialog.exec(); -diff -u3 -r source.orig/src/fdosecrets/objects/Prompt.cpp source/src/fdosecrets/objects/Prompt.cpp ---- source.orig/src/fdosecrets/objects/Prompt.cpp 2025-01-27 20:55:04.135942791 +0100 -+++ source/src/fdosecrets/objects/Prompt.cpp 2025-01-27 21:01:37.166710935 +0100 -@@ -313,7 +313,7 @@ +diff --git a/src/fdosecrets/objects/Prompt.cpp b/src/fdosecrets/objects/Prompt.cpp +index e89cd499..347c98b8 100644 +--- a/src/fdosecrets/objects/Prompt.cpp ++++ b/src/fdosecrets/objects/Prompt.cpp +@@ -313,7 +313,7 @@ namespace FdoSecrets if (!entries.isEmpty()) { QString app = tr("%1 (PID: %2)").arg(client->name()).arg(client->pid()); auto ac = new AccessControlDialog( @@ -112,10 +114,11 @@ diff -u3 -r source.orig/src/fdosecrets/objects/Prompt.cpp source/src/fdosecrets/ connect(ac, &AccessControlDialog::finished, this, &UnlockPrompt::itemUnlockFinished); connect(ac, &AccessControlDialog::finished, ac, &AccessControlDialog::deleteLater); ac->open(); -diff -u3 -r source.orig/src/gui/DatabaseTabWidget.cpp source/src/gui/DatabaseTabWidget.cpp ---- source.orig/src/gui/DatabaseTabWidget.cpp 2025-01-27 20:55:04.134589500 +0100 -+++ source/src/gui/DatabaseTabWidget.cpp 2025-01-27 21:07:09.785284837 +0100 -@@ -41,7 +41,7 @@ +diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp +index 805d4eab..4836199e 100644 +--- a/src/gui/DatabaseTabWidget.cpp ++++ b/src/gui/DatabaseTabWidget.cpp +@@ -41,7 +41,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent) : QTabWidget(parent) , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this)) , m_dbWidgetPendingLock(nullptr) diff --git a/overlays/keepassxc/default.nix b/overlays/keepassxc/default.nix index 25429a66..46b3a459 100644 --- a/overlays/keepassxc/default.nix +++ b/overlays/keepassxc/default.nix @@ -1,7 +1,7 @@ { final, prev, ... }: { keepassxc = prev.keepassxc.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) ++ [ + patches = (oldAttrs.patches or []) ++ prev.lib.optional (prev.lib.versionAtLeast oldAttrs.version "2.7.9") [ ./database-open-dialog.patch ]; }); -- cgit v1.2.3