From 46c1e8509cc81027eb44e64e443459aca88b8c03 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Thu, 27 May 2021 16:48:26 +0000 Subject: [PATCH 1/5] Update xcb.patch --- xcb.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/xcb.patch b/xcb.patch index 0c0550c..44f7a57 100644 --- a/xcb.patch +++ b/xcb.patch @@ -8,7 +8,6 @@ diff -urNr keepassxc-2.6.4-orig/src/main.cpp keepassxc-2.6.4/src/main.cpp +#ifdef Q_OS_LINUX +void wayland_hacks() +{ -+ // Workaround to https://github.com/ksnip/ksnip/issues/416 + QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); + QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); + QByteArray sessionType = qgetenv("XDG_SESSION_TYPE").toLower(); From 74bae729d0cccc2b9866e97958cc233e6c4f7a38 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 28 May 2021 01:05:15 +0200 Subject: [PATCH 2/5] added comment --- keepassxc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/keepassxc.spec b/keepassxc.spec index a7ee056..ee18464 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -10,6 +10,7 @@ URL: http://www.keepassxc.org/ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{version}/keepassxc-%{version}-src.tar.xz # Patch0: fixes GNOME quirks on Wayland sessions. Read # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/ +# read also https://github.com/keepassxreboot/keepassxc/pull/3520/files Patch0: xcb.patch BuildRequires: cmake >= 3.1 From 0d1749a6c1162e568767f7bafb7271c52908eb2c Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 14 Jun 2021 20:28:21 -0400 Subject: [PATCH 3/5] 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 - 2.6.6-1 +- Update to 2.6.6 + * Sat May 01 2021 Germano Massullo - 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) From 5f20a8d91aaee57da38612b1d766a30622fa820b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:41:44 +0000 Subject: [PATCH 4/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepassxc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 8d0d898..963b9da 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.6 -Release: 1%{?dist} +Release: 2%{?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 +* Thu Jul 22 2021 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 14 2021 Mukundan Ragavan - 2.6.6-1 - Update to 2.6.6 From ef62b876dfc927b6f1614432d6336877e101b283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 19 Aug 2021 12:39:11 +0200 Subject: [PATCH 5/5] Rebuild (quazip) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- keepassxc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 963b9da..894a519 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.6 -Release: 2%{?dist} +Release: 3%{?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 +* Thu Aug 19 2021 Björn Esser - 2.6.6-3 +- Rebuild (quazip) + * Thu Jul 22 2021 Fedora Release Engineering - 2.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild