diff options
author | Gonzalo Exequiel Pedone | 2019-03-18 14:01:48 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2019-03-18 14:01:48 -0300 |
commit | 9dfb13ad22a6fa0829fee2cf85c06b9d61453421 (patch) | |
tree | 60f040717256269b4cc261c98a396fc1eb0e8f36 | |
parent | d1c9c0945ea3acf754ff07f3287681f495abf73f (diff) | |
download | aur-9dfb13ad22a6fa0829fee2cf85c06b9d61453421.tar.gz |
Updated to qt 5.12.2.
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-Fix-clang-build.patch | 16 | ||||
-rw-r--r-- | PKGBUILD | 8 |
3 files changed, 13 insertions, 23 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# miƩ mar 13 02:26:13 UTC 2019 +# lun mar 18 17:00:15 UTC 2019 pkgbase = android-aarch64-qt5 pkgdesc = Qt 5 for Android - pkgver = 5.12.1 - pkgrel = 3 + pkgver = 5.12.2 + pkgrel = 1 url = https://www.qt.io install = android-aarch64-qt5.install arch = x86_64 @@ -31,11 +31,11 @@ pkgbase = android-aarch64-qt5 options = !buildflags options = staticlibs options = !emptydirs - source = http://download.qt-project.org/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz + source = http://download.qt-project.org/official_releases/qt/5.12/5.12.2/single/qt-everywhere-src-5.12.2.tar.xz source = 0001-Fix-clang-build.patch source = 0002-Disable-mapbox.patch - md5sums = 6a37466c8c40e87d4a19c3f286ec2542 - md5sums = bf97665c96c0a084ea7970eb61556754 + md5sums = 99c2eb46e533371798b4ca2d1458e065 + md5sums = ba4ff94ed5a0aa9746396cb0af6f0865 md5sums = 20d8bdd24102e9011b561b7361394728 pkgname = android-aarch64-qt5 diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch index 85c8fe3abc08..72f52ac0056e 100644 --- a/0001-Fix-clang-build.patch +++ b/0001-Fix-clang-build.patch @@ -1,9 +1,9 @@ --- a/qtbase/mkspecs/android-clang/qmake.conf 2019-02-07 11:03:08.250521061 -0300 +++ b/qtbase/mkspecs/android-clang/qmake.conf 2019-02-07 11:10:50.389466359 -0300 -@@ -31,11 +31,12 @@ +@@ -34,11 +34,12 @@ + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ +QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \ @@ -14,13 +14,3 @@ + -isystem $$NDK_ROOT/sysroot/usr/include ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH - -@@ -44,7 +45,7 @@ - ANDROID_USE_LLVM = true - - exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ -- ANDROID_CXX_STL_LIBS = -lc++ -+ ANDROID_CXX_STL_LIBS = -lc++_shared - else: \ - ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") - @@ -27,8 +27,8 @@ if [ -z "${ANDROID_SDK_ROOT}" ]; then fi pkgname=android-${_android_arch}-qt5 -pkgver=5.12.1 -pkgrel=3 +pkgver=5.12.2 +pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') url='https://www.qt.io' @@ -80,8 +80,8 @@ install="${pkgname}.install" source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkgver}/single/${_pkgfqn}.tar.xz" "0001-Fix-clang-build.patch" "0002-Disable-mapbox.patch") -md5sums=('6a37466c8c40e87d4a19c3f286ec2542' - 'bf97665c96c0a084ea7970eb61556754' +md5sums=('99c2eb46e533371798b4ca2d1458e065' + 'ba4ff94ed5a0aa9746396cb0af6f0865' '20d8bdd24102e9011b561b7361394728') _pref=/opt/android-libs/$_android_arch |