diff --git a/x11-packages/qt5-qtbase/build.sh b/x11-packages/qt5-qtbase/build.sh index 6d36af065..88ee927a0 100644 --- a/x11-packages/qt5-qtbase/build.sh +++ b/x11-packages/qt5-qtbase/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=11 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtbase-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtbase-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6 TERMUX_PKG_DEPENDS="dbus, double-conversion, harfbuzz, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, ttf-dejavu, freetype, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm, zlib, glib" # gtk3 dependency is a run-time dependency only for the gtk platformtheme subpackage TERMUX_PKG_BUILD_DEPENDS="gtk3" @@ -101,20 +100,20 @@ termux_step_configure () { -no-gbm \ -no-kms \ -no-linuxfb \ - -no-mirclient \ -no-libudev \ -no-evdev \ -no-libinput \ -no-mtdev \ -no-tslib \ - -system-xcb \ - -no-xcb-xinput \ + -xcb \ + -xcb-xlib \ -gif \ -system-libpng \ -system-libjpeg \ -system-sqlite \ -sql-sqlite \ -no-feature-systemsemaphore + } termux_step_post_make_install() { diff --git a/x11-packages/qt5-qtbase/qtbase-src_corelib_io_qfilesystemengine_unix_android_defs.patch b/x11-packages/qt5-qtbase/qtbase-src_corelib_io_qfilesystemengine_unix_android_defs.patch index 3144d47f9..de561c2da 100644 --- a/x11-packages/qt5-qtbase/qtbase-src_corelib_io_qfilesystemengine_unix_android_defs.patch +++ b/x11-packages/qt5-qtbase/qtbase-src_corelib_io_qfilesystemengine_unix_android_defs.patch @@ -1,45 +1,44 @@ --- src/src/corelib/io/qfilesystemengine_unix.cpp 2020-09-21 13:16:21.000000000 +0000 +++ src.mod/src/corelib/io/qfilesystemengine_unix.cpp 2021-05-06 16:16:02.735214214 +0000 -@@ -95,7 +95,7 @@ +@@ -100,7 +100,7 @@ extern "C" NSString *NSTemporaryDirectory(); #endif #endif - + -#if defined(Q_OS_ANDROID) +#if defined(Q_OS_ANDROID) || defined(__ANDROID__) // statx() is disabled on Android because quite a few systems // come with sandboxes that kill applications that make system calls outside a // whitelist and several Android vendors can't be bothered to update the list. -@@ -109,7 +109,7 @@ +@@ -114,7 +114,7 @@ struct statx { mode_t stx_mode; }; // dummy QT_BEGIN_NAMESPACE - + enum { -#ifdef Q_OS_ANDROID +#if defined(Q_OS_ANDROID) || defined(__ANDROID__) // On Android, the link(2) system call has been observed to always fail // with EACCES, regardless of whether there are permission problems or not. SupportsHardlinking = false -@@ -690,7 +690,7 @@ - if (entry.isRoot()) - return entry; - +@@ -684,14 +684,14 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry, + { + Q_CHECK_FILE_NAME(entry, entry); + -#if !defined(Q_OS_MAC) && !defined(Q_OS_QNX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) && _POSIX_VERSION < 200809L +#if !defined(Q_OS_MAC) && !defined(Q_OS_QNX) && !defined(Q_OS_ANDROID) && !defined(__ANDROID__) && !defined(Q_OS_HAIKU) && _POSIX_VERSION < 200809L // realpath(X,0) is not supported Q_UNUSED(data); return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath())); -@@ -704,7 +704,7 @@ - errno = savedErrno; - ret = 0; - } --# elif defined(Q_OS_ANDROID) -+# elif defined(Q_OS_ANDROID) || defined(__ANDROID__) - // On some Android versions, realpath() will return a path even if it does not exist - // To work around this, we check existence in advance. + #else + char stack_result[PATH_MAX+1]; + char *resolved_name = nullptr; +-# if defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID) ++# if defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID) || defined(__ANDROID__) + // On some Android and macOS versions, realpath() will return a path even if + // it does not exist. To work around this, we check existence in advance. if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute)) -@@ -854,7 +854,7 @@ - +@@ -833,7 +833,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId) + #if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM) - struct group *gr = 0; + struct group *gr = nullptr; -#if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24)) +#if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || !defined(__ANDROID__) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24)) size_max = sysconf(_SC_GETGR_R_SIZE_MAX); diff --git a/x11-packages/qt5-qtbase/qtbase_src_corelib_thread_qthread_unix_android_defs.patch b/x11-packages/qt5-qtbase/qtbase_src_corelib_thread_qthread_unix_android_defs.patch index 76e8bfb46..68744b10d 100644 --- a/x11-packages/qt5-qtbase/qtbase_src_corelib_thread_qthread_unix_android_defs.patch +++ b/x11-packages/qt5-qtbase/qtbase_src_corelib_thread_qthread_unix_android_defs.patch @@ -4,45 +4,45 @@ diff -uNr qtbase/src/corelib/thread/qthread_unix.cpp qtbase.mod/src/corelib/thre @@ -92,7 +92,7 @@ # define SCHED_IDLE 5 #endif - + -#if defined(Q_OS_DARWIN) || !defined(Q_OS_ANDROID) && !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) +#if !defined(__ANDROID__) && (defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)) #define QT_HAS_THREAD_PRIORITY_SCHEDULING #endif - -@@ -312,7 +312,7 @@ - + +@@ -280,7 +280,7 @@ static void setCurrentThreadName(const char *name) + void *QThreadPrivate::start(void *arg) { -#if !defined(Q_OS_ANDROID) +#if !defined(__ANDROID__) - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, nullptr); #endif pthread_cleanup_push(QThreadPrivate::finish, arg); -@@ -360,7 +360,7 @@ +@@ -322,7 +322,7 @@ void *QThreadPrivate::start(void *arg) #endif - + emit thr->started(QThread::QPrivateSignal()); -#if !defined(Q_OS_ANDROID) +#if !defined(__ANDROID__) - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr); pthread_testcancel(); #endif -@@ -747,7 +747,7 @@ - +@@ -724,7 +724,7 @@ void QThread::start(Priority priority) + void QThread::terminate() { -#if !defined(Q_OS_ANDROID) +#if !defined(__ANDROID__) Q_D(QThread); QMutexLocker locker(&d->mutex); - -@@ -789,7 +789,7 @@ + +@@ -765,7 +765,7 @@ void QThread::setTerminationEnabled(bool enabled) "Current thread was not started with QThread."); - + Q_UNUSED(thr) -#if defined(Q_OS_ANDROID) +#if defined(__ANDROID__) Q_UNUSED(enabled); #else - pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, NULL); + pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, nullptr); diff --git a/x11-packages/qt5-qtbase/src-corelib-global-qendian.h.patch b/x11-packages/qt5-qtbase/src-corelib-global-qendian.h.patch deleted file mode 100644 index dbaa4aaac..000000000 --- a/x11-packages/qt5-qtbase/src-corelib-global-qendian.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/corelib/global/qendian.h.orig 2022-02-22 21:15:49.540478057 +0530 -+++ ./src/corelib/global/qendian.h 2022-02-22 21:17:02.547543130 +0530 -@@ -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/x11-packages/qt5-qtbase/src-corelib-kernel-qsharedmemory_p.h.patch b/x11-packages/qt5-qtbase/src-corelib-kernel-qsharedmemory_p.h.patch new file mode 100644 index 000000000..427e199cd --- /dev/null +++ b/x11-packages/qt5-qtbase/src-corelib-kernel-qsharedmemory_p.h.patch @@ -0,0 +1,10 @@ +--- a/src/corelib/kernel/qsharedmemory_p.h ++++ b/src/corelib/kernel/qsharedmemory_p.h +@@ -72,7 +72,7 @@ + # include "private/qobject_p.h" + #endif + +-#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) ++#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(__ANDROID__) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) + # include + #endif diff --git a/x11-packages/qt5-qtbase/src-corelib-text-qbytearraymatcher.h.patch b/x11-packages/qt5-qtbase/src-corelib-text-qbytearraymatcher.h.patch new file mode 100644 index 000000000..58a0de76a --- /dev/null +++ b/x11-packages/qt5-qtbase/src-corelib-text-qbytearraymatcher.h.patch @@ -0,0 +1,11 @@ +--- ./src/corelib/text/qbytearraymatcher.h.orig 2022-02-22 21:44:47.337704297 +0530 ++++ ./src/corelib/text/qbytearraymatcher.h 2022-02-22 21:45:04.997704290 +0530 +@@ -42,6 +42,8 @@ + + #include + ++#include ++ + QT_BEGIN_NAMESPACE + + diff --git a/x11-packages/qt5-qtbase/src-corelib-tools-qbytearraymatcher.h.patch b/x11-packages/qt5-qtbase/src-corelib-tools-qbytearraymatcher.h.patch deleted file mode 100644 index 33be2d7b3..000000000 --- a/x11-packages/qt5-qtbase/src-corelib-tools-qbytearraymatcher.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/corelib/tools/qbytearraymatcher.h.orig 2022-02-22 21:44:47.337704297 +0530 -+++ ./src/corelib/tools/qbytearraymatcher.h 2022-02-22 21:45:04.997704290 +0530 -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - diff --git a/x11-packages/qt5-qtbase/src-corelib-tools-qoffesetstringarray_p.h.patch b/x11-packages/qt5-qtbase/src-corelib-tools-qoffesetstringarray_p.h.patch new file mode 100644 index 000000000..d9b736c1f --- /dev/null +++ b/x11-packages/qt5-qtbase/src-corelib-tools-qoffesetstringarray_p.h.patch @@ -0,0 +1,12 @@ +diff --git a/src/corelib/tools/qoffsetstringarray_p.h.orig b/src/corelib/tools/qoffsetstringarray_p.h +index 4dd9e960..e26a57ff 100644 +--- a/src/corelib/tools/qoffsetstringarray_p.h.orig ++++ b/src/corelib/tools/qoffsetstringarray_p.h +@@ -55,6 +55,7 @@ + + #include + #include ++#include + + QT_BEGIN_NAMESPACE + diff --git a/x11-packages/qt5-qtbase/termux-build-qmake.sh b/x11-packages/qt5-qtbase/termux-build-qmake.sh index 691b8ccb7..a2124306e 100755 --- a/x11-packages/qt5-qtbase/termux-build-qmake.sh +++ b/x11-packages/qt5-qtbase/termux-build-qmake.sh @@ -63,14 +63,13 @@ termux_step_configure () { -no-gbm \ -no-kms \ -no-linuxfb \ - -no-mirclient \ -no-libudev \ -no-evdev \ -no-libinput \ -no-mtdev \ -no-tslib \ - -system-xcb \ - -no-xcb-xinput \ + -xcb \ + -xcb-xlib \ -gif \ -system-libpng \ -system-libjpeg \ @@ -79,14 +78,14 @@ termux_step_configure () { -no-feature-systemsemaphore } -if [ ! -e "qtbase-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" ]; then +if [ ! -e "qtbase-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" ]; then echo "[*] Downloading Qt sources..." - curl -L --output "qtbase-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" "${TERMUX_PKG_SRCURL}" + curl -L --output "qtbase-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" "${TERMUX_PKG_SRCURL}" fi echo "[*] Unpacking Qt sources..." rm -rf "qtbase-everywhere-src-${TERMUX_PKG_VERSION}" -tar xf "qtbase-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" +tar xf "qtbase-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" cd "qtbase-everywhere-src-${TERMUX_PKG_VERSION}" && { ## Patch the source diff --git a/x11-packages/qt5-qtdeclarative/build.sh b/x11-packages/qt5-qtdeclarative/build.sh index a803c3628..208dff690 100644 --- a/x11-packages/qt5-qtdeclarative/build.sh +++ b/x11-packages/qt5-qtdeclarative/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="The Qt Declarative module provides classes for using GUIs created using QML" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtdeclarative-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=1267e029abc8424424c419bc1681db069ec76e51270cc220994e0f442c9f78d3 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtdeclarative-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=33f15a5caa451bddf8298466442ccf7ca65e4cf90453928ddbb95216c4374062 TERMUX_PKG_DEPENDS="qt5-qtbase" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true @@ -20,6 +19,12 @@ opt/qt/cross/lib/libQt5Bootstrap.* TERMUX_PKG_REPLACES="qt5-declarative" termux_step_pre_configure () { + pushd "${TERMUX_PKG_SRCDIR}/src/qmltyperegistrar" + "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ + -spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-host" + make -j "${TERMUX_MAKE_PROCESSES}" + popd + ####################################################### ## ## Hijack the bootstrap library for cross building @@ -47,7 +52,7 @@ termux_step_post_make_install () { ####################################################### ## Qt Declarative utilities. - for i in qmlcachegen qmlimportscanner qmllint qmlmin; do + for i in qmlcachegen qmlformat qmlimportscanner qmllint qmlmin; do cd "${TERMUX_PKG_SRCDIR}/tools/${i}" && { "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ -spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-cross" @@ -57,6 +62,18 @@ termux_step_post_make_install () { } done + for i in qmltyperegistrar; do + cd "${TERMUX_PKG_SRCDIR}/src/${i}" && { + make clean + + "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ + -spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-cross" + + make -j "${TERMUX_MAKE_PROCESSES}" + install -Dm700 "../../bin/${i}" "${TERMUX_PREFIX}/bin/${i}" + } + done + # Install the QmlDevTools for target (needed by some packages such as qttools) install -Dm644 ${TERMUX_PKG_SRCDIR}/lib/libQt5QmlDevTools.a "${TERMUX_PREFIX}/lib/libQt5QmlDevTools.a" install -Dm644 ${TERMUX_PKG_SRCDIR}/lib/libQt5QmlDevTools.prl "${TERMUX_PREFIX}/lib/libQt5QmlDevTools.prl" @@ -94,7 +111,7 @@ termux_step_post_make_install () { } ## Qt Declarative utilities. - for i in qmlcachegen qmlimportscanner qmllint qmlmin; do + for i in qmlcachegen qmlformat qmlimportscanner qmllint qmlmin; do cd "${TERMUX_PKG_SRCDIR}/tools/${i}" && { make clean @@ -106,6 +123,18 @@ termux_step_post_make_install () { } done + for i in qmltyperegistrar; do + cd "${TERMUX_PKG_SRCDIR}/src/${i}" && { + make clean + + "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ + -spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-host" + + make -j "${TERMUX_MAKE_PROCESSES}" + install -Dm700 "../../bin/${i}" "${TERMUX_PREFIX}/opt/qt/cross/bin/${i}" + } + done + ####################################################### ## ## Fixes & cleanup. diff --git a/x11-packages/qt5-qtdeclarative/src-3rdparty-masm-yarr-yarrcanonicalize.h.patch b/x11-packages/qt5-qtdeclarative/src-3rdparty-masm-yarr-yarrcanonicalize.h.patch new file mode 100644 index 000000000..8a40c88d3 --- /dev/null +++ b/x11-packages/qt5-qtdeclarative/src-3rdparty-masm-yarr-yarrcanonicalize.h.patch @@ -0,0 +1,11 @@ +--- a/src/3rdparty/masm/yarr/YarrCanonicalize.h ++++ b/src/3rdparty/masm/yarr/YarrCanonicalize.h +@@ -26,7 +26,7 @@ + #pragma once + + #include +-#include ++typedef int32_t UChar32; + + namespace JSC { namespace Yarr { + diff --git a/x11-packages/qt5-qtlocation/build.sh b/x11-packages/qt5-qtlocation/build.sh index 06970e428..299982277 100644 --- a/x11-packages/qt5-qtlocation/build.sh +++ b/x11-packages/qt5-qtlocation/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt 5 Location Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtlocation-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=a3384357703f76fa2e352e4dfaa30d197098b77a3672ea85bd8925dbe357f00b +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtlocation-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=a69f28ccfd4ef8e69e0131b178d41d71264be836f2f55bd29731e908a22c6bbd TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtmultimedia/build.sh b/x11-packages/qt5-qtmultimedia/build.sh index ecd366da9..aa1cf5d74 100644 --- a/x11-packages/qt5-qtmultimedia/build.sh +++ b/x11-packages/qt5-qtmultimedia/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt 5 Multimedia Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtmultimedia-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=918d253e9b5bca4f030e4207b2329d6a96c9901a5f52c5ed84725709aa54ee27 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtmultimedia-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=2ebaa33720b808aa074fd15b9de506c1e89b670b39c7d4b62cb859e70ce606f0 # qt5-qtdeclarative is not needed because quick widget requires OpenGL TERMUX_PKG_DEPENDS="qt5-qtbase, pulseaudio, openal-soft, gstreamer, gst-plugins-base, gst-plugins-bad" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" diff --git a/x11-packages/qt5-qtmultimedia/detect_libs_without_pkg_config.patch b/x11-packages/qt5-qtmultimedia/detect_libs_without_pkg_config.patch index 4fffc447d..ab8cb4c1b 100644 --- a/x11-packages/qt5-qtmultimedia/detect_libs_without_pkg_config.patch +++ b/x11-packages/qt5-qtmultimedia/detect_libs_without_pkg_config.patch @@ -1,11 +1,11 @@ --- src/src/multimedia/configure.json 2021-05-08 17:50:32.795445138 +0000 +++ src.mod/src/multimedia/configure.json 2021-05-08 17:49:30.639754395 +0000 -@@ -71,7 +71,8 @@ - "test": "gstreamer_appsrc", +@@ -76,8 +74,7 @@ "use": "gstreamer_1_0", "sources": [ -- { "type": "pkgConfig", "args": "gstreamer-app-1.0" } -+ { "type": "pkgConfig", "args": "gstreamer-app-1.0" }, + { "type": "pkgConfig", "args": "gstreamer-app-1.0" }, +- { "libs": "-lgstapp-1.0", "condition": "config.win32 || config.macos" }, +- { "libs": "", "condition": "config.android && input.gstreamer != ''" } + { "libs": "-lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0" } ] }, @@ -22,12 +22,13 @@ "wmf": { --- src/src/multimedia/configure.json 2021-05-16 13:53:50.128205372 +0000 +++ src.mod/src/multimedia/configure.json 2021-05-16 13:41:51.186432131 +0000 -@@ -53,7 +53,8 @@ - "test": "gstreamer", +@@ -55,9 +55,7 @@ "sources": [ { "type": "pkgConfig", -- "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0" } -+ "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0" }, + "args": "gstreamer-1.0 gstreamer-base-1.0 gstreamer-audio-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0 gstreamer-allocators-1.0" }, +- { "libs": "-lgstreamer-1.0 -lgstbase-1.0 -lgstaudio-1.0 -lgstvideo-1.0 -lgstpbutils-1.0 -lglib-2.0 -lgobject-2.0", +- "condition": "config.win32 || config.macos" }, +- { "libs": "", "condition": "config.android && input.gstreamer != ''" } + { "libs": "-lgstpbutils-1.0 -lgstaudio-1.0 -lgstvideo-1.0 -lgstbase-1.0 -lgsttag-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0" } ] }, diff --git a/x11-packages/qt5-qtquickcontrols/build.sh b/x11-packages/qt5-qtquickcontrols/build.sh index f5aeaeeda..673172918 100644 --- a/x11-packages/qt5-qtquickcontrols/build.sh +++ b/x11-packages/qt5-qtquickcontrols/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt Quick Controls module" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/${TERMUX_PKG_NAME#qt5-}-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=cd6b81fda691ab15d25ac60b6a3437667a892e401438e07a64c88cadd3481389 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/${TERMUX_PKG_NAME#qt5-}-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=4034afce2e8afde4c4cb5e3be3ce240d00647fa0d292f4cd1ac4454ce40230f0 TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtquickcontrols2/build.sh b/x11-packages/qt5-qtquickcontrols2/build.sh index 6b7342c43..ed0320c4c 100644 --- a/x11-packages/qt5-qtquickcontrols2/build.sh +++ b/x11-packages/qt5-qtquickcontrols2/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt Quick Controls2 module" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=4 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtquickcontrols2-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=c05585f42db7c17fb7f344f8a9cabd38a4e9dff17b3d04ec35e8edab7ead355c +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtquickcontrols2-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=3b95e9be58c3d918f4c4a805116459a403ae6c61e33edf71b319672c46af562f TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtquickcontrols2/src-quicktemplates2-accessible-qaccessiblequickpage.cpp.patch b/x11-packages/qt5-qtquickcontrols2/src-quicktemplates2-accessible-qaccessiblequickpage.cpp.patch new file mode 100644 index 000000000..7f13e179f --- /dev/null +++ b/x11-packages/qt5-qtquickcontrols2/src-quicktemplates2-accessible-qaccessiblequickpage.cpp.patch @@ -0,0 +1,19 @@ +--- a/src/quicktemplates2/accessible/qaccessiblequickpage.cpp ++++ b/src/quicktemplates2/accessible/qaccessiblequickpage.cpp +@@ -39,6 +39,8 @@ + + QT_BEGIN_NAMESPACE + ++#if QT_CONFIG(accessibility) ++ + QAccessibleQuickPage::QAccessibleQuickPage(QQuickPage *page) + : QAccessibleQuickItem(page) + { +@@ -77,5 +79,7 @@ + return static_cast(object()); + } + ++#endif // accessibility ++ + QT_END_NAMESPACE + diff --git a/x11-packages/qt5-qtquickcontrols2/src-quicktemplates2-accessible-qaccessiblequickpage_p.h.patch b/x11-packages/qt5-qtquickcontrols2/src-quicktemplates2-accessible-qaccessiblequickpage_p.h.patch new file mode 100644 index 000000000..f6e5f4670 --- /dev/null +++ b/x11-packages/qt5-qtquickcontrols2/src-quicktemplates2-accessible-qaccessiblequickpage_p.h.patch @@ -0,0 +1,20 @@ +--- a/src/quicktemplates2/accessible/qaccessiblequickpage_p.h ++++ b/src/quicktemplates2/accessible/qaccessiblequickpage_p.h +@@ -52,6 +52,8 @@ + + QT_BEGIN_NAMESPACE + ++#if QT_CONFIG(accessibility) ++ + class QQuickPage; + + class QAccessibleQuickPage : public QAccessibleQuickItem +@@ -65,6 +67,8 @@ + QList orderedChildItems() const; + }; + ++#endif // accessibility ++ + QT_END_NAMESPACE + + #endif // QACCESSIBLEQUICKPAGE_H diff --git a/x11-packages/qt5-qtsensors/build.sh b/x11-packages/qt5-qtsensors/build.sh index 386447631..86fc13420 100644 --- a/x11-packages/qt5-qtsensors/build.sh +++ b/x11-packages/qt5-qtsensors/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt 5 Sensors Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/${TERMUX_PKG_NAME#qt5-}-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=47b957c3334bbb5eda5e12a68f91505dd80dfc2337dadd63d4826aa72c430506 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/${TERMUX_PKG_NAME#qt5-}-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=4acbbb07fb1d782e1f6b092563ff227134ebb2746b6b5027aede28e3a117a59f TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtsvg/build.sh b/x11-packages/qt5-qtsvg/build.sh index 97adba739..bb4854c6f 100644 --- a/x11-packages/qt5-qtsvg/build.sh +++ b/x11-packages/qt5-qtsvg/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt SVG Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtsvg-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=7a6857a2f68cfbebb9f791396b401a98e951c9bff9bfeb1b5b01914c3ea1a0ed +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtsvg-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=3adc41dfcc67bbe3b8ff553bdac30ee75e270745536a58e54cdb741fa0505d89 TERMUX_PKG_DEPENDS="qt5-qtbase" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qttools/build.sh b/x11-packages/qt5-qttools/build.sh index 038d3eaae..e78682a2b 100644 --- a/x11-packages/qt5-qttools/build.sh +++ b/x11-packages/qt5-qttools/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt Development Tools (Linguist, Assistant, Designer, etc.)" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qttools-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=98b2aaca230458f65996f3534fd471d2ffd038dd58ac997c0589c06dc2385b4f +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qttools-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qtdeclarative-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true @@ -91,7 +90,7 @@ termux_step_post_make_install() { ####################################################### # Install the linguist utilities to the correct path - for i in lconvert lrelease lupdate; do + for i in lconvert lprodump lrelease{,-pro} lupdate{,-pro}; do install -Dm700 "${TERMUX_PKG_SRCDIR}/bin/${i}" "${TERMUX_PREFIX}/bin/${i}" done @@ -196,7 +195,7 @@ termux_step_post_make_install() { "${TERMUX_PREFIX}/opt/qt/cross/bin/qtattributionsscanner" } - for i in lconvert lrelease lupdate; do + for i in lconvert lprodump lrelease{,-pro} lupdate{,-pro}; do cd "${TERMUX_PKG_SRCDIR}/src/linguist/${i}" && { make clean "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ diff --git a/x11-packages/qt5-qttools/src-designer-src-uitools-uitools.pro.patch b/x11-packages/qt5-qttools/src-designer-src-uitools-uitools.pro.patch new file mode 100644 index 000000000..a4e58a380 --- /dev/null +++ b/x11-packages/qt5-qttools/src-designer-src-uitools-uitools.pro.patch @@ -0,0 +1,12 @@ +--- a/src/designer/src/uitools/uitools.pro ++++ b/src/designer/src/uitools/uitools.pro +@@ -12,9 +12,4 @@ + QFORMINTERNAL_NAMESPACE \ + QT_DESIGNER_STATIC + +-# QtUiPlugins end up in designer for historical reasons. However, if +-# designer isn't actually built, we need to claim the plugin type here. +-!qtBuildPart(tools): \ +- MODULE_PLUGIN_TYPES = designer +- + load(qt_module) diff --git a/x11-packages/qt5-qtwebchannel/build.sh b/x11-packages/qt5-qtwebchannel/build.sh index 676050cf1..1befa11fa 100644 --- a/x11-packages/qt5-qtwebchannel/build.sh +++ b/x11-packages/qt5-qtwebchannel/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt 5 WebChannel Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/qtwebchannel-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=84fdf1eec5ae4be857d934f8035a1ee991088f94f3359b49a988310cdddd88e7 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/qtwebchannel-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=2fa019ebd2fa6805ca3011540ffa7d294727316191794a1612b00129845302eb TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative, qt5-qtwebsockets" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtwebsockets/build.sh b/x11-packages/qt5-qtwebsockets/build.sh index 3571730b8..a0e07c1b2 100644 --- a/x11-packages/qt5-qtwebsockets/build.sh +++ b/x11-packages/qt5-qtwebsockets/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt 5 WebSockets Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/qtwebsockets-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=ce3c8be18e96928f336fd43bb6c9f99d3ee97eddd44fc6788fadd1dd54c437c4 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/qtwebsockets-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=97c9f6c537da79a2627dc1d1609e01182aaaa79e166c40be77cab27daed853d1 TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtx11extras/build.sh b/x11-packages/qt5-qtx11extras/build.sh index 419003e30..dfde012da 100644 --- a/x11-packages/qt5-qtx11extras/build.sh +++ b/x11-packages/qt5-qtx11extras/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtx11extras-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=32c51c32edf265394610e9e1ca019fba6007c9a9f2e38e127a24e0b80d0c76e3 +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtx11extras-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=a3a9b048da73bd944b407ee29ed9da9e009463329ca700c1452bc226715e3eb8 TERMUX_PKG_DEPENDS="qt5-qtbase" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/x11-packages/qt5-qtxmlpatterns/build.sh b/x11-packages/qt5-qtxmlpatterns/build.sh index 70e481a0f..5b3a0414e 100644 --- a/x11-packages/qt5-qtxmlpatterns/build.sh +++ b/x11-packages/qt5-qtxmlpatterns/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.qt.io/ TERMUX_PKG_DESCRIPTION="Qt XmlPatterns Library" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Simeon Huang " -TERMUX_PKG_VERSION=5.12.11 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.12/${TERMUX_PKG_VERSION}/submodules/qtxmlpatterns-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=1df0583ff804ef3334da298218ac5641d46c99b1dc692ca5097d9fead4afd0bc +TERMUX_PKG_VERSION=5.15.3 +TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/5.15/${TERMUX_PKG_VERSION}/submodules/qtxmlpatterns-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" +TERMUX_PKG_SHA256=603398f3f9900b401a271231eebc68079d6c5844e968088832f9ee2819cc7fad TERMUX_PKG_DEPENDS="qt5-qtbase, qt5-qtdeclarative" TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools" TERMUX_PKG_BUILD_IN_SRC=true