Disabled mapbox. Removed QMAKE_PRL_BUILD_DIR in .prl files.

3 files changed, 38 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c25466451d5..1c1352a20c98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# lun sep 24 13:31:07 UTC 2018
+# sáb sep 29 14:51:05 UTC 2018
 pkgbase = android-qt5-x86
 	pkgdesc = Qt 5 for Android
 	pkgver = 5.11.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.qt.io
 	arch = x86_64
 	groups = android-qt5
@@ -32,8 +32,10 @@ pkgbase = android-qt5-x86
 	options = !emptydirs
 	source = http://download.qt-project.org/official_releases/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz
 	source = 0001-Fix-clang-build.patch
+	source = 0002-Disable-mapbox.patch
 	md5sums = 152a8ade9c11fe33ff5bc95310a1bb64
 	md5sums = 511eafcabe9e0c6210f1dc5e26daa5c8
+	md5sums = 20d8bdd24102e9011b561b7361394728
 
 pkgname = android-qt5-x86
 
diff --git a/0002-Disable-mapbox.patch b/0002-Disable-mapbox.patch
new file mode 100644
index 000000000000..2266f773a475
--- /dev/null
+++ b/0002-Disable-mapbox.patch
@@ -0,0 +1,15 @@
+--- a/qtlocation/src/plugins/geoservices/geoservices.pro	2018-08-31 09:50:06.000000000 -0300
++++ b/qtlocation/src/plugins/geoservices/geoservices.pro	2018-09-29 09:32:24.465419357 -0300
+@@ -7,12 +7,3 @@
+ qtConfig(geoservices_esri): SUBDIRS += esri
+ qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
+ qtConfig(geoservices_osm): SUBDIRS += osm
+-
+-qtConfig(geoservices_mapboxgl) {
+-    !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
+-        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
+-    }
+-}
diff --git a/PKGBUILD b/PKGBUILD
index 88f985eaff70..786858eb9903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,7 @@
 # Contributor: Jiaxi Hu <sftrytry _AT_ gmail _DOT_ com>
 # Contributor: jimmy00784 <jimmy00784@gmail.com>
 # Contributor: Ricardo (XenGi) Band <email@ricardo.band>
+# Contributor: Martchus <martchus@gmx.net>
 
 # Useful link to keep track of latest API changes:
 #
@@ -13,13 +14,22 @@ android_arch=x86
 # Minimum Android platform based on:
 #
 # https://developer.android.com/about/dashboards/
-ANDROID_MINIMUM_PLATFORM=21
-export ANDROID_MINIMUM_PLATFORM
+if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
+    export ANDROID_MINIMUM_PLATFORM=21
+fi
+
+if [ -z "${ANDROID_NDK_ROOT}" ]; then
+    export ANDROID_NDK_ROOT=/opt/android-ndk
+fi
+
+if [ -z "${ANDROID_SDK_ROOT}" ]; then
+    export ANDROID_SDK_ROOT=/opt/android-sdk
+fi
 
 _pkgname=android-qt5
 pkgname=${_pkgname}-${android_arch}
 pkgver=5.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt 5 for Android"
 arch=('x86_64')
 url='https://www.qt.io'
@@ -64,15 +74,18 @@ options=('!strip'
          '!emptydirs')
 _pkgfqn="qt-everywhere-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkgver}/single/${_pkgfqn}.tar.xz"
-        "0001-Fix-clang-build.patch")
+        "0001-Fix-clang-build.patch"
+        "0002-Disable-mapbox.patch")
 md5sums=('152a8ade9c11fe33ff5bc95310a1bb64'
-         '511eafcabe9e0c6210f1dc5e26daa5c8')
+         '511eafcabe9e0c6210f1dc5e26daa5c8'
+         '20d8bdd24102e9011b561b7361394728')
 
 prepare() {
     cd ${_pkgfqn}
 
     # Platform specific patches.
     patch -Np1 -i "../0001-Fix-clang-build.patch"
+    patch -Np1 -i "../0002-Disable-mapbox.patch"
 }
 
 get_last() {
@@ -92,9 +105,6 @@ build() {
     unset QTDIR
     unset CARCH
 
-    export ANDROID_NDK_ROOT=/opt/android-ndk
-    export ANDROID_SDK_ROOT=/opt/android-sdk
-
     if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
         export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools)
     fi
@@ -133,11 +143,6 @@ build() {
         -android-arch ${android_arch}
         -android-ndk-platform ${ANDROID_NDK_PLATFORM}"
 
-    # qtlocation needs mapbox-gl-native, and mapbox-gl-native needs C++17 and
-    # higher so disable it for a while.
-    configue_opts+="
-        -skip qtlocation"
-
     # Platform specific patches
     case "$android_arch" in
         x86*)
@@ -178,9 +183,9 @@ package() {
             ;;
     esac
 
-    export ANDROID_NDK_ROOT=/opt/android-ndk
     STRIP=${ANDROID_NDK_ROOT}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip
     find ${pkgdir}/opt/${_pkgname}/${android_arch}/lib -name 'lib*.so' -exec ${STRIP} {} \;
     find ${pkgdir}/opt/${_pkgname}/${android_arch}/lib \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${STRIP} {} \;
     find ${pkgdir}/opt/${_pkgname}/${android_arch}/plugins -name 'lib*.so' -exec ${STRIP} {} \;
+    sed -i '/QMAKE_PRL_BUILD_DIR/d' ${pkgdir}/opt/${_pkgname}/${android_arch}/lib/lib*.prl
 }