diff options
author | Gonzalo Exequiel Pedone | 2016-04-15 13:16:57 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2016-04-15 13:16:57 -0300 |
commit | 8f9aa584ef87e25cbca64eb0496cda36015d271a (patch) | |
tree | aa7e84fd48df7d4d612f08511c7294986de31856 | |
parent | f92f45d7416d9a0bea54fb0b8f51946d35e5ca58 (diff) | |
download | aur-8f9aa584ef87e25cbca64eb0496cda36015d271a.tar.gz |
Updated package.
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 58 | ||||
-rw-r--r-- | qglobal.h.patch | 11 |
3 files changed, 35 insertions, 43 deletions
@@ -1,13 +1,13 @@ # Generated by mksrcinfo v8 -# lun mar 21 02:58:14 UTC 2016 +# vie abr 15 16:14:59 UTC 2016 pkgbase = android-qt5-armeabi-v7a pkgdesc = Qt 5 for Android pkgver = 5.6.0 - pkgrel = 1 + pkgrel = 2 url = https://www.qt.io arch = i686 arch = x86_64 - groups = qt-android + groups = android-qt5 license = GPL3 license = LGPL makedepends = libgl @@ -27,15 +27,12 @@ pkgbase = android-qt5-armeabi-v7a depends = android-sdk-platform-tools optdepends = android-google-apis-armv7a-eabi: AVD support optdepends = android-armv7a-eabi-system-image: AVD support - conflicts = qt-android source = http://download.qt-project.org/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.xz - source = qglobal.h.patch source = Misc.cpp.patch source = JavaScriptCore.pri.patch source = imageformats.pro.patch source = src.pro.patch sha256sums = 76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7 - sha256sums = fc735eda1209661f78067ea5649c9ceceeb7e49804d5de5975c4e5fbfbf34d7e sha256sums = 096eef8234f0ea964ac20ca887c8da2e7b5b836de417515acde103c2a27a04de sha256sums = 133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455 sha256sums = 943e8c03dc2218250f75cec3b663d90e6bb98d9b64b9f12b01713c284e5e4673 @@ -1,4 +1,4 @@ -#PKGCONFIG for android-qt5 for qt 5.5 +#PKGCONFIG for android-qt5 # Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com> # Contributor: Jiaxi Hu <sftrytry _AT_ gmail _DOT_ com> # Contributor: jimmy00784 <jimmy00784@gmail.com> @@ -9,7 +9,7 @@ _pkgname=android-qt5 pkgname=${_pkgname}-${android_arch} _pkgver=5.6 pkgver=${_pkgver}.0 -pkgrel=1 +pkgrel=2 pkgdesc="Qt 5 for Android" arch=('i686' 'x86_64') url='https://www.qt.io' @@ -29,12 +29,9 @@ depends=('java-runtime-headless>=7' 'android-sdk' 'android-sdk-build-tools' 'android-sdk-platform-tools') -groups=('qt-android') -# Uninstalling 'tk' and 'tcl' packages is recommended since it causes build -# conflicts. -conflicts=('qt-android') +groups=('android-qt5') -case "$android_arch" in +case "$android_arch" in arm*) optdepends=('android-google-apis-armv7a-eabi: AVD support' 'android-armv7a-eabi-system-image: AVD support') @@ -53,13 +50,11 @@ esac _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/${_pkgver}/${pkgver}/single/${_pkgfqn}.tar.xz" - "qglobal.h.patch" "Misc.cpp.patch" "JavaScriptCore.pri.patch" "imageformats.pro.patch" "src.pro.patch") sha256sums=('76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7' - 'fc735eda1209661f78067ea5649c9ceceeb7e49804d5de5975c4e5fbfbf34d7e' '096eef8234f0ea964ac20ca887c8da2e7b5b836de417515acde103c2a27a04de' '133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455' '943e8c03dc2218250f75cec3b663d90e6bb98d9b64b9f12b01713c284e5e4673' @@ -68,14 +63,23 @@ sha256sums=('76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7' prepare() { cd ${_pkgfqn} - # Platform specific patches - case "$android_arch" in - *) -# patch -Np1 -i "../qglobal.h.patch" - patch -Np1 -i "../Misc.cpp.patch" - patch -Np1 -i "../JavaScriptCore.pri.patch" + # Disable qtplugininfo build. + patch -Np1 -i "../src.pro.patch" + + # Fix problem with time.h. + patch -Np1 -i "../Misc.cpp.patch" + + # Platform specific patches. + case "$android_arch" in + arm64-v8a) + # Disable WebP image format. patch -Np1 -i "../imageformats.pro.patch" - patch -Np1 -i "../src.pro.patch" + ;; + armeabi) + # Disable JIT. + patch -Np1 -i "../JavaScriptCore.pri.patch" + ;; + *) ;; esac } @@ -100,11 +104,13 @@ build() { unset CARCH + export ANDROID_NDK_ROOT=/opt/android-ndk export ANDROID_SDK_ROOT=/opt/android-sdk - export ANDROID_BUILD_TOOLS_REVISION=23.0.2 - export ANDROID_API_VERSION=android-23 + export ANDROID_BUILD_TOOLS_REVISION=$(ls ${ANDROID_SDK_ROOT}/build-tools) + export ANDROID_API_VERSION=$(ls ${ANDROID_SDK_ROOT}/platforms) export PYTHON=/usr/bin/python2 + ndkPlatform=$(ls ${ANDROID_NDK_ROOT}/platforms | sort -V | tail -n 1) _pref=/opt/${_pkgname}/${pkgver}/${android_arch} configue_opts=" @@ -115,8 +121,8 @@ build() { -xplatform android-g++ -nomake tests -nomake examples - -android-ndk /opt/android-ndk - -android-sdk /opt/android-sdk + -android-ndk ${ANDROID_NDK_ROOT} + -android-sdk ${ANDROID_SDK_ROOT} -android-ndk-host ${ndkhost} -android-toolchain-version 4.9 -skip qttranslations @@ -126,15 +132,15 @@ build() { -qt-zlib -qt-freetype -android-arch ${android_arch} - -android-ndk-platform android-24" + -android-ndk-platform ${ndkPlatform}" # Platform specific patches - case "$android_arch" in + case "$android_arch" in + mips) + configue_opts+=" + -skip qt3d" + ;; *) - configue_opts+=" - -skip qt3d - -no-sql-psql - -no-sql-mysql" ;; esac diff --git a/qglobal.h.patch b/qglobal.h.patch deleted file mode 100644 index b09c634f5429..000000000000 --- a/qglobal.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/qtbase/src/corelib/global/qglobal.h 2016-02-27 16:17:48.494720393 -0300 -+++ a/qtbase/src/corelib/global/qglobal.h 2016-02-27 16:18:04.938077180 -0300 -@@ -82,7 +82,7 @@ - - #ifdef __cplusplus - --#include <algorithm> -+//#include <algorithm> - - #if !defined(QT_NAMESPACE) || defined(Q_MOC_RUN) /* user namespace */ - |