diff --git a/x11-packages/qt5-base/build.sh b/x11-packages/qt5-base/build.sh index b52294fcc..c94a87a43 100644 --- a/x11-packages/qt5-base/build.sh +++ b/x11-packages/qt5-base/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=5.11.3 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL="http://master.qt.io/archive/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/single/qt-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=859417642713cee2493ee3646a7fee782c9f1db39e41d7bb1322bba0c5f0ff4d TERMUX_PKG_DEPENDS="harfbuzz, libandroid-shmem, libc++, libice, libicu, libjpeg-turbo, libpng, libsm, libuuid, libx11, libxcb, libxi, libxkbcommon, openssl, pcre2, ttf-dejavu, xcb-util-image, xcb-util-keysyms, xcb-util-renderutil, xcb-util-wm, zlib" diff --git a/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh b/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh deleted file mode 100644 index 8e38fbb3f..000000000 --- a/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh +++ /dev/null @@ -1,56 +0,0 @@ -TERMUX_SUBPKG_DESCRIPTION="Classes for QML and JavaScript languages" -TERMUX_SUBPKG_DEPENDS="qt5-base, qt5-declarative" - -TERMUX_SUBPKG_INCLUDE=" -bin/qml -bin/qmlcachegen -bin/qmleasing -bin/qmlimportscanner -bin/qmllint -bin/qmlmin -bin/qmlplugindump -bin/qmlprofiler -bin/qmlscene -bin/qmltestrunner -include/qt/QtPacketProtocol -include/qt/QtQml -include/qt/QtQmlDebug -include/qt/QtQuick -include/qt/QtQuickParticles -include/qt/QtQuickTest -include/qt/QtQuickWidgets -lib/cmake/Qt5Qml -lib/cmake/Qt5Quick -lib/cmake/Qt5QuickCompiler -lib/cmake/Qt5QuickTest -lib/cmake/Qt5QuickWidgets -lib/libQt5PacketProtocol.a -lib/libQt5PacketProtocol.prl -lib/libQt5Qml.prl -lib/libQt5QmlDebug.a -lib/libQt5QmlDebug.prl -lib/libQt5QmlDevTools.a -lib/libQt5QmlDevTools.prl -lib/libQt5Quick.prl -lib/libQt5QuickParticles.prl -lib/libQt5QuickTest.prl -lib/libQt5QuickWidgets.prl -lib/pkgconfig/Qt5Qml.pc -lib/pkgconfig/Qt5Quick.pc -lib/pkgconfig/Qt5QuickTest.pc -lib/pkgconfig/Qt5QuickWidgets.pc -lib/qt/mkspecs/features/qmlcache.prf -lib/qt/mkspecs/features/qtquickcompiler.prf -lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri -lib/qt/mkspecs/modules/qt_lib_qml.pri -lib/qt/mkspecs/modules/qt_lib_qml_private.pri -lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri -lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri -lib/qt/mkspecs/modules/qt_lib_qmltest.pri -lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri -lib/qt/mkspecs/modules/qt_lib_quick.pri -lib/qt/mkspecs/modules/qt_lib_quick_private.pri -lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri -lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri -lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri -" diff --git a/x11-packages/qt5-base/qt5-declarative.subpackage.sh b/x11-packages/qt5-base/qt5-declarative.subpackage.sh index 28cb7bdcb..133f4d03e 100644 --- a/x11-packages/qt5-base/qt5-declarative.subpackage.sh +++ b/x11-packages/qt5-base/qt5-declarative.subpackage.sh @@ -1,27 +1,80 @@ TERMUX_SUBPKG_DESCRIPTION="Classes for QML and JavaScript languages" TERMUX_SUBPKG_DEPENDS="qt5-base" +TERMUX_SUBPKG_BREAKS="qt5-declarative-dev" +TERMUX_SUBPKG_REPLACES="qt5-declarative-dev" TERMUX_SUBPKG_INCLUDE=" +bin/qml +bin/qmlcachegen +bin/qmleasing +bin/qmlimportscanner +bin/qmllint +bin/qmlmin +bin/qmlplugindump +bin/qmlprofiler +bin/qmlscene +bin/qmltestrunner +include/qt/QtPacketProtocol +include/qt/QtQml +include/qt/QtQmlDebug +include/qt/QtQuick +include/qt/QtQuickParticles +include/qt/QtQuickTest +include/qt/QtQuickWidgets +lib/cmake/Qt5Qml +lib/cmake/Qt5Quick +lib/cmake/Qt5QuickCompiler +lib/cmake/Qt5QuickTest +lib/cmake/Qt5QuickWidgets +lib/libQt5PacketProtocol.a +lib/libQt5PacketProtocol.prl +lib/libQt5Qml.prl lib/libQt5Qml.so lib/libQt5Qml.so.5 lib/libQt5Qml.so.5.11 lib/libQt5Qml.so.5.11.2 +lib/libQt5QmlDebug.a +lib/libQt5QmlDebug.prl +lib/libQt5QmlDevTools.a +lib/libQt5QmlDevTools.prl +lib/libQt5Quick.prl lib/libQt5Quick.so lib/libQt5Quick.so.5 lib/libQt5Quick.so.5.11 lib/libQt5Quick.so.5.11.2 +lib/libQt5QuickParticles.prl lib/libQt5QuickParticles.so lib/libQt5QuickParticles.so.5 lib/libQt5QuickParticles.so.5.11 lib/libQt5QuickParticles.so.5.11.2 +lib/libQt5QuickTest.prl lib/libQt5QuickTest.so lib/libQt5QuickTest.so.5 lib/libQt5QuickTest.so.5.11 lib/libQt5QuickTest.so.5.11.2 +lib/libQt5QuickWidgets.prl lib/libQt5QuickWidgets.so lib/libQt5QuickWidgets.so.5 lib/libQt5QuickWidgets.so.5.11 lib/libQt5QuickWidgets.so.5.11.2 -libexec/qt/qmltooling +lib/pkgconfig/Qt5Qml.pc +lib/pkgconfig/Qt5Quick.pc +lib/pkgconfig/Qt5QuickTest.pc +lib/pkgconfig/Qt5QuickWidgets.pc +lib/qt/mkspecs/features/qmlcache.prf +lib/qt/mkspecs/features/qtquickcompiler.prf +lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri +lib/qt/mkspecs/modules/qt_lib_qml.pri +lib/qt/mkspecs/modules/qt_lib_qml_private.pri +lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri +lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri +lib/qt/mkspecs/modules/qt_lib_qmltest.pri +lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri +lib/qt/mkspecs/modules/qt_lib_quick.pri +lib/qt/mkspecs/modules/qt_lib_quick_private.pri +lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri +lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri +lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri lib/qt/qml +libexec/qt/qmltooling " diff --git a/x11-packages/qt5-base/qt5-tools-dev.subpackage.sh b/x11-packages/qt5-base/qt5-tools-dev.subpackage.sh deleted file mode 100644 index 9a81976f6..000000000 --- a/x11-packages/qt5-base/qt5-tools-dev.subpackage.sh +++ /dev/null @@ -1,22 +0,0 @@ -TERMUX_SUBPKG_DESCRIPTION="Qt development tools (incomplete !)" -TERMUX_SUBPKG_DEPENDS="qt5-base, qt5-tools" - -TERMUX_SUBPKG_INCLUDE=" -include/qt/QtHelp -include/qt/QtUiPlugin -include/qt/QtUiTools -lib/cmake/Qt5Help -lib/cmake/Qt5UiPlugin -lib/cmake/Qt5UiTools -lib/cmake/Qt5LinguistTools -lib/libQt5Help.prl -lib/libQt5UiTools.prl -lib/libQt5UiTools.a -lib/pkgconfig/Qt5Help.pc -lib/pkgconfig/Qt5UiTools.pc -lib/qt/mkspecs/modules/qt_lib_help.pri -lib/qt/mkspecs/modules/qt_lib_help_private.pri -lib/qt/mkspecs/modules/qt_lib_uiplugin.pri -lib/qt/mkspecs/modules/qt_lib_uitools.pri -lib/qt/mkspecs/modules/qt_lib_uitools_private.pri -" diff --git a/x11-packages/qt5-base/qt5-tools.subpackage.sh b/x11-packages/qt5-base/qt5-tools.subpackage.sh index 5729e9407..7935989c1 100644 --- a/x11-packages/qt5-base/qt5-tools.subpackage.sh +++ b/x11-packages/qt5-base/qt5-tools.subpackage.sh @@ -1,5 +1,7 @@ TERMUX_SUBPKG_DESCRIPTION="Qt development tools (incomplete !)" TERMUX_SUBPKG_DEPENDS="qt5-base" +TERMUX_SUBPKG_BREAKS="qt5-tools-dev" +TERMUX_SUBPKG_REPLACES="qt5-tools-dev" TERMUX_SUBPKG_INCLUDE=" bin/lrelease @@ -9,8 +11,25 @@ bin/qtattributionsscanner bin/qtplugininfo bin/qtpaths bin/qtdiag +include/qt/QtHelp +include/qt/QtUiPlugin +include/qt/QtUiTools +lib/cmake/Qt5Help +lib/cmake/Qt5UiPlugin +lib/cmake/Qt5UiTools +lib/cmake/Qt5LinguistTools +lib/libQt5Help.prl lib/libQt5Help.so lib/libQt5Help.so.5 lib/libQt5Help.so.5.11 lib/libQt5Help.so.5.11.2 +lib/libQt5UiTools.prl +lib/libQt5UiTools.a +lib/pkgconfig/Qt5Help.pc +lib/pkgconfig/Qt5UiTools.pc +lib/qt/mkspecs/modules/qt_lib_help.pri +lib/qt/mkspecs/modules/qt_lib_help_private.pri +lib/qt/mkspecs/modules/qt_lib_uiplugin.pri +lib/qt/mkspecs/modules/qt_lib_uitools.pri +lib/qt/mkspecs/modules/qt_lib_uitools_private.pri " diff --git a/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh b/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh deleted file mode 100644 index 1c77079f7..000000000 --- a/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh +++ /dev/null @@ -1,11 +0,0 @@ -TERMUX_SUBPKG_DESCRIPTION="Qt platform-specific APIs for X11" -TERMUX_SUBPKG_DEPENDS="qt5-base, qt5-x11extras" - -TERMUX_SUBPKG_INCLUDE=" -include/qt/QtX11Extras -lib/cmake/Qt5X11Extras -lib/libQt5X11Extras.prl -lib/pkgconfig/Qt5X11Extras.pc -lib/qt/mkspecs/modules/qt_lib_x11extras.pri -lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri -" diff --git a/x11-packages/qt5-base/qt5-x11extras.subpackage.sh b/x11-packages/qt5-base/qt5-x11extras.subpackage.sh index 42251a191..d6a393bc2 100644 --- a/x11-packages/qt5-base/qt5-x11extras.subpackage.sh +++ b/x11-packages/qt5-base/qt5-x11extras.subpackage.sh @@ -1,9 +1,17 @@ TERMUX_SUBPKG_DESCRIPTION="Qt platform-specific APIs for X11" TERMUX_SUBPKG_DEPENDS="qt5-base" +TERMUX_PKG_BREAKS="qt5-x11extras-dev" +TERMUX_PKG_REPLACES="qt5-x11extras-dev" TERMUX_SUBPKG_INCLUDE=" +include/qt/QtX11Extras +lib/cmake/Qt5X11Extras +lib/libQt5X11Extras.prl lib/libQt5X11Extras.so lib/libQt5X11Extras.so.5 lib/libQt5X11Extras.so.5.11 lib/libQt5X11Extras.so.5.11.2 +lib/pkgconfig/Qt5X11Extras.pc +lib/qt/mkspecs/modules/qt_lib_x11extras.pri +lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri "