diff options
author | Gonzalo Exequiel Pedone | 2017-06-11 18:57:34 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2017-06-11 18:57:34 -0300 |
commit | 136fb656266e1b5ce22f8e47d3af7dc952dc783a (patch) | |
tree | c2e380debbb27605fc1152687a8c902e7f140aaf | |
parent | cff1875f36fe63974ead359b88185fee533bce34 (diff) | |
download | aur-136fb656266e1b5ce22f8e47d3af7dc952dc783a.tar.gz |
Updated to Qt 5.9.0.
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 31 | ||||
-rw-r--r-- | geoservices.pro.patch | 12 |
3 files changed, 42 insertions, 13 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# dom mar 5 15:23:13 UTC 2017 +# dom jun 11 21:44:05 UTC 2017 pkgbase = android-qt5-mips pkgdesc = Qt 5 for Android - pkgver = 5.8.0 - pkgrel = 3 + pkgver = 5.9.0 + pkgrel = 1 url = https://www.qt.io arch = i686 arch = x86_64 @@ -25,10 +25,12 @@ pkgbase = android-qt5-mips depends = android-sdk depends = android-sdk-build-tools depends = android-sdk-platform-tools - source = http://download.qt-project.org/official_releases/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.tar.xz + source = http://download.qt-project.org/official_releases/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz source = JavaScriptCore.pri.patch - sha256sums = 0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6 + source = geoservices.pro.patch + sha256sums = f70b5c66161191489fc13c7b7eb69bf9df3881596b183e7f6d94305a39837517 sha256sums = 133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455 + sha256sums = f0770923c55725417b7f334b7558371fc9833ae914b81a456d9beee7a3eeab8b pkgname = android-qt5-mips @@ -7,8 +7,8 @@ android_arch=mips _pkgname=android-qt5 pkgname=${_pkgname}-${android_arch} -pkgver=5.8.0 -pkgrel=3 +pkgver=5.9.0 +pkgrel=1 pkgdesc="Qt 5 for Android" arch=('i686' 'x86_64') url='https://www.qt.io' @@ -49,9 +49,11 @@ esac _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/single/${_pkgfqn}.tar.xz" - "JavaScriptCore.pri.patch") -sha256sums=('0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6' - '133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455') + "JavaScriptCore.pri.patch" + "geoservices.pro.patch") +sha256sums=('f70b5c66161191489fc13c7b7eb69bf9df3881596b183e7f6d94305a39837517' + '133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455' + 'f0770923c55725417b7f334b7558371fc9833ae914b81a456d9beee7a3eeab8b') prepare() { cd ${_pkgfqn} @@ -61,6 +63,7 @@ prepare() { armeabi) # Disable JIT. patch -Np1 -i "../JavaScriptCore.pri.patch" + patch -Np1 -i "../geoservices.pro.patch" ;; *) ;; @@ -97,11 +100,23 @@ build() { export ANDROID_NDK_ROOT=/opt/android-ndk export ANDROID_SDK_ROOT=/opt/android-sdk - export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools) - export ANDROID_API_VERSION=$(get_last ${ANDROID_SDK_ROOT}/platforms) + + if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then + export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools) + fi + + if [ -z "${ANDROID_API_VERSION}" ]; then + export ANDROID_API_VERSION=$(get_last ${ANDROID_SDK_ROOT}/platforms) + fi + export PYTHON=/usr/bin/python2 - ndkPlatform=$(get_last_platform ${ANDROID_NDK_ROOT}/platforms) + if [ -z "${ANDROID_NDK_PLATFORM}" ]; then + ndkPlatform=$(get_last_platform ${ANDROID_NDK_ROOT}/platforms) + else + ndkPlatform=${ANDROID_NDK_PLATFORM} + fi + _pref=/opt/${_pkgname}/${pkgver}/${android_arch} configue_opts=" diff --git a/geoservices.pro.patch b/geoservices.pro.patch new file mode 100644 index 000000000000..d2e8366ba561 --- /dev/null +++ b/geoservices.pro.patch @@ -0,0 +1,12 @@ +--- a/qtlocation/src/plugins/geoservices/geoservices.pro 2017-05-19 14:42:14.000000000 -0300 ++++ b/qtlocation/src/plugins/geoservices/geoservices.pro 2017-06-10 13:46:34.743784296 -0300 +@@ -10,7 +10,7 @@ + !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { + warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") + } else { +- SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native +- mapboxgl.depends = ../../3rdparty/mapbox-gl-native ++# SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native ++# mapboxgl.depends = ../../3rdparty/mapbox-gl-native + } + } |