summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-02-07 19:26:33 -0300
committerGonzalo Exequiel Pedone2019-02-07 19:26:33 -0300
commit7c18faf0195e9e5a2f6678ff0c824d0652ef1ffb (patch)
tree7c5b8729c6d00f29e21a6c8a2d5573164652251d
parentdca2b688894a22412f46fe018283ff44657c79f7 (diff)
downloadaur-7c18faf0195e9e5a2f6678ff0c824d0652ef1ffb.tar.gz
Updated to Qt 5.12.1.
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Fix-clang-build.patch9
-rw-r--r--PKGBUILD6
3 files changed, 13 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 610c9f7ce13f..f7e902995077 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# miƩ dic 12 02:55:18 UTC 2018
+# jue feb 7 22:25:10 UTC 2019
pkgbase = android-armv7a-eabi-qt5
pkgdesc = Qt 5 for Android
- pkgver = 5.12.0
+ pkgver = 5.12.1
pkgrel = 1
url = https://www.qt.io
arch = x86_64
@@ -30,12 +30,12 @@ pkgbase = android-armv7a-eabi-qt5
options = !buildflags
options = staticlibs
options = !emptydirs
- source = http://download.qt-project.org/official_releases/qt/5.12/5.12.0/single/qt-everywhere-src-5.12.0.tar.xz
+ source = http://download.qt-project.org/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz
source = 0001-Fix-clang-build.patch
source = 0002-Disable-mapbox.patch
source = 0003-Fix-androiddeployqt-search-paths.patch
- md5sums = af569de3eb42da4457b0897e5759dc91
- md5sums = b30076dddd0a424f8b65bf7ca765ac14
+ md5sums = 6a37466c8c40e87d4a19c3f286ec2542
+ md5sums = bf97665c96c0a084ea7970eb61556754
md5sums = 20d8bdd24102e9011b561b7361394728
md5sums = 90141a931baac77fa608146f32414ead
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
index 4dcb9e2d9c8c..85c8fe3abc08 100644
--- a/0001-Fix-clang-build.patch
+++ b/0001-Fix-clang-build.patch
@@ -1,6 +1,6 @@
---- a/qtbase/mkspecs/android-clang/qmake.conf 2018-12-03 08:15:26.000000000 -0300
-+++ b/qtbase/mkspecs/android-clang/qmake.conf 2018-12-11 14:07:47.497103671 -0300
-@@ -31,18 +31,19 @@
+--- 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 @@
QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH
QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a
@@ -15,7 +15,8 @@
ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
- ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so
+@@ -44,7 +45,7 @@
+ ANDROID_USE_LLVM = true
exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \
- ANDROID_CXX_STL_LIBS = -lc++
diff --git a/PKGBUILD b/PKGBUILD
index ab5083e355cf..9a2e4f64c369 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ if [ -z "${ANDROID_SDK_ROOT}" ]; then
fi
pkgname=android-${_android_arch}-qt5
-pkgver=5.12.0
+pkgver=5.12.1
pkgrel=1
pkgdesc="Qt 5 for Android"
arch=('x86_64')
@@ -80,8 +80,8 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
"0001-Fix-clang-build.patch"
"0002-Disable-mapbox.patch"
"0003-Fix-androiddeployqt-search-paths.patch")
-md5sums=('af569de3eb42da4457b0897e5759dc91'
- 'b30076dddd0a424f8b65bf7ca765ac14'
+md5sums=('6a37466c8c40e87d4a19c3f286ec2542'
+ 'bf97665c96c0a084ea7970eb61556754'
'20d8bdd24102e9011b561b7361394728'
'90141a931baac77fa608146f32414ead')