From 6ca3e4a955b0f8c7e4c21f9a066cd852a14a6c75 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 14 Nov 2018 01:32:51 +0200 Subject: [PATCH] qt5: fix development packages for 'x11extras' and 'declarative' Add missing dependencies. --- x11-packages/qt5-base/build.sh | 2 +- x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh | 6 +++--- x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/x11-packages/qt5-base/build.sh b/x11-packages/qt5-base/build.sh index 05370ef0c..f8126053e 100644 --- a/x11-packages/qt5-base/build.sh +++ b/x11-packages/qt5-base/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=http://qt-project.org/ TERMUX_PKG_DESCRIPTION="A cross-platform application and UI framework" TERMUX_PKG_VERSION=5.11.2 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL="http://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/single/qt-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81 TERMUX_PKG_DEPENDS="harfbuzz, libandroid-support, 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" diff --git a/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh b/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh index 804ca041e..5092589c3 100644 --- a/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh +++ b/x11-packages/qt5-base/qt5-declarative-dev.subpackage.sh @@ -1,3 +1,6 @@ +TERMUX_SUBPKG_DEPENDS="qt5-base, qt5-base-dev, qt5-declarative" +TERMUX_SUBPKG_DESCRIPTION="Classes for QML and JavaScript languages" + TERMUX_SUBPKG_INCLUDE=" bin/qml bin/qmlcachegen @@ -48,6 +51,3 @@ 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 " - -TERMUX_SUBPKG_DEPENDS="qt5-base" -TERMUX_SUBPKG_DESCRIPTION="Classes for QML and JavaScript languages" diff --git a/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh b/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh index accb51299..af898065c 100644 --- a/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh +++ b/x11-packages/qt5-base/qt5-x11extras-dev.subpackage.sh @@ -1,3 +1,6 @@ +TERMUX_SUBPKG_DEPENDS="qt5-base, qt5-base-dev, qt5-x11extras" +TERMUX_SUBPKG_DESCRIPTION="Qt platform-specific APIs for X11" + TERMUX_SUBPKG_INCLUDE=" include/qt/QtX11Extras lib/cmake/Qt5X11Extras @@ -6,6 +9,3 @@ lib/pkgconfig/Qt5X11Extras.pc lib/qt/mkspecs/modules/qt_lib_x11extras.pri lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri " - -TERMUX_SUBPKG_DEPENDS="qt5-base" -TERMUX_SUBPKG_DESCRIPTION="Qt platform-specific APIs for X11"