mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
qtbase: update to 5.15.16 full version and rename to qt5
Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl
parent
813a1e05a5
commit
21f0c4b2d5
@ -2,12 +2,12 @@
|
|||||||
# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
|
# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
|
||||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="qtbase"
|
PKG_NAME="qt5"
|
||||||
PKG_VERSION="5.14.0"
|
PKG_VERSION="5.15.16"
|
||||||
PKG_SHA256="4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463"
|
PKG_SHA256="efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="https://qt-project.org"
|
PKG_SITE="https://qt-project.org"
|
||||||
PKG_URL="https://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/submodules/${PKG_NAME}-everywhere-src-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/single/qt-everywhere-opensource-src-${PKG_VERSION}.tar.xz"
|
||||||
PKG_DEPENDS_TARGET="freetype libjpeg-turbo libpng openssl sqlite zlib"
|
PKG_DEPENDS_TARGET="freetype libjpeg-turbo libpng openssl sqlite zlib"
|
||||||
PKG_LONGDESC="A cross-platform application and UI framework."
|
PKG_LONGDESC="A cross-platform application and UI framework."
|
||||||
PKG_BUILD_FLAGS="-sysroot"
|
PKG_BUILD_FLAGS="-sysroot"
|
||||||
@ -62,10 +62,52 @@ PKG_CONFIGURE_OPTS_TARGET="-prefix /usr
|
|||||||
-system-libpng
|
-system-libpng
|
||||||
-system-libjpeg
|
-system-libjpeg
|
||||||
-no-sql-mysql
|
-no-sql-mysql
|
||||||
-system-sqlite"
|
-system-sqlite
|
||||||
|
-no-gtk
|
||||||
|
-no-xcb-xlib
|
||||||
|
-skip qt3d
|
||||||
|
-skip qtactiveqt
|
||||||
|
-skip qtandroidextras
|
||||||
|
-skip qtcharts
|
||||||
|
-skip qtconnectivity
|
||||||
|
-skip qtdatavis3d
|
||||||
|
-skip qtdeclarative
|
||||||
|
-skip qtdoc
|
||||||
|
-skip qtgamepad
|
||||||
|
-skip qtgraphicaleffects
|
||||||
|
-skip qtimageformats
|
||||||
|
-skip qtlocation
|
||||||
|
-skip qtlottie
|
||||||
|
-skip qtmacextras
|
||||||
|
-skip qtmultimedia
|
||||||
|
-skip qtnetworkauth
|
||||||
|
-skip qtpurchasing
|
||||||
|
-skip qtquick3d
|
||||||
|
-skip qtquickcontrols
|
||||||
|
-skip qtquickcontrols2
|
||||||
|
-skip qtquicktimeline
|
||||||
|
-skip qtremoteobjects
|
||||||
|
-skip qtscript
|
||||||
|
-skip qtscxml
|
||||||
|
-skip qtsensors
|
||||||
|
-skip qtserialbus
|
||||||
|
-skip qtspeech
|
||||||
|
-skip qtsvg
|
||||||
|
-skip qttools
|
||||||
|
-skip qttranslations
|
||||||
|
-skip qtvirtualkeyboard
|
||||||
|
-skip qtwayland
|
||||||
|
-skip qtwebchannel
|
||||||
|
-skip qtwebengine
|
||||||
|
-skip qtwebglplugin
|
||||||
|
-skip qtwebsockets
|
||||||
|
-skip qtwebview
|
||||||
|
-skip qtwinextras
|
||||||
|
-skip qtx11extras
|
||||||
|
-skip qtxmlpatterns"
|
||||||
|
|
||||||
configure_target() {
|
configure_target() {
|
||||||
QMAKE_CONF_DIR="mkspecs/devices/linux-libreelec-g++"
|
QMAKE_CONF_DIR="qtbase/mkspecs/devices/linux-libreelec-g++"
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
mkdir -p ${QMAKE_CONF_DIR}
|
mkdir -p ${QMAKE_CONF_DIR}
|
||||||
@ -1,16 +1,5 @@
|
|||||||
From 0650bbb7d79c6db34bc54dfb73320303d83a8f56 Mon Sep 17 00:00:00 2001
|
--- a/qtbase/mkspecs/features/qt_module.prf
|
||||||
From: Jonas Karlman <jonas@kwiboo.se>
|
+++ b/qtbase/mkspecs/features/qt_module.prf
|
||||||
Date: Tue, 14 Jan 2020 21:35:57 +0000
|
|
||||||
Subject: [PATCH] use sysroot path for pkgconfig and libtool
|
|
||||||
|
|
||||||
---
|
|
||||||
mkspecs/features/qt_module.prf | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
|
||||||
index 828a9621b9..0f3472fffc 100644
|
|
||||||
--- a/mkspecs/features/qt_module.prf
|
|
||||||
+++ b/mkspecs/features/qt_module.prf
|
|
||||||
@@ -275,12 +275,12 @@ load(qt_targets)
|
@@ -275,12 +275,12 @@ load(qt_targets)
|
||||||
host_build: \
|
host_build: \
|
||||||
QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
|
QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
|
||||||
@ -36,6 +25,3 @@ index 828a9621b9..0f3472fffc 100644
|
|||||||
!isEmpty(lib_replace0.match) {
|
!isEmpty(lib_replace0.match) {
|
||||||
ltlib_replace0.match = $$lib_replace0.match
|
ltlib_replace0.match = $$lib_replace0.match
|
||||||
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
|
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user