View | Details | Raw Unified | Return to bug 46360
Collapse All | Expand All

(-)a/gcc13-compilefix.patch (+34 lines)
Line 0 Link Here
1 
diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
2 
index a28c59a4..92d928a3 100644
3 
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
4 
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
5 
@@ -1,5 +1,6 @@
6 
 #pragma once
7
8 
+#include <cstdint>
9 
 #include <mapbox/geometry/geometry.hpp>
10 
 #include <mapbox/geometry/point_arithmetic.hpp>
11 
 #include <mapbox/geometry/for_each_point.hpp>
12 
diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
13 
index 13498ccb..4dc82a88 100644
14 
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
15 
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
16 
@@ -4,6 +4,7 @@
17 
 #include <string>
18 
 #include <cassert>
19 
 #include <cstdlib>
20 
+#include <cstdint>
21 
 #include <exception>
22
23 
 // Polyfill needed by Qt when building for Android with GCC
24 
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
25 
index bc959c9a..2fc62bba 100644
26 
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
27 
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
28 
@@ -1,5 +1,6 @@
29 
 #pragma once
30
31 
+#include <cstdint>
32 
 #include <mbgl/util/variant.hpp>
33
34 
 namespace mbgl {
(-)a/qtlocation.spec (-2 / +6 lines)
Lines 6-12 Link Here
6 

          6
          

        

        

          7
          
Name: qt5-location

          7
          
Name: qt5-location

        

        

          8
          
Version: 5.15.9

          8
          
Version: 5.15.9

        

          
            

              9
              
Release: alt1


              9
              
Release: alt2

            

        

          10
          

          10
          

        

        

          11
          
Group: System/Libraries

          11
          
Group: System/Libraries

        

        

          12
          
Summary: Qt5 - QtLocation component

          12
          
Summary: Qt5 - QtLocation component

        

  

    
      
            Lines 14-19
          Url: http://qt.io/
      
      
        Link Here
      
    
  

        

          14
          
License: LGPLv2 / GPLv3

          14
          
License: LGPLv2 / GPLv3

        

        

          15
          

          15
          

        

        

          16
          
Source: %qt_module-everywhere-src-%version.tar

          16
          
Source: %qt_module-everywhere-src-%version.tar

        

            

              
              
              17
              
Patch1: gcc13-compilefix.patch

            

        

          17
          

          18
          

        

        

          18
          
# Automatically added by buildreq on Wed Aug 23 2017 (-bi)

          19
          
# Automatically added by buildreq on Wed Aug 23 2017 (-bi)

        

        

          19
          
# 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

          20
          
# 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

        

  

    
      
            Lines 101-106
          Requires: qt5-quickcontrols
      
      
        Link Here
      
    
  

        

          101
          

          102
          

        

        

          102
          
%prep

          103
          
%prep

        

        

          103
          
%setup -n %qt_module-everywhere-src-%version

          104
          
%setup -n %qt_module-everywhere-src-%version

        

            

              
              
              105
              
%patch1 -p1

            

        

          104
          
syncqt.pl-qt5 -version %version

          106
          
syncqt.pl-qt5 -version %version

        

        

          105
          

          107
          

        

        

          106
          
%ifarch e2k

          108
          
%ifarch e2k

        

  

    
      
            Lines 161-166
          export QT_HASH_SEED=0
      
      
        Link Here
      
    
  

        

          161
          
%_qt5_examplesdir/*

          163
          
%_qt5_examplesdir/*

        

        

          162
          

          164
          

        

        

          163
          
%changelog

          165
          
%changelog

        

            

              
              
              166
              
* Thu Jun 01 2023 Alexey Sheplyakov <asheplyakov@altlinux.org> 5.15.9-alt2

            

            

              167
              
- Fixed compilation with GCC 13 (closes: #46360)

            

            

              168
              

            

        

          164
          
* Wed Apr 26 2023 Sergey V Turchin <zerg@altlinux.org> 5.15.9-alt1

          169
          
* Wed Apr 26 2023 Sergey V Turchin <zerg@altlinux.org> 5.15.9-alt1

        

        

          165
          
- new version

          170
          
- new version

        

        

          166
          

          171
          

        

            

              167
              
- 

              
              
            






  

  Return to bug 46360