From 67383907ebd7466b5750482e1de400fe14a40004 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 4 Feb 2025 16:35:54 +0100 Subject: [PATCH] qtbase: update to 5.15.16 full version and rename to qt5 Signed-off-by: Matthias Reichl --- .../addon-depends/{qtbase => qt5}/package.mk | 54 +++++++++++++++-- ...root-path-for-pkgconfig-and-libtool.patch} | 18 +----- .../qtbase-0002-fix-build-with-gcc-11.patch | 43 -------------- ...ase-0003-More-build-fixes-for-GCC-11.patch | 59 ------------------- 4 files changed, 50 insertions(+), 124 deletions(-) rename packages/addons/addon-depends/{qtbase => qt5}/package.mk (60%) rename packages/addons/addon-depends/{qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch => qt5/patches/0001-use-sysroot-path-for-pkgconfig-and-libtool.patch} (70%) delete mode 100644 packages/addons/addon-depends/qtbase/patches/qtbase-0002-fix-build-with-gcc-11.patch delete mode 100644 packages/addons/addon-depends/qtbase/patches/qtbase-0003-More-build-fixes-for-GCC-11.patch diff --git a/packages/addons/addon-depends/qtbase/package.mk b/packages/addons/addon-depends/qt5/package.mk similarity index 60% rename from packages/addons/addon-depends/qtbase/package.mk rename to packages/addons/addon-depends/qt5/package.mk index 4f1bdf4ad5..b980aa3a5b 100644 --- a/packages/addons/addon-depends/qtbase/package.mk +++ b/packages/addons/addon-depends/qt5/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) -PKG_NAME="qtbase" -PKG_VERSION="5.14.0" -PKG_SHA256="4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463" +PKG_NAME="qt5" +PKG_VERSION="5.15.16" +PKG_SHA256="efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c" PKG_LICENSE="GPL" 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_LONGDESC="A cross-platform application and UI framework." PKG_BUILD_FLAGS="-sysroot" @@ -62,10 +62,52 @@ PKG_CONFIGURE_OPTS_TARGET="-prefix /usr -system-libpng -system-libjpeg -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() { - QMAKE_CONF_DIR="mkspecs/devices/linux-libreelec-g++" + QMAKE_CONF_DIR="qtbase/mkspecs/devices/linux-libreelec-g++" cd .. mkdir -p ${QMAKE_CONF_DIR} diff --git a/packages/addons/addon-depends/qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch b/packages/addons/addon-depends/qt5/patches/0001-use-sysroot-path-for-pkgconfig-and-libtool.patch similarity index 70% rename from packages/addons/addon-depends/qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch rename to packages/addons/addon-depends/qt5/patches/0001-use-sysroot-path-for-pkgconfig-and-libtool.patch index d6e2a103e4..c893467814 100644 --- a/packages/addons/addon-depends/qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch +++ b/packages/addons/addon-depends/qt5/patches/0001-use-sysroot-path-for-pkgconfig-and-libtool.patch @@ -1,16 +1,5 @@ -From 0650bbb7d79c6db34bc54dfb73320303d83a8f56 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -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 +--- a/qtbase/mkspecs/features/qt_module.prf ++++ b/qtbase/mkspecs/features/qt_module.prf @@ -275,12 +275,12 @@ load(qt_targets) host_build: \ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] @@ -36,6 +25,3 @@ index 828a9621b9..0f3472fffc 100644 !isEmpty(lib_replace0.match) { ltlib_replace0.match = $$lib_replace0.match ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ --- -2.17.1 - diff --git a/packages/addons/addon-depends/qtbase/patches/qtbase-0002-fix-build-with-gcc-11.patch b/packages/addons/addon-depends/qtbase/patches/qtbase-0002-fix-build-with-gcc-11.patch deleted file mode 100644 index 5aa0230e6d..0000000000 --- a/packages/addons/addon-depends/qtbase/patches/qtbase-0002-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0afad46bb71b106780dd641de768a81d9f6c6a51 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 18 Jan 2021 07:40:54 -0800 -Subject: Fix build with GCC 11: include - -Fixes: QTBUG-90395 -Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40 -Reviewed-by: Edward Welbourne -(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c) -Reviewed-by: Andy Shaw ---- - 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 - #include - -+#include -+ - // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems - #include - #include -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 - #include -+#include - #include - - #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) --- -cgit v1.2.1 - diff --git a/packages/addons/addon-depends/qtbase/patches/qtbase-0003-More-build-fixes-for-GCC-11.patch b/packages/addons/addon-depends/qtbase/patches/qtbase-0003-More-build-fixes-for-GCC-11.patch deleted file mode 100644 index b0e725e4ca..0000000000 --- a/packages/addons/addon-depends/qtbase/patches/qtbase-0003-More-build-fixes-for-GCC-11.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8bcf1828f4d75606fb8d6913dfe09e2363a06cac Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -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 -Reviewed-by: Thiago Macieira -(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 - -+#include -+ - 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(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 -