From 95b8e5eb5b37e054cee13cbdb372b9a4318f1daf5d7656b1ddb3b369a9891a4e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 10 Mar 2023 08:29:28 +0000 Subject: [PATCH] Accepting request 1070359 from home:marxin:branches:KDE:Qt:5.15 - Use gcc12 for openSUSE:Factory as workaround for boo#1207469. We would like to reach gcc13 to Factory soon and this package is one of the last blockers as we're still waiting for an upstream fix. OBS-URL: https://build.opensuse.org/request/show/1070359 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=49 --- libqt5-qtwebengine.changes | 5 +++++ libqt5-qtwebengine.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 7695b2a..dd975ff 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -36,6 +36,11 @@ Thu Mar 09 10:11:11 UTC 2023 - christophe@krop.fr * [Backport][Windows] Remove unused sidestep intercepts - Update 0001-skia-Some-includes-to-fix-build-with-GCC-12.patch +------------------------------------------------------------------- +Thu Mar 9 08:51:39 UTC 2023 - Martin Liška + +- Use gcc12 for openSUSE:Factory as workaround for boo#1207469. + ------------------------------------------------------------------- Thu Dec 29 15:26:07 UTC 2022 - christophe@krop.fr diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index b0a7a62..b18d846 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -71,6 +71,9 @@ BuildRequires: fdupes BuildRequires: flac-devel BuildRequires: flex BuildRequires: git-core +%if 0%{?suse_version} >= 1550 +BuildRequires: gcc12-c++ +%endif BuildRequires: gperf BuildRequires: krb5 BuildRequires: krb5-devel @@ -341,6 +344,11 @@ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type" %qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \ QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" \ QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads" \ +%if 0%{?suse_version} >= 1550 + QMAKE_CC=gcc-12 \ + QMAKE_CXX=g++-12 \ + QMAKE_LINK=g++-12 \ +%endif gn_args+="link_pulseaudio=true" \ gn_args+="media_use_openh264=false" \ gn_args+="use_system_libxml=true use_system_libxslt=true" \