From db8317e690070f7df513ba42d376bb06e2ae49f7 Mon Sep 17 00:00:00 2001 From: Alexey Sheplyakov Date: Thu, 1 Jun 2023 17:45:39 +0400 Subject: [PATCH] Fixed compilation with GCC 13 Closes: #46360 --- gcc13-compilefix.patch | 34 ++++++++++++++++++++++++++++++++++ qtlocation.spec | 7 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gcc13-compilefix.patch diff --git a/gcc13-compilefix.patch b/gcc13-compilefix.patch new file mode 100644 index 00000000..b1067a49 --- /dev/null +++ b/gcc13-compilefix.patch @@ -0,0 +1,34 @@ +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +index a28c59a4..92d928a3 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + #include + #include +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +index 13498ccb..4dc82a88 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + + // Polyfill needed by Qt when building for Android with GCC +diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +index bc959c9a..2fc62bba 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + + namespace mbgl { diff --git a/qtlocation.spec b/qtlocation.spec index 640c376a..941f1b8b 100644 --- a/qtlocation.spec +++ b/qtlocation.spec @@ -6,7 +6,7 @@ Name: qt5-location Version: 5.15.9 -Release: alt1 +Release: alt2 Group: System/Libraries Summary: Qt5 - QtLocation component @@ -14,6 +14,7 @@ Url: http://qt.io/ License: LGPLv2 / GPLv3 Source: %qt_module-everywhere-src-%version.tar +Patch1: gcc13-compilefix.patch # Automatically added by buildreq on Wed Aug 23 2017 (-bi) # optimized out: elfutils fontconfig gcc-c++ glib2-devel glibc-kernheaders-generic glibc-kernheaders-x86 kde5-kcalcore-devel kde5-kcontacts-devel kde5-kmime-devel kde5-libkleo-devel kf5-attica-devel kf5-kauth-devel kf5-kbookmarks-devel kf5-kcodecs-devel kf5-kcompletion-devel kf5-kconfig-devel kf5-kconfigwidgets-devel kf5-kcoreaddons-devel kf5-ki18n-devel kf5-kitemviews-devel kf5-kjobwidgets-devel kf5-kjs-devel kf5-kservice-devel kf5-kwidgetsaddons-devel kf5-kxmlgui-devel kf5-solid-devel kf5-sonnet-devel libGL-devel libdbus-devel libdbus-glib libdbus-glib-devel libgpg-error libqt5-clucene libqt5-core libqt5-dbus libqt5-gui libqt5-help libqt5-network libqt5-qml libqt5-quick libqt5-sql libqt5-widgets libstdc++-devel perl pkg-config python-base python-modules python3 python3-base qt5-base-common qt5-base-devel qt5-declarative-devel qt5-location-devel qt5-script-devel qt5-tools qt5-webchannel-devel qt5-webkit-devel qt5-xmlpatterns-devel rpm-build-python3 ruby ruby-stdlibs @@ -101,6 +102,7 @@ Requires: qt5-quickcontrols %prep %setup -n %qt_module-everywhere-src-%version +%patch1 -p1 syncqt.pl-qt5 -version %version %ifarch e2k @@ -161,6 +163,9 @@ export QT_HASH_SEED=0 %_qt5_examplesdir/* %changelog +* Thu Jun 01 2023 Alexey Sheplyakov 5.15.9-alt2 +- Fixed compilation with GCC 13 (closes: #46360) + * Wed Apr 26 2023 Sergey V Turchin 5.15.9-alt1 - new version -- 2.33.7