opencollada: Fix build with gcc-15

This commit is contained in:
مهدي شينون (Mehdi Chinoune)
2025-07-21 05:43:48 +01:00
parent 3ac07fcaea
commit 7b772bb628
2 changed files with 29 additions and 7 deletions

View File

@@ -0,0 +1,19 @@
--- a/DAEValidator/library/src/DaeValidator.cpp
+++ b/DAEValidator/library/src/DaeValidator.cpp
@@ -4,6 +4,7 @@
#include "Strings.h"
#include "StringUtil.h"
#include <cmath>
+#include <cstdint>
#include "no_warning_iomanip"
#include "no_warning_iostream"
#include <set>
--- a/DAEValidator/library/src/XmlDoc.cpp
+++ b/DAEValidator/library/src/XmlDoc.cpp
@@ -1,5 +1,6 @@
#include "Macros.h"
+#include <cstdint>
#if IS_GNUC_AND_GNUC_VERSION_LT(5,1,1)
#include <cstring>
#endif

View File

@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
pkgver=1.6.68
pkgrel=5
pkgrel=6
pkgdesc="Stream based reader and writer library for COLLADA files (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -15,12 +15,12 @@ msys2_references=(
'archlinux: opencollada'
)
license=("spdx:MIT")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
"${MINGW_PACKAGE_PREFIX}-libxml2"
"${MINGW_PACKAGE_PREFIX}-pcre")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
source=("https://github.com/KhronosGroup/OpenCOLLADA/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
fix-mingw-w64.patch
fix-missing-include.patch
@@ -31,7 +31,8 @@ source=("https://github.com/KhronosGroup/OpenCOLLADA/archive/v${pkgver}/${_realn
use-cpp-headers.patch
move-hash-function.patch
disable-indentation-warnings.patch
010-fix-unordered.patch)
010-fix-unordered.patch
011-fix-build-with-gcc-15.patch)
sha256sums=('d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b'
'10fdc2746b83161b853df6ad4ac600252c4f964377ea0186ff97f99bd3417e34'
'18f1bf9f57d1c67aa35927fb0d1b0b38def52b189742021f1268eb2bdbffc963'
@@ -42,7 +43,8 @@ sha256sums=('d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b'
'8ba7875069585e99f9ebd5044ae10c7a92af5d5a7cfcd61cf69ab24cc70cddc3'
'93eaf5c565ff30d8d37f1055a432e9516dd518ee040e9384633f55d4a9c305ca'
'4fc1d79fc2965c4fbebb9e25d174eb48b91a2d93601dfc5417c90acd88909495'
'c58ec624031b8dfa0393c138eaf23418850a59d3b7478f2e064dba8553a58b54')
'c58ec624031b8dfa0393c138eaf23418850a59d3b7478f2e064dba8553a58b54'
'a22fd084d3d19ee4877c9274ef5ff7c278cb7a0e336542fa37048662f8246ff9')
apply_patch_with_msg() {
for _patch in "$@"
@@ -64,7 +66,8 @@ prepare() {
use-cpp-headers.patch \
move-hash-function.patch \
disable-indentation-warnings.patch \
010-fix-unordered.patch
010-fix-unordered.patch \
011-fix-build-with-gcc-15.patch
}
build() {