mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
commit
1e2c94be16
@ -0,0 +1,43 @@
|
||||
From 0afad46bb71b106780dd641de768a81d9f6c6a51 Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Mon, 18 Jan 2021 07:40:54 -0800
|
||||
Subject: Fix build with GCC 11: include <limits>
|
||||
|
||||
Fixes: QTBUG-90395
|
||||
Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
|
||||
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
||||
(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c)
|
||||
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
||||
---
|
||||
src/corelib/global/qendian.h | 4 +++-
|
||||
src/corelib/global/qfloat16.h | 1 +
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
|
||||
index 2fe29e4338..3abd6a000c 100644
|
||||
--- a/src/corelib/global/qendian.h
|
||||
+++ b/src/corelib/global/qendian.h
|
||||
@@ -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 5b369bf3c5..6c52c94466 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__)
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
@ -0,0 +1,59 @@
|
||||
From 8bcf1828f4d75606fb8d6913dfe09e2363a06cac Mon Sep 17 00:00:00 2001
|
||||
From: Ville Voutilainen <ville.voutilainen@qt.io>
|
||||
Date: Mon, 18 Jan 2021 09:58:17 +0200
|
||||
Subject: [PATCH 002/132] Build fixes for GCC 11
|
||||
|
||||
Task-number: QTBUG-89977
|
||||
Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
|
||||
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
|
||||
---
|
||||
src/corelib/text/qbytearraymatcher.h | 2 ++
|
||||
src/corelib/tools/qsharedpointer_impl.h | 3 ---
|
||||
src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
|
||||
3 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
|
||||
index 0eedfc1d20..f5f9bef7b8 100644
|
||||
--- a/src/corelib/text/qbytearraymatcher.h
|
||||
+++ b/src/corelib/text/qbytearraymatcher.h
|
||||
@@ -42,6 +42,8 @@
|
||||
|
||||
#include <QtCore/qbytearray.h>
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
|
||||
index 790c187cb9..4aee98af53 100644
|
||||
--- a/src/corelib/tools/qsharedpointer_impl.h
|
||||
+++ b/src/corelib/tools/qsharedpointer_impl.h
|
||||
@@ -155,9 +155,6 @@ namespace QtSharedPointer {
|
||||
#endif
|
||||
inline void checkQObjectShared(...) { }
|
||||
inline void setQObjectShared(...) { }
|
||||
-
|
||||
- inline void operator delete(void *ptr) { ::operator delete(ptr); }
|
||||
- inline void operator delete(void *, void *) { }
|
||||
};
|
||||
// sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
index 9e7e1a5572..f0866a90ac 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
@@ -698,7 +698,7 @@ void QXcbWindow::show()
|
||||
if (isTransient(window())) {
|
||||
const QWindow *tp = window()->transientParent();
|
||||
if (tp && tp->handle())
|
||||
- transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
|
||||
+ transientXcbParent = tp->handle()->winId();
|
||||
// Default to client leader if there is no transient parent, else modal dialogs can
|
||||
// be hidden by their parents.
|
||||
if (!transientXcbParent)
|
||||
--
|
||||
2.35.1
|
||||
|
@ -10,7 +10,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/xbmc/audiodecoder.2sf"
|
||||
PKG_URL="https://github.com/xbmc/audiodecoder.2sf/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain kodi-platform"
|
||||
PKG_DEPENDS_TARGET="toolchain kodi-platform zlib"
|
||||
PKG_SECTION=""
|
||||
PKG_SHORTDESC="audiodecoder.2sf"
|
||||
PKG_LONGDESC="audiodecoder.2sf"
|
||||
|
@ -9,7 +9,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/kodi-game/game.libretro"
|
||||
PKG_URL="https://github.com/kodi-game/game.libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain tinyxml kodi"
|
||||
PKG_DEPENDS_TARGET="toolchain tinyxml kodi-platform"
|
||||
PKG_SECTION=""
|
||||
PKG_LONGDESC="game.libretro is a thin wrapper for libretro"
|
||||
|
||||
|
@ -10,7 +10,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/kodi-pvr/pvr.iptvsimple"
|
||||
PKG_URL="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain kodi-platform pugixml zlib"
|
||||
PKG_DEPENDS_TARGET="toolchain kodi-platform pugixml zlib xz"
|
||||
PKG_SECTION=""
|
||||
PKG_SHORTDESC="pvr.iptvsimple"
|
||||
PKG_LONGDESC="pvr.iptvsimple"
|
||||
|
Loading…
x
Reference in New Issue
Block a user