Attachment 13456 Details for Bug 46479 – патч

[patch] патч

0001-6.4.2-alt2.patch (text/plain), 2.24 KB, created by Alexey Sheplyakov on 2023-06-13 07:32:43 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Sheplyakov

Created: 2023-06-13 07:32:43 MSK

Size: 2.24 KB

patch

obsolete

>From c643f29ac493610c7ec1ecebde56286ac372bbc1 Mon Sep 17 00:00:00 2001
>From: Alexey Sheplyakov <asheplyakov@basealt.ru>
>Date: Tue, 13 Jun 2023 04:15:10 +0000
>Subject: [PATCH] 6.4.2-alt2
>
>- fixed build with GCC 13
>---
> alt-gcc13.patch | 11 +++++++++++
> qt3d.spec       |  8 +++++++-
> 2 files changed, 18 insertions(+), 1 deletion(-)
> create mode 100644 alt-gcc13.patch
>
>diff --git a/alt-gcc13.patch b/alt-gcc13.patch
>new file mode 100644
>index 0000000..ee4ef80
>--- /dev/null
>+++ b/alt-gcc13.patch
>@@ -0,0 +1,11 @@
>+diff -Nru '--exclude=BUILD' qt3d-everywhere-src-6.4.2.orig/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp qt3d-everywhere-src-6.4.2/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
>+--- qt3d-everywhere-src-6.4.2.orig/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp	2023-03-29 14:09:38.000000000 +0000
>++++ qt3d-everywhere-src-6.4.2/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp	2023-06-13 04:07:39.701000000 +0000
>+@@ -51,6 +51,7 @@
>+ #include "FBXUtil.h"
>+ #include <assimp/defs.h>
>+ #include <stdint.h>
>++#include <cstdint>
>+ #include <assimp/Exceptional.h>
>+ #include <assimp/ByteSwapper.h>
>+ #include <assimp/DefaultLogger.hpp>
>diff --git a/qt3d.spec b/qt3d.spec
>index 885c2b0..9c6b0a2 100644
>--- a/qt3d.spec
>+++ b/qt3d.spec
>@@ -3,7 +3,7 @@
> 
> Name: qt6-3d
> Version: 6.4.2
>-Release: alt1
>+Release: alt2
> 
> Group: System/Libraries
> Summary: Qt6 - Qt3D QML bindings and C++ APIs
>@@ -13,6 +13,7 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
> Requires: qt6-imageformats
> 
> Source: %qt_module-everywhere-src-%version.tar
>+Patch1: alt-gcc13.patch
> 
> BuildRequires(pre): rpm-macros-qt6 qt6-tools
> BuildRequires: cmake qt6-base-devel qt6-declarative-devel qt6-shadertools-devel qt6-multimedia-devel
>@@ -152,6 +153,8 @@ Requires: libqt6-core = %_qt6_version
> 
> %prep
> %setup -n %qt_module-everywhere-src-%version
>+%patch1 -p1
>+
> cat >>src/plugins/renderers/rhi/CMakeLists.txt <<__EOF__
> find_package(Qt6 COMPONENTS ShaderTools)
> __EOF__
>@@ -231,6 +234,9 @@ __EOF__
> #%_qt6_examplesdir/*
> 
> %changelog
>+* Tue Jun 13 2023 Alexey Sheplyakov <asheplyakov@altlinux.org> 6.4.2-alt2
>+- fixed build with GCC 13
>+
> * Wed Feb 15 2023 Sergey V Turchin <zerg@altlinux.org> 6.4.2-alt1
> - new version
> 
>-- 
>2.33.3
>

Actions: View | Diff

Attachments on bug 46479: 13456