forked from pool/libqt5-qtbase
Accepting request 870227 from home:Vogtinator:qt5.15
- Add patch to fix build with GCC 11 (boo#1181861, QTBUG-90395): * 0001-Fix-build-with-GCC-11-include-limits.patch * 0001-Include-limits-in-qbytearraymatcher.h.patch OBS-URL: https://build.opensuse.org/request/show/870227 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtbase?expand=0&rev=22
This commit is contained in:
parent
cbc7c566b3
commit
97f4307af4
53
0001-Fix-build-with-GCC-11-include-limits.patch
Normal file
53
0001-Fix-build-with-GCC-11-include-limits.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From 924424120a2c468511256072e05d1ecc7c0c74a7 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Mon, 18 Jan 2021 07:40:54 -0800
|
||||
Subject: [PATCH] Fix build with GCC 11: include <limits>
|
||||
|
||||
Fixes: QTBUG-90395
|
||||
Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
|
||||
(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c)
|
||||
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
||||
(cherry picked from commit b2af6332ea37e45ab230a7a5d2d278f86d961b83)
|
||||
---
|
||||
src/corelib/global/qendian.h | 6 ++++--
|
||||
src/corelib/global/qfloat16.h | 1 +
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
|
||||
index 257efbbdbe..339f53abb6 100644
|
||||
--- a/src/corelib/global/qendian.h
|
||||
+++ b/src/corelib/global/qendian.h
|
||||
@@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
-** Copyright (C) 2016 The Qt Company Ltd.
|
||||
-** Copyright (C) 2016 Intel Corporation.
|
||||
+** Copyright (C) 2021 The Qt Company Ltd.
|
||||
+** Copyright (C) 2021 Intel Corporation.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtCore module of the Qt Toolkit.
|
||||
@@ -44,6 +44,8 @@
|
||||
#include <QtCore/qfloat16.h>
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
|
||||
index c7a9c87af3..5302be072e 100644
|
||||
--- a/src/corelib/global/qfloat16.h
|
||||
+++ b/src/corelib/global/qfloat16.h
|
||||
@@ -43,6 +43,7 @@
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
+#include <limits>
|
||||
#include <string.h>
|
||||
|
||||
#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
|
||||
--
|
||||
2.25.1
|
||||
|
25
0001-Include-limits-in-qbytearraymatcher.h.patch
Normal file
25
0001-Include-limits-in-qbytearraymatcher.h.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 5c8acc8a047956dc79ee4f0bfbee32daa981d0fa Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Mon, 8 Feb 2021 10:29:27 +0100
|
||||
Subject: [PATCH] Include <limits> in qbytearraymatcher.h
|
||||
|
||||
---
|
||||
src/corelib/text/qbytearraymatcher.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
|
||||
index 0eedfc1d20..26754829f1 100644
|
||||
--- a/src/corelib/text/qbytearraymatcher.h
|
||||
+++ b/src/corelib/text/qbytearraymatcher.h
|
||||
@@ -40,6 +40,8 @@
|
||||
#ifndef QBYTEARRAYMATCHER_H
|
||||
#define QBYTEARRAYMATCHER_H
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
#include <QtCore/qbytearray.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 8 09:16:47 UTC 2021 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Add patch to fix build with GCC 11 (boo#1181861, QTBUG-90395):
|
||||
* 0001-Fix-build-with-GCC-11-include-limits.patch
|
||||
* 0001-Include-limits-in-qbytearraymatcher.h.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 19 07:46:43 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
|
@ -70,6 +70,9 @@ Patch1001: 0001-Let-QXcbConnection-getTimestamp-properly-exit-when-X.patch
|
||||
# patches 2000-3000 and above from upstream qt6/dev branch #
|
||||
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
|
||||
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
|
||||
Patch2002: 0001-Fix-build-with-GCC-11-include-limits.patch
|
||||
# Theoretically for upstream, but upstream is dead
|
||||
Patch2003: 0001-Include-limits-in-qbytearraymatcher.h.patch
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: double-conversion-devel
|
||||
BuildRequires: gcc-c++
|
||||
|
Loading…
Reference in New Issue
Block a user