Merge branch 'rawhide' into epel8

keepassxc.spec

@@ -3,7 +3,7 @@
 
 Name:           keepassxc
 Version:        2.6.6
-Release:        3%{?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,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %endif
 
 %changelog
+* Mon Feb 21 2022 Germano Massullo <germano.massullo@gmail.com> - 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 <releng@fedoraproject.org> - 2.6.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Aug 19 2021 Björn Esser <besser82@fedoraproject.org> - 2.6.6-3
 - Rebuild (quazip)
 

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");
 +    }