diff --git a/packages/addons/addon-depends/qtbase/package.mk b/packages/addons/addon-depends/qtbase/package.mk index a6ee847c25..45b133c729 100644 --- a/packages/addons/addon-depends/qtbase/package.mk +++ b/packages/addons/addon-depends/qtbase/package.mk @@ -3,12 +3,12 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="qtbase" -PKG_VERSION="5.6.2" -PKG_SHA256="2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787" +PKG_VERSION="5.14.0" +PKG_SHA256="4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463" PKG_LICENSE="GPL" PKG_SITE="http://qt-project.org" -PKG_URL="http://download.qt.io/official_releases/qt/5.6/$PKG_VERSION/submodules/$PKG_NAME-opensource-src-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="pcre zlib" +PKG_URL="http://download.qt.io/archive/qt/${PKG_VERSION%.*}/$PKG_VERSION/submodules/$PKG_NAME-everywhere-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_CONFIGURE_OPTS_TARGET="-prefix /usr @@ -17,39 +17,50 @@ PKG_CONFIGURE_OPTS_TARGET="-prefix /usr -device linux-libreelec-g++ -opensource -confirm-license -release + -optimize-size + -strip -static - -make libs - -force-pkg-config - -no-accessibility - -no-sql-sqlite - -no-sql-mysql - -no-qml-debug - -system-zlib - -no-mtdev - -no-gif - -no-libpng - -no-libjpeg - -no-harfbuzz - -no-openssl - -no-libproxy - -system-pcre - -no-glib - -no-pulseaudio - -no-alsa -silent - -no-cups - -no-iconv - -no-evdev - -no-tslib - -no-icu - -no-strip - -no-fontconfig + -force-pkg-config + -make libs -no-dbus + -no-accessibility + -no-glib + -no-iconv + -no-icu + -qt-pcre + -system-zlib + -openssl-linked + -no-libproxy + -no-cups + -no-fontconfig + -system-freetype + -no-harfbuzz -no-opengl + -no-egl + -no-eglfs + -no-gbm + -no-kms + -no-linuxfb + -no-xcb + -no-feature-vnc + -no-feature-sessionmanager + -no-feature-easingcurve + -no-feature-effects + -no-feature-gestures + -no-feature-itemmodel -no-libudev + -no-evdev -no-libinput - -no-gstreamer - -no-eglfs" + -no-mtdev + -no-tslib + -no-xkbcommon + -no-gif + -no-ico + -system-libpng + -system-libjpeg + -no-sql-mysql + -system-sqlite" configure_target() { QMAKE_CONF_DIR="mkspecs/devices/linux-libreelec-g++" @@ -86,9 +97,3 @@ EOF unset CC CXX LD RANLIB AR AS CPPFLAGS CFLAGS LDFLAGS CXXFLAGS ./configure ${PKG_CONFIGURE_OPTS_TARGET} } - -post_makeinstall_target() { - # Qt installs directly to $SYSROOT_PREFIX so don't rely on scripts/build fixing this up - # PKG_ORIG_SYSROOT_PREFIX will be undefined when performing a legacy build - sed -e "s:\(['= ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX:-${SYSROOT_PREFIX}}/usr:g" -i "${PKG_ORIG_SYSROOT_PREFIX:-${SYSROOT_PREFIX}}/usr/lib"/libQt*.la -} diff --git a/packages/addons/addon-depends/qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch b/packages/addons/addon-depends/qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch new file mode 100644 index 0000000000..d6e2a103e4 --- /dev/null +++ b/packages/addons/addon-depends/qtbase/patches/qtbase-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch @@ -0,0 +1,41 @@ +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 +@@ -275,12 +275,12 @@ load(qt_targets) + host_build: \ + QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS] + else: \ +- QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] ++ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] + lib_bundle { +- QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_LIBS/raw]/$${MODULE_INCNAME}.framework/Headers ++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_LIBS]/$${MODULE_INCNAME}.framework/Headers + QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE + } else { +- QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] ++ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS] + QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME + for(inc, MODULE_AUX_INCLUDES): \ + QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(inc, /, 1, 1) +@@ -308,7 +308,7 @@ load(qt_targets) + host_build: \ + QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] + else: \ +- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" ++ QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS]" + !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-001-stdlib-error.patch b/packages/addons/addon-depends/qtbase/patches/qtbase-001-stdlib-error.patch deleted file mode 100644 index 2b6f680f5b..0000000000 --- a/packages/addons/addon-depends/qtbase/patches/qtbase-001-stdlib-error.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 9f3efa796acb97ea4887468f1e8136e2e0711118 Mon Sep 17 00:00:00 2001 -From: Peter Levine -Date: Fri, 13 May 2016 20:04:00 -0400 -Subject: [PATCH] Remove -isystem from qmake due to QTBUG-53375 - -Change-Id: If0595fc2f209a48585e7e9b9a61f11c0d4e0664f ---- - mkspecs/common/clang.conf | 1 - - mkspecs/common/gcc-base.conf | 1 - - mkspecs/linux-icc/qmake.conf | 1 - - qmake/generators/unix/unixmake2.cpp | 14 +++----------- - qmake/generators/win32/mingw_make.cpp | 8 +------- - 5 files changed, 4 insertions(+), 21 deletions(-) - -diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf -index ee9c1b8..fbe370e 100644 ---- a/mkspecs/common/clang.conf -+++ b/mkspecs/common/clang.conf -@@ -16,7 +16,6 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX - CONFIG += clang_pch_style - QMAKE_PCH_OUTPUT_EXT = .pch - --QMAKE_CFLAGS_ISYSTEM = -isystem - QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} - QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} - QMAKE_CFLAGS_LTCG = -flto -diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 6e043f5..df8d314 100644 ---- a/mkspecs/common/gcc-base.conf -+++ b/mkspecs/common/gcc-base.conf -@@ -44,7 +44,6 @@ QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC - QMAKE_CFLAGS_APP += -fPIC --QMAKE_CFLAGS_ISYSTEM = -isystem - QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden - QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions -diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf -index 495fd15..935833b 100644 ---- a/mkspecs/linux-icc/qmake.conf -+++ b/mkspecs/linux-icc/qmake.conf -@@ -21,7 +21,6 @@ QMAKE_CFLAGS_DEBUG = -O0 -g - QMAKE_CFLAGS_SHLIB = -fPIC - QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB - QMAKE_CFLAGS_YACC = --QMAKE_CFLAGS_ISYSTEM = -isystem - QMAKE_CFLAGS_THREAD = -D_REENTRANT - QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections - QMAKE_CFLAGS_LTCG = -ipo -fno-fat-lto-objects -diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp -index 9312f19..009a674 100644 ---- a/qmake/generators/unix/unixmake2.cpp -+++ b/qmake/generators/unix/unixmake2.cpp -@@ -176,16 +176,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) - t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; - t << "INCPATH ="; - { -- QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); - const ProStringList &incs = project->values("INCLUDEPATH"); - for(int i = 0; i < incs.size(); ++i) { - const ProString &inc = incs.at(i); -- if (inc.isEmpty()) -- continue; -- -- if (!isystem.isEmpty() && isSystemInclude(inc.toQString())) -- t << ' ' << isystem << ' '; -- else -+ if (!inc.isEmpty()) - t << " -I"; - t << escapeFilePath(inc); - } -@@ -1328,10 +1322,8 @@ void UnixMakefileGenerator::init2() - } - - if (include_deps && project->isActiveConfig("gcc_MD_depends")) { -- // use -MMD if we know about -isystem too -- ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD"); -- project->values("QMAKE_CFLAGS") += MD_flag; -- project->values("QMAKE_CXXFLAGS") += MD_flag; -+ project->values("QMAKE_CFLAGS") += "-MD"; -+ project->values("QMAKE_CXXFLAGS") += "-MD"; - } - } - -diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index 382b10c..c9eebd8 100644 ---- a/qmake/generators/win32/mingw_make.cpp -+++ b/qmake/generators/win32/mingw_make.cpp -@@ -249,17 +249,11 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t) - { - t << "INCPATH = "; - -- QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); - const ProStringList &incs = project->values("INCLUDEPATH"); - for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) { - QString inc = (*incit).toQString(); - inc.replace(QRegExp("\\\\$"), ""); -- -- if (!isystem.isEmpty() && isSystemInclude(inc)) -- t << isystem << ' '; -- else -- t << "-I"; -- t << escapeFilePath(inc) << ' '; -+ t << "-I" << escapeFilePath(inc) << ' '; - } - t << endl; - } --- -2.7.4 -