Accepting request 1113240 from KDE:Qt6

- Use GCC 12 for building the Qt6 library on Leap 15. The  default compiler is too old.
- Use '%{without xxx}' rather than '!%{with xxx}' in spec file

OBS-URL: https://build.opensuse.org/request/show/1113240
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=158

gpgme.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Sep 23 23:26:53 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Use GCC 12 for building the Qt6 library on Leap 15. The
+  default compiler is too old.
+- Use '%{without xxx}' rather than '!%{with xxx}' in spec file
+
+-------------------------------------------------------------------
+Sat Sep 23 23:26:53 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Use GCC 12 for building the Qt6 library. The default compiler
+  is too old.
+- Use '%{without xxx}' rather than '!%{with xxx}' in spec file
+
 -------------------------------------------------------------------
 Tue Aug 22 08:31:50 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
 

gpgme.spec

@@ -70,6 +70,12 @@ BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Test)
 %endif
 %if %{with qt6}
+%if 0%{?suse_version} < 1550
+# The default compiler is too old for Qt6, use the newest
+# version available in the :Update repo
+BuildRequires:  gcc12-c++
+BuildRequires:  gcc12-PIE
+%endif
 BuildRequires:  pkgconfig(Qt6Core) >= 6.4.0
 BuildRequires:  pkgconfig(Qt6Test)
 %endif
@@ -254,6 +260,10 @@ languages="cpp qt"
 
 %if %{with qt6}
 languages="cpp qt6"
+%if 0%{?suse_version} < 1550
+# Qt6 needs full c++-17 support
+export CXX=g++-12 CC=gcc-12 CPP=cpp-12
+%endif
 %endif
 
 %configure \
@@ -290,12 +300,12 @@ GPGME_DEBUG=2:mygpgme.log %make_build check skip=%{?qt_skip:%{qt_skip}} || cat $
 %ldconfig_scriptlets -n libqgpgmeqt6-15
 %endif
 
-%if !%{with qt} && !%{with qt6}
+%if %{without qt} && %{without qt6}
 %ldconfig_scriptlets -n libgpgme11
 %ldconfig_scriptlets -n libgpgmepp6
 %endif
 
-%if !%{with qt} && !%{with qt6}
+%if %{without qt} && %{without qt6}
 %files
 %license COPYING COPYING.LESSER LICENSES
 %doc AUTHORS ChangeLog ChangeLog-2011 README NEWS THANKS TODO VERSION