From 5e823a062620044cba8128f82d10238576544046 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Mon, 11 Mar 2024 00:31:31 +0100
Subject: [PATCH] keepassxc: 2.7.6 -> 2.7.7

---
 keepassxc/.signature                          |  7 ++---
 keepassxc/Pkgfile                             |  9 ++----
 ...30ba4671a7e2b6ac4a6c00cd097f4114fd22.patch | 31 -------------------
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 keepassxc/cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch

diff --git a/keepassxc/.signature b/keepassxc/.signature
index 922266ca1..af9465c82 100644
--- a/keepassxc/.signature
+++ b/keepassxc/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39sT61bQRtS1VBRNSlXH8Mg2ZrrIZsw5BlQVDYgvYCCcyueND/ve99s8IGQPEkuJlb1cGV9vtkl/smxb5drTUgc=
-SHA256 (Pkgfile) = 54a88d5c739f8377ced890f714a4e7cace58a3d083be5b879a74525afe4c7edc
+RWSagIOpLGJF38JwqdfkBwtty5CvaoF8grDv1Id3IAVtkuW2Bvu8jYCJKkgSfTttGWP9EZNqZEjNrOS6NIcvYkuhp64tde3uEQY=
+SHA256 (Pkgfile) = 9b64f24b452599b9db3745f27870423433935c5ad6fcc246555a666b28e5732a
 SHA256 (.footprint) = 3518370ae52ecb1b0452d1aaa3b291be9b017eb1a4c8ac77c322ac88aa7fbdf1
-SHA256 (keepassxc-2.7.6-src.tar.xz) = a58074509fa8e90f152c6247f73e75e126303081f55eedb4ea0cbb6fa980d670
-SHA256 (cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch) = 7884a0425a5bf7e67d389d6b2545b06ee28b6d77e9164df13a8e78b5719d11ce
+SHA256 (keepassxc-2.7.7-src.tar.xz) = 58fc45ae98e4b3ffb052103014f5b97a41fefd17102c7f56073934dd3a82ee67
diff --git a/keepassxc/Pkgfile b/keepassxc/Pkgfile
index 9d8c92566..696dcd48e 100644
--- a/keepassxc/Pkgfile
+++ b/keepassxc/Pkgfile
@@ -5,10 +5,9 @@
 # Optional: asciidoctor xorg-libxtst
 
 name=keepassxc
-version=2.7.6
-release=2
-source=(https://github.com/keepassxreboot/keepassxc/releases/download/$version/$name-$version-src.tar.xz
-  cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch)
+version=2.7.7
+release=1
+source=(https://github.com/keepassxreboot/keepassxc/releases/download/$version/$name-$version-src.tar.xz)
 
 build() {
   prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
@@ -17,8 +16,6 @@ build() {
   prt-get isinst asciidoctor && PKGMK_KEEPASSXC+=' -D WITH_XC_DOCS=ON' || PKGMK_KEEPASSXC+=' -D WITH_XC_DOCS=OFF'
   prt-get isinst xorg-libxtst || PKGMK_KEEPASSXC+=' -D WITH_XC_X11=OFF'
 
-  patch -Np1 -d $name-$version -i $SRC/cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch
-
   cmake -S $name-$version -B build -G Ninja $PKGMK_KEEPASSXC \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \
diff --git a/keepassxc/cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch b/keepassxc/cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch
deleted file mode 100644
index 49506ebce..000000000
--- a/keepassxc/cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22 Mon Sep 17 00:00:00 2001
-From: Dan Church <amphetamachine@gmail.com>
-Date: Sun, 19 Nov 2023 11:05:21 -0600
-Subject: [PATCH] Fix Botan 2/3 include
-
-Botan::secure_scrub_memory -> defined in mem_ops.h
-Botan::secure_vector -> defined in secmem.h
-
-The reason only including secmem.h worked in previous (<3.0) versions of
-Botan was because secmem.h included mem_ops.h. This is no longer the
-case since commit
-randombit/botan@49dbbcb2bfda05ef9d3f09848c9ba22fcbcd5066 (2023-10-11;
-"Split out allocator helpers to allocator.h")
-
-Fixes #10038
----
- src/keys/FileKey.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/keys/FileKey.h b/src/keys/FileKey.h
-index 795f03bdbc..65cd955a7c 100644
---- a/src/keys/FileKey.h
-+++ b/src/keys/FileKey.h
-@@ -19,6 +19,7 @@
- #ifndef KEEPASSX_FILEKEY_H
- #define KEEPASSX_FILEKEY_H
- 
-+#include <botan/mem_ops.h>
- #include <botan/secmem.h>
- 
- #include "keys/Key.h"