diff options
author | Gonzalo Exequiel Pedone | 2020-02-06 01:39:12 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2020-02-06 01:39:12 -0300 |
commit | de13f01151b63462a7c6d885fc0e742a399ebfe2 (patch) | |
tree | a3b6f15d099db40fd273797cec9eac968e5990a1 | |
parent | dae3b4d09896ab3ec6aaefea738107242208f976 (diff) | |
download | aur-de13f01151b63462a7c6d885fc0e742a399ebfe2.tar.gz |
Updated to Qt 5.14.1.
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | 0002-Use-pkg-config-to-find-external-libraries.patch | 29 | ||||
-rw-r--r-- | PKGBUILD | 9 |
3 files changed, 7 insertions, 41 deletions
@@ -1,7 +1,7 @@ pkgbase = android-x86-64-qt5 pkgdesc = Qt 5 for Android - pkgver = 5.14.0 - pkgrel = 2 + pkgver = 5.14.1 + pkgrel = 1 url = https://www.qt.io install = android-x86-64-qt5.install arch = any @@ -38,13 +38,11 @@ pkgbase = android-x86-64-qt5 options = !buildflags options = staticlibs options = !emptydirs - source = http://download.qt-project.org/official_releases/qt/5.14/5.14.0/single/qt-everywhere-src-5.14.0.tar.xz + source = http://download.qt-project.org/official_releases/qt/5.14/5.14.1/single/qt-everywhere-src-5.14.1.tar.xz source = 0001-Support-pkg-config-under-Android.patch - source = 0002-Use-pkg-config-to-find-external-libraries.patch source = 0003-Fix-neon.patch - md5sums = e7ea948ab99a2ef0726db5eac8e4fd8e + md5sums = 781c3179410aff7ef84607214e1e91b4 md5sums = 6af9dcc450ae6c69d8fddccf0680d84a - md5sums = f0f5dda8352a675566a08fa0f863a08b md5sums = 656c7eec7d37854cef1763c163c1ca98 pkgname = android-x86-64-qt5 diff --git a/0002-Use-pkg-config-to-find-external-libraries.patch b/0002-Use-pkg-config-to-find-external-libraries.patch deleted file mode 100644 index c7425333726e..000000000000 --- a/0002-Use-pkg-config-to-find-external-libraries.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/qtbase/src/gui/configure.json -+++ b/qtbase/src/gui/configure.json -@@ -373,6 +373,7 @@ - }, - "headers": "jpeglib.h", - "sources": [ -+ { "type": "pkgConfig", "args": "libjpeg" }, - { "libs": "-llibjpeg", "condition": "config.msvc" }, - "-ljpeg" - ] - ---- a/qtimageformats/src/imageformats/configure.json 2019-11-19 11:47:49.000000000 -0300 -+++ b/qtimageformats/src/imageformats/configure.json 2019-12-19 13:32:34.905053167 -0300 -@@ -82,6 +82,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libtiff-4" }, - "-ltiff" - ] - }, -@@ -112,6 +113,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libwebp libwebpdemux libwebpmux" }, - "-lwebp -lwebpdemux -lwebpmux" - ] - } @@ -7,8 +7,8 @@ _android_arch=x86-64 pkgname=android-${_android_arch}-qt5 -pkgver=5.14.0 -pkgrel=2 +pkgver=5.14.1 +pkgrel=1 pkgdesc="Qt 5 for Android" arch=('any') url='https://www.qt.io' @@ -65,11 +65,9 @@ _pkgfqn="qt-everywhere-src-${pkgver}" install="${pkgname}.install" source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkgver}/single/${_pkgfqn}.tar.xz" "0001-Support-pkg-config-under-Android.patch" - "0002-Use-pkg-config-to-find-external-libraries.patch" "0003-Fix-neon.patch") -md5sums=('e7ea948ab99a2ef0726db5eac8e4fd8e' +md5sums=('781c3179410aff7ef84607214e1e91b4' '6af9dcc450ae6c69d8fddccf0680d84a' - 'f0f5dda8352a675566a08fa0f863a08b' '656c7eec7d37854cef1763c163c1ca98') prepare() { @@ -80,7 +78,6 @@ prepare() { check_android_platform patch -Np1 -i "../0001-Support-pkg-config-under-Android.patch" - patch -Np1 -i "../0002-Use-pkg-config-to-find-external-libraries.patch" case "$_android_arch" in armv7a-eabi) |