From 78ffe6c0e705a0ac6f67f859c932826cf5c2867a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:25:24 +0000 Subject: [PATCH 1/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 894a519..88f89b1 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.6 -Release: 3%{?dist} +Release: 4%{?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 Jan 20 2022 Fedora Release Engineering - 2.6.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 19 2021 Björn Esser - 2.6.6-3 - Rebuild (quazip) From e7e14320c0c3dd6aa5268f6d437a37f72ddbd58a Mon Sep 17 00:00:00 2001 From: Johnathan Dough Date: Tue, 15 Feb 2022 21:08:35 +0000 Subject: [PATCH 2/3] Update xcb.patch On gnome check if the environment variable QT_QPA_PLATFORM is set, if so do not change the variable value, otherwise set QT_QPA_PLATFORM="xcb". --- xcb.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcb.patch b/xcb.patch index 34074fd..b0238ce 100644 --- a/xcb.patch +++ b/xcb.patch @@ -10,7 +10,7 @@ + QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); + QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); + QByteArray sessionType = qgetenv("XDG_SESSION_TYPE").toLower(); -+ if (sessionType.contains("wayland") && (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"))) ++ if ((sessionType.contains("wayland") && qEnvironmentVariableIsEmpty("QT_QPA_PLATFORM")) && (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"))) + { + qputenv("QT_QPA_PLATFORM", "xcb"); + } From 845524325373faed7782730cd05cfafcb56dfcd0 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Tue, 22 Feb 2022 00:22:41 +0100 Subject: [PATCH 3/3] improves xcb.patch --- keepassxc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keepassxc.spec b/keepassxc.spec index 88f89b1..8cd4f40 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -3,7 +3,7 @@ Name: keepassxc Version: 2.6.6 -Release: 4%{?dist} +Release: 5%{?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/ @@ -11,6 +11,8 @@ Source0: https://github.com/keepassxreboot/keepassxc/releases/download/%{ # 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 +# +# Patch improved by pewpeww https://src.fedoraproject.org/rpms/keepassxc/pull-request/1 Patch0: xcb.patch BuildRequires: cmake >= 3.1 @@ -150,6 +152,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam %endif %changelog +* Mon Feb 21 2022 Germano Massullo - 2.6.6-5 +- User pewpeww improved xcb.patch - https://src.fedoraproject.org/rpms/keepassxc/pull-request/1 + * Thu Jan 20 2022 Fedora Release Engineering - 2.6.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild