qt5: fixed build with icu 75.1
This commit is contained in:
parent
11a6f4328d
commit
e1de2b1809
GPG Key ID:
42F8B4E30B673606
@ -7317,6 +7317,14 @@ drwxr-xr-x root/root usr/include/qt5/QtWidgets/5.15.14/QtWidgets/private/
|
||||
-rw-r--r-- root/root usr/include/qt5/QtWidgets/qwidget.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtWidgets/qwidgetaction.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtWidgets/qwizard.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtX11Extras/
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QX11Info
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QtX11Extras
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QtX11ExtrasDepends
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/QtX11ExtrasVersion
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/qtx11extrasglobal.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/qtx11extrasversion.h
|
||||
-rw-r--r-- root/root usr/include/qt5/QtX11Extras/qx11info_x11.h
|
||||
drwxr-xr-x root/root usr/include/qt5/QtXkbCommonSupport/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtXkbCommonSupport/5.15.14/
|
||||
drwxr-xr-x root/root usr/include/qt5/QtXkbCommonSupport/5.15.14/QtXkbCommonSupport/
|
||||
@ -7938,6 +7946,9 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5Gui/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QWebGLIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5Help/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Help/Qt5HelpConfig.cmake
|
||||
@ -8176,6 +8187,12 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5Widgets/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5X11Extras/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5X11Extras/Qt5X11ExtrasConfig.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5X11Extras/Qt5X11ExtrasConfigVersion.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5XcbQpa/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfig.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfigVersion.cmake
|
||||
drwxr-xr-x root/root usr/lib/cmake/Qt5XkbCommonSupport/
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
|
||||
-rw-r--r-- root/root usr/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
|
||||
@ -8664,6 +8681,18 @@ lrwxrwxrwx root/root usr/lib/libQt5Widgets.so -> libQt5Widgets.so.5.15.14
|
||||
lrwxrwxrwx root/root usr/lib/libQt5Widgets.so.5 -> libQt5Widgets.so.5.15.14
|
||||
lrwxrwxrwx root/root usr/lib/libQt5Widgets.so.5.15 -> libQt5Widgets.so.5.15.14
|
||||
-rwxr-xr-x root/root usr/lib/libQt5Widgets.so.5.15.14
|
||||
-rw-r--r-- root/root usr/lib/libQt5X11Extras.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5X11Extras.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5X11Extras.so -> libQt5X11Extras.so.5.15.14
|
||||
lrwxrwxrwx root/root usr/lib/libQt5X11Extras.so.5 -> libQt5X11Extras.so.5.15.14
|
||||
lrwxrwxrwx root/root usr/lib/libQt5X11Extras.so.5.15 -> libQt5X11Extras.so.5.15.14
|
||||
-rwxr-xr-x root/root usr/lib/libQt5X11Extras.so.5.15.14
|
||||
-rw-r--r-- root/root usr/lib/libQt5XcbQpa.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5XcbQpa.prl
|
||||
lrwxrwxrwx root/root usr/lib/libQt5XcbQpa.so -> libQt5XcbQpa.so.5.15.14
|
||||
lrwxrwxrwx root/root usr/lib/libQt5XcbQpa.so.5 -> libQt5XcbQpa.so.5.15.14
|
||||
lrwxrwxrwx root/root usr/lib/libQt5XcbQpa.so.5.15 -> libQt5XcbQpa.so.5.15.14
|
||||
-rwxr-xr-x root/root usr/lib/libQt5XcbQpa.so.5.15.14
|
||||
-rw-r--r-- root/root usr/lib/libQt5XkbCommonSupport.a
|
||||
-rw-r--r-- root/root usr/lib/libQt5XkbCommonSupport.la
|
||||
-rw-r--r-- root/root usr/lib/libQt5XkbCommonSupport.prl
|
||||
@ -8757,6 +8786,7 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebSockets.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebView.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5Widgets.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5X11Extras.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5Xml.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/Qt5XmlPatterns.pc
|
||||
drwxr-xr-x root/root usr/lib/qt5/
|
||||
@ -9520,6 +9550,9 @@ drwxr-xr-x root/root usr/lib/qt5/mkspecs/modules/
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webview_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_widgets.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_widgets_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_x11extras.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_x11extras_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xml.pri
|
||||
-rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_xml_private.pri
|
||||
@ -9720,6 +9753,7 @@ drwxr-xr-x root/root usr/lib/qt5/plugins/platforms/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqoffscreen.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqvnc.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqwebgl.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platforms/libqxcb.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/plugins/platformthemes/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/platformthemes/libqxdgdesktopportal.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/plugins/playlistformats/
|
||||
@ -9764,6 +9798,9 @@ drwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/plugins/xcbglintegrations/
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
|
||||
-rwxr-xr-x root/root usr/lib/qt5/plugins/xcbglintegrations/libqxcb-glx-integration.so
|
||||
drwxr-xr-x root/root usr/lib/qt5/qml/
|
||||
drwxr-xr-x root/root usr/lib/qt5/qml/Qt/
|
||||
drwxr-xr-x root/root usr/lib/qt5/qml/Qt/WebSockets/
|
||||
|
||||
@ -1,12 +1,18 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/R2Z0h2tY6gYaGy0KlVU+rLfumgpOibEmiSdvu3Kzr/eLK4i3HFs9JRzdosuXJdDw0f5hdb1d5lX5co+tfmo0AQ=
|
||||
SHA256 (Pkgfile) = 369ba14a00185ed1b9ca83055aa8735274075a522173c0df7cc582657405773e
|
||||
SHA256 (.footprint) = c48d85332484192ffa537e6e3e194dc9123fc6ab3c8d33aef7d757a956498470
|
||||
RWSE3ohX2g5d/UkSdmy3YyrCcciBqEB0tZgFJYCvVXz0bUDow6cdbo9vTX97gRENSTR7N/xMfAaiMbvQWPWHA+x/NzxtS2QsGw8=
|
||||
SHA256 (Pkgfile) = 41b2cebfd4ecae3dfafa5d398bcee413860e8c45016c9e7f4810f86d54717a07
|
||||
SHA256 (.footprint) = 7b4e410164ec22804d6b09d5aa93bb45a68fcda674c76d9ca4b0fd69d864464b
|
||||
SHA256 (qt-everywhere-opensource-src-5.15.14.tar.xz) = fdd3a4f197d2c800ee0085c721f4bef60951cbda9e9c46e525d1412f74264ed7
|
||||
SHA256 (qt-everywhere-opensource-src-5.15.14-kf5-1.patch) = 7503a3e6dfbcfb9646d3e9d9b1dcd8662ba93d5a0ffab213c53ae93d7f86cb18
|
||||
SHA256 (qtbase-5.15.8-fix-missing-qtsan-include.patch) = 65b435d09220fc66584f9613cdf7518367185af4e166c5b670301be6af98e8b1
|
||||
SHA256 (qt5-cflags.patch) = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
|
||||
SHA256 (qt5-logo.png) = ae1335ecd1cd2d17032184895ab298a636cdfa8121b0ed71307c4f2b23ec928e
|
||||
SHA256 (qt5-quick3d-assimp-5.1.patch) = 57a3ac54c46f86d1f99ce20653bb34215cbd65fbd36f7ee802360336e88f268e
|
||||
SHA256 (d8054f1efa0b97b291a6f8c7fff9090b0fd4328e.patch) = 9647d0a0fc4a1983a824bcb66643e14b8e3cf433542820b75d1654f33a4d78aa
|
||||
SHA256 (5a07e1967dcc925d9def47accadae991436b9686.patch) = ef9c6e5f5f7b2426406a4ac582eca84669bc5cc7283cfd884f1f6f9f2206fd03
|
||||
SHA256 (0d9987b43e695f5202c5d69a5e42ab70a678b04f.patch) = c9888e8b981c1869efa689e7ec7a7310da1ffc66643e2ff33067bcb9741917fa
|
||||
SHA256 (35d566724c48180c9a372c2ed50a253871a51574.patch) = 2f293914133b326ee180d100dfe769c66e594ff8d6d6f354b052a0f0e45352e5
|
||||
SHA256 (qtlocation-fix-rapidjson-build.patch) = 12d435c05527923b6455a2e18ad109bf66e6b9faaa71bf64459a2eab2cb45c22
|
||||
SHA256 (qtbase-everywhere-src-5.14.2-no_relocatable.patch) = 1fed8b9e4eb5749e70d85d7678f08a5abc881e2a2ecab85fb21f59cb124500e5
|
||||
SHA256 (qtbase-everywhere-src-5.15.2-libglvnd.patch) = 6dd54f841127f20c27300874833636105f15e7481f549c007504bb82cf26c177
|
||||
SHA256 (qtbase-use-wayland-on-gnome.patch) = d62367c679e655a472f2777b9a7a97e17bd1340c0f0b2d40d1621217743122b8
|
||||
|
||||
32
qt5/0d9987b43e695f5202c5d69a5e42ab70a678b04f.patch
Normal file
32
qt5/0d9987b43e695f5202c5d69a5e42ab70a678b04f.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 0d9987b43e695f5202c5d69a5e42ab70a678b04f Mon Sep 17 00:00:00 2001
|
||||
From: Janusz Chorko <janusz.chorko@apdu.pl>
|
||||
Date: Fri, 26 Aug 2016 21:17:38 +0200
|
||||
Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718
|
||||
|
||||
Downstream report: https://bugs.gentoo.org/914581
|
||||
|
||||
See also:
|
||||
https://github.com/Tencent/rapidjson/issues/718
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
(cherry-picked from rapidjson upstream commit 3b2441b87f99ab65f37b141a7b548ebadb607b96)
|
||||
---
|
||||
deps/rapidjson/1.1.0/include/rapidjson/document.h | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/deps/rapidjson/1.1.0/include/rapidjson/document.h b/deps/rapidjson/1.1.0/include/rapidjson/document.h
|
||||
index e3e20dfbdc..b0f1f70beb 100644
|
||||
--- a/deps/rapidjson/1.1.0/include/rapidjson/document.h
|
||||
+++ b/deps/rapidjson/1.1.0/include/rapidjson/document.h
|
||||
@@ -316,8 +316,6 @@ struct GenericStringRef {
|
||||
|
||||
GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
|
||||
|
||||
- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
|
||||
-
|
||||
//! implicit conversion to plain CharType pointer
|
||||
operator const Ch *() const { return s; }
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
26
qt5/35d566724c48180c9a372c2ed50a253871a51574.patch
Normal file
26
qt5/35d566724c48180c9a372c2ed50a253871a51574.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 35d566724c48180c9a372c2ed50a253871a51574 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rojas <arojas@archlinux.org>
|
||||
Date: Thu, 9 May 2024 23:37:15 +0000
|
||||
Subject: [PATCH] Fix build with ICU 75
|
||||
|
||||
---
|
||||
mapbox-gl-native.pro | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mapbox-gl-native.pro b/mapbox-gl-native.pro
|
||||
index ed974db779..4d5835d73e 100644
|
||||
--- a/mapbox-gl-native.pro
|
||||
+++ b/mapbox-gl-native.pro
|
||||
@@ -2,8 +2,7 @@ TARGET = qmapboxgl
|
||||
|
||||
load(qt_helper_lib)
|
||||
|
||||
-CONFIG += qt c++14 exceptions warn_off staticlib object_parallel_to_source
|
||||
-CONFIG -= c++1z
|
||||
+CONFIG += qt c++17 exceptions warn_off staticlib object_parallel_to_source
|
||||
|
||||
QT += network-private \
|
||||
gui-private \
|
||||
--
|
||||
GitLab
|
||||
|
||||
26
qt5/5a07e1967dcc925d9def47accadae991436b9686.patch
Normal file
26
qt5/5a07e1967dcc925d9def47accadae991436b9686.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 5a07e1967dcc925d9def47accadae991436b9686 Mon Sep 17 00:00:00 2001
|
||||
From: Manuel Nickschas <sputnick@quassel-irc.org>
|
||||
Date: Tue, 11 Apr 2023 22:24:11 +0200
|
||||
Subject: [PATCH] Add missing include
|
||||
|
||||
Fixes build with libcxx, see also:
|
||||
https://bugs.gentoo.org/903575
|
||||
---
|
||||
include/mbgl/util/unique_any.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/mbgl/util/unique_any.hpp b/include/mbgl/util/unique_any.hpp
|
||||
index c7dc8b38ea..0fb25b8b4a 100644
|
||||
--- a/include/mbgl/util/unique_any.hpp
|
||||
+++ b/include/mbgl/util/unique_any.hpp
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <typeinfo>
|
||||
#include <type_traits>
|
||||
#include <stdexcept>
|
||||
+#include <utility>
|
||||
namespace mbgl {
|
||||
namespace util {
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
22
qt5/Pkgfile
22
qt5/Pkgfile
@ -6,12 +6,18 @@
|
||||
|
||||
name=qt5
|
||||
version=5.15.14
|
||||
release=1
|
||||
release=2
|
||||
source=(https://download.qt.io/official_releases/qt/5.15/$version/single/qt-everywhere-opensource-src-$version.tar.xz
|
||||
qt-everywhere-opensource-src-$version-kf5-1.patch
|
||||
qtbase-5.15.8-fix-missing-qtsan-include.patch
|
||||
qt5-cflags.patch
|
||||
qt5-logo.png
|
||||
qt5-quick3d-assimp-5.1.patch
|
||||
d8054f1efa0b97b291a6f8c7fff9090b0fd4328e.patch
|
||||
5a07e1967dcc925d9def47accadae991436b9686.patch
|
||||
0d9987b43e695f5202c5d69a5e42ab70a678b04f.patch
|
||||
35d566724c48180c9a372c2ed50a253871a51574.patch
|
||||
qtlocation-fix-rapidjson-build.patch
|
||||
qtbase-everywhere-src-5.14.2-no_relocatable.patch
|
||||
qtbase-everywhere-src-5.15.2-libglvnd.patch
|
||||
qtbase-use-wayland-on-gnome.patch)
|
||||
@ -31,6 +37,10 @@ build() {
|
||||
patch -d qtbase -p1 -i $SRC/qtbase-everywhere-src-5.15.2-libglvnd.patch
|
||||
patch -d qtbase -p1 -i $SRC/qtbase-use-wayland-on-gnome.patch
|
||||
patch -d qtbase -p1 -i $SRC/qtbase-5.15.8-fix-missing-qtsan-include.patch
|
||||
patch -d qtlocation -p1 -i $SRC/qtlocation-fix-rapidjson-build.patch
|
||||
patch -d qtlocation/src/3rdparty/mapbox-gl-native -p1 -i $SRC/d8054f1efa0b97b291a6f8c7fff9090b0fd4328e.patch
|
||||
patch -d qtlocation/src/3rdparty/mapbox-gl-native -p1 -i $SRC/5a07e1967dcc925d9def47accadae991436b9686.patch
|
||||
patch -d qtlocation/src/3rdparty/mapbox-gl-native -p1 -i $SRC/35d566724c48180c9a372c2ed50a253871a51574.patch
|
||||
|
||||
export PYTHON='/usr/bin/python3'
|
||||
mkdir $SRC/bin
|
||||
@ -43,7 +53,11 @@ build() {
|
||||
|
||||
prt-get isinst ccache && PKGMK_QT5+=' -ccache' && \
|
||||
PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
prt-get isinst assimp && PKGMK_QT5+=' -system-assimp'
|
||||
if prt-get isinst assimp; then
|
||||
PKGMK_QT5+=' -system-assimp'
|
||||
patch -d qtquick3d -p1 -i $SRC/qt5-quick3d-assimp-5.1.patch
|
||||
fi
|
||||
|
||||
#prt-get isinst clang && PKGMK_QT5+=' -platform linux-clang'
|
||||
#prt-get isinst clang lld && PKGMK_QT5+=' -linker lld' || PKGMK_QT5+=' -linker gold'
|
||||
|
||||
@ -70,8 +84,8 @@ build() {
|
||||
-headerdir /usr/include/qt5 \
|
||||
-libdir /usr/lib \
|
||||
-sysconfdir /etc/xdg \
|
||||
QMAKE_CFLAGS_RELEASE="$CFLAGS -Wno-enum-constexpr-conversion" \
|
||||
QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS -Wno-enum-constexpr-conversion" \
|
||||
QMAKE_CFLAGS_RELEASE="$CFLAGS" \
|
||||
QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
|
||||
QMAKE_LFLAGS_RELEASE="${LDFLAGS} -fuse-ld=gold" \
|
||||
-confirm-license \
|
||||
-opensource \
|
||||
|
||||
52
qt5/d8054f1efa0b97b291a6f8c7fff9090b0fd4328e.patch
Normal file
52
qt5/d8054f1efa0b97b291a6f8c7fff9090b0fd4328e.patch
Normal file
@ -0,0 +1,52 @@
|
||||
From d8054f1efa0b97b291a6f8c7fff9090b0fd4328e Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Fri, 3 Mar 2023 11:39:58 +0100
|
||||
Subject: [PATCH] Add some missing cstdint inclusions (#872)
|
||||
|
||||
GCC 13 removed some indirect inclusions of cstdint which this relied on.
|
||||
Include it explicitly to fix build errors.
|
||||
---
|
||||
include/mbgl/util/geometry.hpp | 2 ++
|
||||
include/mbgl/util/string.hpp | 1 +
|
||||
src/mbgl/gl/stencil_mode.hpp | 2 ++
|
||||
3 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
|
||||
index a28c59a47d..283ec7dbbe 100644
|
||||
--- a/include/mbgl/util/geometry.hpp
|
||||
+++ b/include/mbgl/util/geometry.hpp
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include <mapbox/geometry/geometry.hpp>
|
||||
#include <mapbox/geometry/point_arithmetic.hpp>
|
||||
#include <mapbox/geometry/for_each_point.hpp>
|
||||
diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
|
||||
index 13498ccb92..2f6acb6410 100644
|
||||
--- a/include/mbgl/util/string.hpp
|
||||
+++ b/include/mbgl/util/string.hpp
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <cassert>
|
||||
+#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <exception>
|
||||
|
||||
diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp
|
||||
index bc959c9a73..fd00370f88 100644
|
||||
--- a/src/mbgl/gl/stencil_mode.hpp
|
||||
+++ b/src/mbgl/gl/stencil_mode.hpp
|
||||
@@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include <mbgl/util/variant.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
--
|
||||
GitLab
|
||||
|
||||
15
qt5/qt5-quick3d-assimp-5.1.patch
Normal file
15
qt5/qt5-quick3d-assimp-5.1.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/src/plugins/assetimporters/assimp/assimpimporter.cpp b/src/plugins/assetimporters/assimp/assimpimporter.cpp
|
||||
index f3660fdd..0f5fc901 100644
|
||||
--- a/src/plugins/assetimporters/assimp/assimpimporter.cpp
|
||||
+++ b/src/plugins/assetimporters/assimp/assimpimporter.cpp
|
||||
@@ -1082,9 +1082,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
|
||||
}
|
||||
|
||||
// SpecularGlossiness Properties
|
||||
- bool hasSpecularGlossiness;
|
||||
- result = material->Get(AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS, hasSpecularGlossiness);
|
||||
- if (result == aiReturn_SUCCESS && hasSpecularGlossiness) {
|
||||
+ {
|
||||
|
||||
// diffuseFactor (color) // not used (yet), but ends up being diffuseColor
|
||||
// {
|
||||
13
qt5/qtlocation-fix-rapidjson-build.patch
Normal file
13
qt5/qtlocation-fix-rapidjson-build.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
|
||||
index e3e20df..ad362a6 100644
|
||||
--- a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
|
||||
+++ b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
|
||||
@@ -322,7 +322,7 @@ struct GenericStringRef {
|
||||
operator const Ch *() const { return s; }
|
||||
|
||||
const Ch* const s; //!< plain CharType pointer
|
||||
- const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
|
||||
+ SizeType length; //!< length of the string (excluding the trailing NULL terminator)
|
||||
|
||||
private:
|
||||
//! Disallow construction from non-const array
|
||||
Loading…
x
Reference in New Issue
Block a user