qt5: update to 5.6.2
Add a new subpkg qt5-host-tools to be use for cross compiling.
This commit is contained in:
parent
fa58f09916
commit
1c90ddc995
3 changed files with 30 additions and 9 deletions
srcpkgs
1
srcpkgs/qt5-host-tools
Symbolic link
1
srcpkgs/qt5-host-tools
Symbolic link
|
@ -0,0 +1 @@
|
|||
qt5
|
11
srcpkgs/qt5/patches/hack-openssl_test.patch
Normal file
11
srcpkgs/qt5/patches/hack-openssl_test.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- qtbase/config.tests/unix/openssl/openssl.cpp 2016-09-16 07:49:42.000000000 +0200
|
||||
+++ qtbase/config.tests/unix/openssl/openssl.cpp 2016-10-21 19:05:10.099362793 +0200
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER-0 >= 0x10002000L && !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)
|
||||
+#if (OPENSSL_VERSION_NUMBER-0 >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)
|
||||
# error "OpenSSL was reported as >= 1.0.2 but is missing required features, possibly it's libressl which is unsupported"
|
||||
#endif
|
||||
|
|
@ -1,15 +1,14 @@
|
|||
# Template file for 'qt5'
|
||||
pkgname=qt5
|
||||
version=5.6.1
|
||||
revision=3
|
||||
_patch=-1
|
||||
version=5.6.2
|
||||
revision=1
|
||||
wrksrc="qt-everywhere-opensource-src-${version}"
|
||||
homepage="http://qt.io/"
|
||||
short_desc="A cross-platform application and UI framework (QT5)"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL-3, LGPL-2.1"
|
||||
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}${_patch}/single/qt-everywhere-opensource-src-${version}${_patch}.tar.xz"
|
||||
checksum=ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db
|
||||
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-opensource-src-${version}.tar.xz"
|
||||
checksum=83e61bfc78bba230770704e828fa4d23fe3bbfdcfa4a8f5db37ce149731d89b3
|
||||
|
||||
if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then
|
||||
nodebug=yes # prevent OOM
|
||||
|
@ -108,7 +107,7 @@ _create_config() {
|
|||
echo "DISTRO = arch" >> ${specs}/${device}/qmake.conf
|
||||
# Hard float on armv6, armv7, not on armv5tel
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
armv6*|armv7*)
|
||||
aarch64*|armv6*|armv7*)
|
||||
echo "DISTRO_OPTS += hard-float" >> ${specs}/${device}/qmake.conf
|
||||
;;
|
||||
esac
|
||||
|
@ -123,7 +122,7 @@ _create_config() {
|
|||
echo "QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2" >> ${specs}/${device}/qmake.conf
|
||||
echo >> ${specs}/${device}/qmake.conf
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
arm*)
|
||||
aarch64*|arm*)
|
||||
echo "include(../common/linux_arm_device_post.conf)" >> ${specs}/${device}/qmake.conf ;;
|
||||
*)
|
||||
echo "include(../common/linux_device_post.conf)" >> ${specs}/${device}/qmake.conf ;;
|
||||
|
@ -187,7 +186,7 @@ do_configure() {
|
|||
opts+=" -system-zlib"
|
||||
opts+=" -system-sqlite"
|
||||
opts+=" -system-harfbuzz"
|
||||
# opts+=" -v" # Enable for verbose configuration tests
|
||||
opts+=" -v" # Enable for verbose configuration tests
|
||||
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
if [ "${XBPS_MACHINE%%-musl}" = i686 ]; then
|
||||
|
@ -647,6 +646,15 @@ qt5-translations_package() {
|
|||
}
|
||||
}
|
||||
|
||||
qt5-host-tools_package() {
|
||||
short_desc+=" - Tools required when cross compiling"
|
||||
pkg_install() {
|
||||
for f in moc rcc uic qlalr qdbuscpp2xml qdbusxml2cpp; do
|
||||
vmove usr/lib/qt5/bin/${f}
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
qt5-tools-devel_package() {
|
||||
short_desc+=" - Development tools (development)"
|
||||
depends="qt5-tools-${version}_${revision} qt5-devel-${version}_${revision}"
|
||||
|
@ -687,7 +695,8 @@ qt5-devel_package() {
|
|||
fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
|
||||
dbus-devel icu-devel qt5-${version}_${revision}
|
||||
qt5-plugin-gtk-${version}_${revision}
|
||||
qt5-qmake-${version}_${revision}"
|
||||
qt5-qmake-${version}_${revision}
|
||||
qt5-host-tools-${version}_${revision}"
|
||||
short_desc+=" - Development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
|
Loading…
Reference in a new issue