summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-06-27 21:14:01 -0300
committerGonzalo Exequiel Pedone2019-06-27 21:14:01 -0300
commit87d9c82854765d923eba8326af5ec5760a697a61 (patch)
tree510780a2122ebc3b18fbcda5902f67d56ae2e1b1
parentda346ca99ce0cdfb3f0e02a11ad7351856b3b56d (diff)
downloadaur-87d9c82854765d923eba8326af5ec5760a697a61.tar.gz
Package updated to Qt 5.13.0.
-rw-r--r--.SRCINFO6
-rw-r--r--0001-Fix-clang-build.patch10
-rw-r--r--PKGBUILD4
3 files changed, 7 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e4b1b1d15f..7672bc2c651 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-x86-qt5
pkgdesc = Qt 5 for Android
- pkgver = 5.12.4
+ pkgver = 5.13.0
pkgrel = 1
url = https://www.qt.io
install = android-x86-qt5.install
@@ -31,10 +31,10 @@ pkgbase = android-x86-qt5
options = !buildflags
options = staticlibs
options = !emptydirs
- source = http://download.qt-project.org/official_releases/qt/5.12/5.12.4/single/qt-everywhere-src-5.12.4.tar.xz
+ source = http://download.qt-project.org/official_releases/qt/5.13/5.13.0/single/qt-everywhere-src-5.13.0.tar.xz
source = 0001-Fix-clang-build.patch
source = 0002-Disable-mapbox.patch
- md5sums = dda95b0239d13c5276834177af3a8588
+ md5sums = 3c168d9a3a08248ff36f4f54c82e437f
md5sums = SKIP
md5sums = SKIP
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
index 47df6b70783..aa83bd5b005 100644
--- a/0001-Fix-clang-build.patch
+++ b/0001-Fix-clang-build.patch
@@ -1,6 +1,6 @@
--- a/qtbase/mkspecs/android-clang/qmake.conf 2019-04-09 06:51:26.000000000 -0300
+++ b/qtbase/mkspecs/android-clang/qmake.conf 2019-06-10 15:27:30.837639900 -0300
-@@ -15,30 +15,26 @@
+@@ -15,26 +15,22 @@
QMAKE_CXX = $$NDK_LLVM_PATH/bin/clang++
equals(ANDROID_TARGET_ARCH, armeabi-v7a): \
@@ -18,12 +18,6 @@
else: equals(ANDROID_TARGET_ARCH, x86_64): \
- QMAKE_CFLAGS += -target x86_64-none-linux-android
+ QMAKE_CFLAGS += -target x86_64-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, mips): \
-- QMAKE_CFLAGS += -target mipsel-none-linux-android
-+ QMAKE_CFLAGS += -target mipsel-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, mips64): \
-- QMAKE_CFLAGS += -target mips64el-none-linux-android
-+ QMAKE_CFLAGS += -target mips64el-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info
@@ -39,7 +33,7 @@
ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
-@@ -54,3 +50,6 @@
+@@ -50,3 +46,6 @@
QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
include(../common/android-base-tail.conf)
diff --git a/PKGBUILD b/PKGBUILD
index ab551b8a81d..35624929cab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _android_arch=x86
source android-env ${_android_arch}
pkgname=android-${_android_arch}-qt5
-pkgver=5.12.4
+pkgver=5.13.0
pkgrel=1
pkgdesc="Qt 5 for Android"
arch=('any')
@@ -60,7 +60,7 @@ 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=('dda95b0239d13c5276834177af3a8588'
+md5sums=('3c168d9a3a08248ff36f4f54c82e437f'
'SKIP'
'SKIP')