diff --git a/x11-packages/qt5-qtbase/build.sh b/x11-packages/qt5-qtbase/build.sh index 88ee927a0..7724883df 100644 --- a/x11-packages/qt5-qtbase/build.sh +++ b/x11-packages/qt5-qtbase/build.sh @@ -3,9 +3,10 @@ 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.15.3 +TERMUX_PKG_REVISION=1 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" +TERMUX_PKG_DEPENDS="dbus, double-conversion, harfbuzz, libandroid-shmem, libandroid-sysv-semaphore, 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" TERMUX_PKG_BUILD_IN_SRC=true @@ -111,8 +112,7 @@ termux_step_configure () { -system-libpng \ -system-libjpeg \ -system-sqlite \ - -sql-sqlite \ - -no-feature-systemsemaphore + -sql-sqlite } diff --git a/x11-packages/qt5-qtbase/qmake.conf b/x11-packages/qt5-qtbase/qmake.conf index d27ac99e4..25d927942 100644 --- a/x11-packages/qt5-qtbase/qmake.conf +++ b/x11-packages/qt5-qtbase/qmake.conf @@ -23,7 +23,7 @@ QMAKE_STRIP = @TERMUX_STRIP@ QMAKE_CFLAGS += @TERMUX_CFLAGS@ QMAKE_CXXFLAGS += @TERMUX_CXXFLAGS@ -QMAKE_LFLAGS += -landroid-shmem @TERMUX_LDFLAGS@ +QMAKE_LFLAGS += @TERMUX_LDFLAGS@ -landroid-shmem -landroid-sysv-semaphore QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += -shared 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 deleted file mode 100644 index 427e199cd..000000000 --- a/x11-packages/qt5-qtbase/src-corelib-kernel-qsharedmemory_p.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/termux-build-qmake.sh b/x11-packages/qt5-qtbase/termux-build-qmake.sh index a2124306e..a72a5ac91 100755 --- a/x11-packages/qt5-qtbase/termux-build-qmake.sh +++ b/x11-packages/qt5-qtbase/termux-build-qmake.sh @@ -74,8 +74,7 @@ termux_step_configure () { -system-libpng \ -system-libjpeg \ -system-sqlite \ - -sql-sqlite \ - -no-feature-systemsemaphore + -sql-sqlite } if [ ! -e "qtbase-everywhere-opensource-src-${TERMUX_PKG_VERSION}.tar.xz" ]; then