Merge branch 'rawhide' into epel8

keepassxc.spec

@@ -3,7 +3,7 @@
 
 Name:           keepassxc
 Version:        2.7.1
-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/
@@ -19,9 +19,15 @@ Source0:        https://github.com/keepassxreboot/keepassxc/releases/download/%{
 # So I think it is no longer needed in Fedora
 # 
 # Concerning upstream Qt6 version, the patch was reverted and kept for Qt 6.3, but concerning keepassxc it is not important since it uses Qt 5
-%if 0%{?el8}
+#
+# 29 April 2022 Germano Massullo's update: users in upstream bugreports
+# https://github.com/keepassxreboot/keepassxc/issues/7959
+# https://github.com/keepassxreboot/keepassxc/issues/5608
+# are reporting regression. I am resuming xcb.patch to all branches
+#
+
 Patch0:         xcb.patch
-%endif
+
 
 BuildRequires:  botan2-devel
 BuildRequires:  cmake >= 3.1
@@ -169,6 +175,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.%{nam
 %endif
 
 %changelog
+* Fri Apr 29 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-3
+- enabled Patch0:xcb.patch for all branches
+
 * Mon Apr 11 2022 Germano Massullo <germano.massullo@gmail.com> - 2.7.1-2
 - replaces BuildRequires: minizip-compat-devel with BuildRequires: minizip-devel
 

xcb.patch

@@ -1,6 +1,7 @@
---- 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 @@
+diff -urNr keepassxc-2.7.1-orig/src/main.cpp keepassxc-2.7.1/src/main.cpp
+--- keepassxc-2.7.1-orig/src/main.cpp	2022-04-06 05:12:34.000000000 +0200
++++ keepassxc-2.7.1/src/main.cpp	2022-04-29 17:56:33.017403491 +0200
+@@ -43,8 +43,25 @@
  #endif
  #endif
  
@@ -16,14 +17,13 @@
 +    }
 +}
 +#endif
++
 +
  int main(int argc, char** argv)
  {
-+
 +#ifdef Q_OS_LINUX
 +    wayland_hacks();
 +#endif
-+
      QT_REQUIRE_VERSION(argc, argv, QT_VERSION_STR)
  
  #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)