Fix android-*qt6-* packages

* Fix wrong Java version
* Fix inconsistency between name of libpng and its
  soname

devel/generator/templates/layouts/android-qt6-base.sh.ep

@@ -16,16 +16,16 @@ _android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %
 pkgname=<%= $package_name %>
 _qtver=6.4.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='A cross-platform application and UI framework (android)'
-depends=('java-runtime-headless-openjdk=8' 'ant' 'android-ndk' 'android-sdk' 'android-sdk-build-tools'
+depends=('java-runtime-headless-openjdk>=11' 'ant' 'android-ndk' 'android-sdk' 'android-sdk-build-tools'
          'android-sdk-platform-tools' 'android-platform' "android-${_android_arch}-libjpeg-turbo"
          "android-${_android_arch}-libpng" "android-${_android_arch}-openssl" "android-${_android_arch}-zlib")
 makedepends=('android-cmake<%= $static_suffix %>' 'android-pkg-config'
-             'java-environment-openjdk=8' 'qt6-base' 'ninja')
+             'java-environment-openjdk>=11' 'qt6-base' 'ninja')
 optdepends=('qt6-base: development tools')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)

libpng/android-aarch64/PKGBUILD

@@ -0,0 +1,40 @@
+# Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
+# Contributor: Daniel Kirchner <daniel AT ekpyron DOT org>
+
+_android_arch=aarch64
+
+pkgname=android-${_android_arch}-libpng
+pkgver=1.6.39
+pkgrel=2
+pkgdesc="A collection of routines used to create PNG format graphics (android)"
+arch=('any')
+url="http://www.libpng.org/pub/png/libpng.html"
+license=('custom')
+depends=("android-${_android_arch}-zlib")
+options=(!strip !buildflags staticlibs !emptydirs)
+makedepends=('android-configure')
+source=("http://downloads.sourceforge.net/sourceforge/libpng/libpng-$pkgver.tar.xz")
+sha256sums=('1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937')
+
+build() {
+    cd "$srcdir/libpng-$pkgver"
+    source android-env ${_android_arch}
+
+    android-${_android_arch}-configure \
+        --enable-unversioned-links \
+        --enable-unversioned-libpng-pc\
+        --enable-unversioned-libpng-config \
+        --enable-hardware-optimizations
+
+    make $MAKEFLAGS
+}
+
+package () {
+    cd "${srcdir}/libpng-${pkgver}"
+    source android-env ${_android_arch}
+
+    make DESTDIR="$pkgdir" install
+    rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
+}

qt6-base/android-aarch64/PKGBUILD

@@ -13,16 +13,16 @@ _android_arch=aarch64
 pkgname=android-aarch64-qt6-base
 _qtver=6.4.2
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='A cross-platform application and UI framework (android)'
-depends=('java-runtime-headless-openjdk=8' 'ant' 'android-ndk' 'android-sdk' 'android-sdk-build-tools'
+depends=('java-runtime-headless-openjdk>=11' 'ant' 'android-ndk' 'android-sdk' 'android-sdk-build-tools'
          'android-sdk-platform-tools' 'android-platform' "android-${_android_arch}-libjpeg-turbo"
          "android-${_android_arch}-libpng" "android-${_android_arch}-openssl" "android-${_android_arch}-zlib")
 makedepends=('android-cmake' 'android-pkg-config'
-             'java-environment-openjdk=8' 'qt6-base' 'ninja')
+             'java-environment-openjdk>=11' 'qt6-base' 'ninja')
 optdepends=('qt6-base: development tools')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 groups=(android-${_android_arch}-qt6)