diff options
author | Gonzalo Exequiel Pedone | 2019-12-21 13:19:00 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2019-12-21 13:19:00 -0300 |
commit | 786c06c34e009fea3e2667a5cddfc84670c31b6f (patch) | |
tree | a2184fbcc86a2c94d34192084e313b07019216d4 | |
parent | 22ea65d958025411b125a9e2b8109717bc319337 (diff) | |
download | aur-786c06c34e009fea3e2667a5cddfc84670c31b6f.tar.gz |
Updated to Qt 5.14.
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | 0001-Fix-clang-libc-build-under-Android.patch | 40 | ||||
-rw-r--r-- | 0001-Support-pkg-config-under-Android.patch | 9 | ||||
-rw-r--r-- | 0002-Disable-mapboxgl.patch | 29 | ||||
-rw-r--r-- | 0002-Use-pkg-config-to-find-external-libraries.patch | 29 | ||||
-rw-r--r-- | 0003-Support-pkg-config-under-Android.patch | 24 | ||||
-rw-r--r-- | 0004-Use-pkg-config-to-find-libjpeg.patch | 24 | ||||
-rw-r--r-- | PKGBUILD | 63 |
8 files changed, 76 insertions, 166 deletions
@@ -1,6 +1,6 @@ pkgbase = android-aarch64-qt5 pkgdesc = Qt 5 for Android - pkgver = 5.13.2 + pkgver = 5.14.0 pkgrel = 1 url = https://www.qt.io install = android-aarch64-qt5.install @@ -26,26 +26,24 @@ pkgbase = android-aarch64-qt5 depends = android-sdk depends = android-sdk-build-tools depends = android-sdk-platform-tools - depends = android-aarch64-zlib - depends = android-aarch64-libpng depends = android-aarch64-libjpeg-turbo + depends = android-aarch64-libpng + depends = android-aarch64-libtiff + depends = android-aarch64-libwebp depends = android-aarch64-openssl + depends = android-aarch64-zlib optdepends = android-google-apis-arm64-v8a: AVD support optdepends = android-arm64-v8a-system-image: AVD support options = !strip options = !buildflags options = staticlibs options = !emptydirs - source = http://download.qt-project.org/official_releases/qt/5.13/5.13.2/single/qt-everywhere-src-5.13.2.tar.xz - source = 0001-Fix-clang-libc-build-under-Android.patch - source = 0002-Disable-mapboxgl.patch - source = 0003-Support-pkg-config-under-Android.patch - source = 0004-Use-pkg-config-to-find-libjpeg.patch - md5sums = 7c04c678d4ecd9e9c06747e7c17e0bb9 - md5sums = 0658c31a909beba3e73e503060df5fba - md5sums = 2fafec93d1dc9da0797095b815a60d88 - md5sums = 621a2b82623d5514be88d15700e9eb20 - md5sums = 9e4577ed83ed53a7758f4bfbb5ddbe98 + source = http://download.qt-project.org/official_releases/qt/5.14/5.14.0/single/qt-everywhere-src-5.14.0.tar.xz + source = 0001-Support-pkg-config-under-Android.patch + source = 0002-Use-pkg-config-to-find-external-libraries.patch + md5sums = e7ea948ab99a2ef0726db5eac8e4fd8e + md5sums = 6af9dcc450ae6c69d8fddccf0680d84a + md5sums = f0f5dda8352a675566a08fa0f863a08b pkgname = android-aarch64-qt5 diff --git a/0001-Fix-clang-libc-build-under-Android.patch b/0001-Fix-clang-libc-build-under-Android.patch deleted file mode 100644 index dd9f84326a97..000000000000 --- a/0001-Fix-clang-libc-build-under-Android.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2c8ca36b5f87ccfc039c0b669c80f21205769758 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 9 Dec 2018 14:28:07 +0100 -Subject: [PATCH 1/4] Fix clang/libc++ build under Android - ---- - qtbase/mkspecs/android-clang/qmake.conf | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/qtbase/mkspecs/android-clang/qmake.conf b/qtbase/mkspecs/android-clang/qmake.conf -index 05b7979142..83d030793b 100644 ---- a/qtbase/mkspecs/android-clang/qmake.conf -+++ b/qtbase/mkspecs/android-clang/qmake.conf -@@ -30,11 +30,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ - equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.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 \ - -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include \ - -isystem $$NDK_ROOT/sources/android/support/include \ -- -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include -+ -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include \ -+ -isystem $$NDK_ROOT/sysroot/usr/include - - ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH - -@@ -44,6 +45,8 @@ ANDROID_USE_LLVM = true - - exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ - ANDROID_CXX_STL_LIBS = -lc++ -+else: exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so): \ -+ ANDROID_CXX_STL_LIBS = -lc++_shared - else: \ - ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") - --- -2.23.0 - diff --git a/0001-Support-pkg-config-under-Android.patch b/0001-Support-pkg-config-under-Android.patch new file mode 100644 index 000000000000..ff33200db1b7 --- /dev/null +++ b/0001-Support-pkg-config-under-Android.patch @@ -0,0 +1,9 @@ +--- a/qtbase/mkspecs/android-clang/qmake.conf 2019-12-07 03:27:07.000000000 -0300 ++++ b/qtbase/mkspecs/android-clang/qmake.conf 2019-12-16 13:07:03.878285841 -0300 +@@ -111,3 +111,6 @@ + x86_64.deployment_identifier = x86_64 + + load(qt_config) ++ ++QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] ++QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config diff --git a/0002-Disable-mapboxgl.patch b/0002-Disable-mapboxgl.patch deleted file mode 100644 index 495b1b08644f..000000000000 --- a/0002-Disable-mapboxgl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dbe68d96e7da8ba5e5484e6ad0bbd78c9b0a8eec Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 9 Dec 2018 14:29:59 +0100 -Subject: [PATCH] Disable mapboxgl - ---- - qtlocation/src/plugins/geoservices/geoservices.pro | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/qtlocation/src/plugins/geoservices/geoservices.pro b/qtlocation/src/plugins/geoservices/geoservices.pro -index b81ad34a..98308c97 100644 ---- a/qtlocation/src/plugins/geoservices/geoservices.pro -+++ b/qtlocation/src/plugins/geoservices/geoservices.pro -@@ -7,12 +7,3 @@ qtConfig(geoservices_mapbox): SUBDIRS += mapbox - 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 -- } --} --- -2.23.0 - diff --git a/0002-Use-pkg-config-to-find-external-libraries.patch b/0002-Use-pkg-config-to-find-external-libraries.patch new file mode 100644 index 000000000000..c7425333726e --- /dev/null +++ b/0002-Use-pkg-config-to-find-external-libraries.patch @@ -0,0 +1,29 @@ +--- 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" + ] + } diff --git a/0003-Support-pkg-config-under-Android.patch b/0003-Support-pkg-config-under-Android.patch deleted file mode 100644 index 290418d9941f..000000000000 --- a/0003-Support-pkg-config-under-Android.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a71a1223328539ee403884a24d1dbc5a685d40dd Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 7 Apr 2019 09:54:49 +0200 -Subject: [PATCH 3/4] Support pkg-config under Android - -from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d901da324b2ceea2ac99b48137cb82b2bd920c77 ---- - qtbase/mkspecs/android-clang/qmake.conf | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/qtbase/mkspecs/android-clang/qmake.conf b/qtbase/mkspecs/android-clang/qmake.conf -index 83d030793b..8f145a2bb7 100644 ---- a/qtbase/mkspecs/android-clang/qmake.conf -+++ b/qtbase/mkspecs/android-clang/qmake.conf -@@ -53,3 +53,6 @@ else: \ - QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz - - include(../common/android-base-tail.conf) -+ -+QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] -+QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config --- -2.23.0 - diff --git a/0004-Use-pkg-config-to-find-libjpeg.patch b/0004-Use-pkg-config-to-find-libjpeg.patch deleted file mode 100644 index 9292b8b1a951..000000000000 --- a/0004-Use-pkg-config-to-find-libjpeg.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9cd435c730949e29104bbfa2bdd82ed2c662ca3d Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sat, 7 Sep 2019 13:21:37 +0200 -Subject: [PATCH 4/4] Use pkg-config to find libjpeg - ---- - qtbase/src/gui/configure.json | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qtbase/src/gui/configure.json b/qtbase/src/gui/configure.json -index 6280b4dfa2..206f83984a 100644 ---- 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" - ] --- -2.23.0 - @@ -7,7 +7,7 @@ _android_arch=aarch64 pkgname=android-${_android_arch}-qt5 -pkgver=5.13.2 +pkgver=5.14.0 pkgrel=1 pkgdesc="Qt 5 for Android" arch=('any') @@ -31,10 +31,12 @@ depends=('java-runtime-headless-openjdk<=8' 'android-sdk' 'android-sdk-build-tools' 'android-sdk-platform-tools' - "android-${_android_arch}-zlib" - "android-${_android_arch}-libpng" "android-${_android_arch}-libjpeg-turbo" - "android-${_android_arch}-openssl") + "android-${_android_arch}-libpng" + "android-${_android_arch}-libtiff" + "android-${_android_arch}-libwebp" + "android-${_android_arch}-openssl" + "android-${_android_arch}-zlib") groups=('android-qt5') case "$_android_arch" in @@ -62,15 +64,11 @@ options=(!strip !buildflags staticlibs !emptydirs) _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-Fix-clang-libc-build-under-Android.patch" - "0002-Disable-mapboxgl.patch" - "0003-Support-pkg-config-under-Android.patch" - "0004-Use-pkg-config-to-find-libjpeg.patch") -md5sums=('7c04c678d4ecd9e9c06747e7c17e0bb9' - '0658c31a909beba3e73e503060df5fba' - '2fafec93d1dc9da0797095b815a60d88' - '621a2b82623d5514be88d15700e9eb20' - '9e4577ed83ed53a7758f4bfbb5ddbe98') + "0001-Support-pkg-config-under-Android.patch" + "0002-Use-pkg-config-to-find-external-libraries.patch") +md5sums=('e7ea948ab99a2ef0726db5eac8e4fd8e' + '6af9dcc450ae6c69d8fddccf0680d84a' + 'f0f5dda8352a675566a08fa0f863a08b') prepare() { cd ${_pkgfqn} @@ -79,22 +77,10 @@ prepare() { check_ndk_version_ge_than 18.0 check_android_platform - # Platform specific patches. - - patch -Np1 -i "../0001-Fix-clang-libc-build-under-Android.patch" - - # Skip building mapboxgl as it increases compile time significantly and - # likely not a lot of people actually using it; if you need it, just remove the - # following line: - patch -Np1 -i "../0002-Disable-mapboxgl.patch" + patch -Np1 -i "../0001-Support-pkg-config-under-Android.patch" + patch -Np1 -i "../0002-Use-pkg-config-to-find-external-libraries.patch" - patch -Np1 -i "../0003-Support-pkg-config-under-Android.patch" - patch -Np1 -i "../0004-Use-pkg-config-to-find-libjpeg.patch" - - sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/mkspecs/features/android/sdk.prf - sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/src/android/jar/jar.pro - sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtgamepad/src/plugins/gamepads/android/jar/jar.pro - sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/configure.pri + sed -i "s/android-21/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/configure.pri } build() { @@ -112,6 +98,7 @@ build() { unset CARCH export PKG_CONFIG=$ANDROID_PKGCONFIG export PYTHON=/usr/bin/python2 + export ANDROID_TARGET_ARCH="${ANDROID_ABI}" configue_opts=" -confirm-license @@ -123,20 +110,23 @@ build() { -xplatform android-clang -nomake tests -nomake examples - -android-sdk ${ANDROID_HOME} - -android-ndk ${ANDROID_NDK_HOME} - -android-ndk-host linux-x86_64 - -android-toolchain-version 4.9 -skip qtserialport + -skip qtwebengine -no-warnings-are-errors -pkg-config - -pkg-config - -system-zlib - -system-libpng -system-libjpeg + -system-libpng + -system-tiff + -system-webp + -system-zlib + -no-feature-geoservices_mapbox + -no-feature-geoservices_mapboxgl -openssl-runtime -qt-freetype - -android-arch ${ANDROID_ABI} + -android-sdk ${ANDROID_HOME} + -android-ndk ${ANDROID_NDK_HOME} + -android-ndk-host linux-x86_64 + -android-abis ${ANDROID_ABI} -android-ndk-platform ${ANDROID_NDK_PLATFORM} -recheck-all -optimized-qmake @@ -167,6 +157,7 @@ package() { make INSTALL_ROOT=${pkgdir} install + rm -rvf ${pkgdir}/libs find ${pkgdir}/${ANDROID_PREFIX_BIN} -type f ! -name '*.pl' -exec strip -s {} \; find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \; # find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} -g {} \; |