[neon/qt/qtdeclarative/Neon/release] debian: Include <limits> in Yarr.h to fix FTBFS with GCC 11 on arm64 and i386.

Dmitry Shachnev null at kde.org
Thu May 5 11:48:35 BST 2022


Git commit 098de5cae9516df71d1d7916af2f7da0c6e173b3 by Dmitry Shachnev.
Committed on 18/08/2021 at 10:43.
Pushed by jriddell into branch 'Neon/release'.

Include <limits> in Yarr.h to fix FTBFS with GCC 11 on arm64 and i386.

M  +2    -0    debian/changelog
M  +11   -1    debian/patches/gcc_11.patch

https://invent.kde.org/neon/qt/qtdeclarative/commit/098de5cae9516df71d1d7916af2f7da0c6e173b3

diff --git a/debian/changelog b/debian/changelog
index 57cb482..0f456d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtdeclarative-opensource-src (5.15.2+dfsg-8) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Include <limits> in Yarr.h to fix FTBFS with GCC 11 on arm64 and i386.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 18 Aug 2021 13:11:59 +0300
 
diff --git a/debian/patches/gcc_11.patch b/debian/patches/gcc_11.patch
index f1eaab3..8b2a7cc 100644
--- a/debian/patches/gcc_11.patch
+++ b/debian/patches/gcc_11.patch
@@ -2,8 +2,18 @@ Description: build fixes for GCC 11
 Origin: upstream, commits:
  https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=eb6525f126f680f9
  https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=367293b18ab0d0a0
-Last-Update: 2021-08-09
+Last-Update: 2021-08-18
 
+--- a/src/3rdparty/masm/yarr/Yarr.h
++++ b/src/3rdparty/masm/yarr/Yarr.h
+@@ -28,6 +28,7 @@
+ #pragma once
+ 
+ #include <limits.h>
++#include <limits>
+ #include "YarrErrorCode.h"
+ 
+ namespace JSC { namespace Yarr {
 --- a/src/qml/compiler/qv4bytecodegenerator_p.h
 +++ b/src/qml/compiler/qv4bytecodegenerator_p.h
 @@ -186,13 +186,13 @@ QT_WARNING_POP



More information about the Neon-commits mailing list