Update to 2.6.6

4 years ago · 0d1749a6c1
parent 74bae729d0
commit 0d1749a6c1
4 changed files with 14 additions and 10 deletions
--- 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
--- 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
+Version:        2.6.6
-Release:        2%{?dist}
+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/
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (keepassxc-2.6.4-src.tar.xz) = 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
+SHA512 (keepassxc-2.6.6-src.tar.xz) = 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b
--- 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.6-orig/src/main.cpp	2021-06-14 18:11:55.987803422 -0400
--- keepassxc-2.6.4-orig/src/main.cpp	2021-01-31 22:37:23.000000000 +0100
+++ keepassxc-2.6.6/src/main.cpp	2021-06-14 18:13:31.501595998 -0400
 +++ keepassxc-2.6.4/src/main.cpp	2021-05-01 15:31:13.526285073 +0200
@@ -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();
+#ifdef Q_OS_LINUX
-+    #endif
+wayland_hacks();
 +#endif
 +
     QT_REQUIRE_VERSION(argc, argv, QT_VERSION_STR)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
`@ -1 +1 @@`
	`SHA512 (keepassxc-2.6.4-src.tar.xz) = 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb`	`SHA512 (keepassxc-2.6.6-src.tar.xz) = 175702ef3ae5b048ba23a794ddf4e17d61f2640955de7ec21a3e49e4abe7cab8c93c9a2bc61c5c052c62382a69bd8dcb4a4f0cf6daa162f5e00cff3f7a1a713b`