From 0d1749a6c1162e568767f7bafb7271c52908eb2c Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc@gmail.com>
Date: Mon, 14 Jun 2021 20:28:21 -0400
Subject: [PATCH] Update to 2.6.6

---
 .gitignore     |  1 +
 keepassxc.spec |  7 +++++--
 sources        |  2 +-
 xcb.patch      | 14 +++++++-------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e228042..21d171b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /keepassxc-2.6.2-src.tar.xz
 /keepassxc-2.6.3-src.tar.xz
 /keepassxc-2.6.4-src.tar.xz
+/keepassxc-2.6.6-src.tar.xz
diff --git a/keepassxc.spec b/keepassxc.spec
index ee18464..8d0d898 100644
--- a/keepassxc.spec
+++ b/keepassxc.spec
@@ -2,8 +2,8 @@
 # EPEL7 not possible because libgcrypt version is 1.5
 
 Name:           keepassxc
-Version:        2.6.4
-Release:        2%{?dist}
+Version:        2.6.6
+Release:        1%{?dist}
 Summary:        Cross-platform password manager
 License:        Boost and BSD and CC0 and GPLv3 and LGPLv2 and LGPLv2+ and LGPLv3+ and Public Domain
 URL:            http://www.keepassxc.org/
@@ -150,6 +150,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %endif
 
 %changelog
+* Mon Jun 14 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 2.6.6-1
+- Update to 2.6.6
+
 * Sat May 01 2021 Germano Massullo <germano.massullo@gmail.com> - 2.6.4-2
 - added xcb.patch that fixes GNOME quirks on Wayland sessions. Read https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/
 
diff --git a/sources b/sources
index 30b1bdf..0ce3643 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (keepassxc-2.6.4-src.tar.xz) = 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
+SHA512 (keepassxc-2.6.6-src.tar.xz) = 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
diff --git a/xcb.patch b/xcb.patch
index 44f7a57..34074fd 100644
--- a/xcb.patch
+++ b/xcb.patch
@@ -1,6 +1,5 @@
-diff -urNr keepassxc-2.6.4-orig/src/main.cpp keepassxc-2.6.4/src/main.cpp
---- keepassxc-2.6.4-orig/src/main.cpp	2021-01-31 22:37:23.000000000 +0100
-+++ keepassxc-2.6.4/src/main.cpp	2021-05-01 15:31:13.526285073 +0200
+--- keepassxc-2.6.6-orig/src/main.cpp	2021-06-14 18:11:55.987803422 -0400
++++ keepassxc-2.6.6/src/main.cpp	2021-06-14 18:13:31.501595998 -0400
 @@ -44,8 +44,26 @@
  #endif
  #endif
@@ -17,13 +16,14 @@ diff -urNr keepassxc-2.6.4-orig/src/main.cpp keepassxc-2.6.4/src/main.cpp
 +    }
 +}
 +#endif
-+
 +
  int main(int argc, char** argv)
  {
-+    #ifdef Q_OS_LINUX
-+    wayland_hacks();
-+    #endif
++
++#ifdef Q_OS_LINUX
++wayland_hacks();
++#endif
++
      QT_REQUIRE_VERSION(argc, argv, QT_VERSION_STR)
  
  #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)