From 7f8b2d26bcfb6e3bce4b3f9875f3386ecea6778e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 24 Feb 2024 21:28:27 +0100 Subject: [PATCH] Update android-*-kirigami2 to 6.0.0 --- kirigami2/android-aarch64/PKGBUILD | 19 ++++---- kirigami2/android-armv7a-eabi/PKGBUILD | 66 ++++++++++---------------- 2 files changed, 36 insertions(+), 49 deletions(-) diff --git a/kirigami2/android-aarch64/PKGBUILD b/kirigami2/android-aarch64/PKGBUILD index c1742e93..78105130 100644 --- a/kirigami2/android-aarch64/PKGBUILD +++ b/kirigami2/android-aarch64/PKGBUILD @@ -4,25 +4,26 @@ # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # you also find the URL of a binary repository. -_pkgname=kirigami2 +_pkgname=kirigami _android_arch=aarch64 -pkgname=android-$_android_arch-$_pkgname -pkgver=5.240.0.20231004 +pkgname=android-${_android_arch}-${_pkgname}2 +pkgver=6.0.0 pkgrel=1 pkgdesc="A QtQuick based components set (Android, $_android_arch)" arch=('any') url='https://community.kde.org/Frameworks' license=(LGPL) depends=("android-$_android_arch-qt6"-{declarative,shadertools,svg,5compat}) -makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules-git' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools') -#source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig}) -#sha256sums=('9706915f219ef9394b030dbb24974d4fddef091008954cf75cf97cc97586e35f' +makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools') +#source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig}) +#sha256sums=('ed0f56c89249fb92a9af99a94fd13542abbae4a8f1613aaaa2bfab87914b601a' # 'SKIP') -_commit=41bdddb37ea96ea19109c2aa9e7158cb57986386 +validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB # David Faure + E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell +_commit=05626819a0ed2f5b3db65191803b237992cbf17d source=(git+https://invent.kde.org/frameworks/kirigami.git#commit=$_commit) sha256sums=(SKIP) -validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure options=(!buildflags staticlibs !strip !emptydirs) #pkgver() { @@ -32,7 +33,7 @@ options=(!buildflags staticlibs !strip !emptydirs) build() { source android-env ${_android_arch} - android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S kirigami \ + android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgname \ -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ -DECM_DIR:PATH=/usr/share/ECM/cmake \ -DBUILD_EXAMPLES=OFF \ diff --git a/kirigami2/android-armv7a-eabi/PKGBUILD b/kirigami2/android-armv7a-eabi/PKGBUILD index b71d1a53..78105130 100644 --- a/kirigami2/android-armv7a-eabi/PKGBUILD +++ b/kirigami2/android-armv7a-eabi/PKGBUILD @@ -4,59 +4,45 @@ # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # you also find the URL of a binary repository. -_pkgname=kirigami2 -_android_arch=armeabi-v7a -_pkg_arch=armv7a-eabi -_android_toolchain=arm-linux-androideabi -_android_platform=24 -_prefix=/opt/android-libs/$_pkg_arch +_pkgname=kirigami +_android_arch=aarch64 -pkgname=android-$_pkg_arch-$_pkgname -pkgver=5.74.0 +pkgname=android-${_android_arch}-${_pkgname}2 +pkgver=6.0.0 pkgrel=1 -pkgdesc="A QtQuick based components set (Android, $_pkg_arch)" +pkgdesc="A QtQuick based components set (Android, $_android_arch)" arch=('any') url='https://community.kde.org/Frameworks' license=(LGPL) -depends=("android-$_pkg_arch-qt5") -makedepends=('cmake' 'android-ndk' 'android-sdk' 'extra-cmake-modules') -conflicts=("android-$_pkgname-$_android_arch") -replaces=("android-$_pkgname-$_android_arch") -source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('9706915f219ef9394b030dbb24974d4fddef091008954cf75cf97cc97586e35f' - 'SKIP') -validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure +depends=("android-$_android_arch-qt6"-{declarative,shadertools,svg,5compat}) +makedepends=('cmake' 'android-ndk' 'android-sdk' 'android-cmake' 'extra-cmake-modules' 'ninja' 'git' 'qt6-base' 'qt6-declarative' 'qt6-tools' 'qt6-shadertools') +#source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig}) +#sha256sums=('ed0f56c89249fb92a9af99a94fd13542abbae4a8f1613aaaa2bfab87914b601a' +# 'SKIP') +validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB # David Faure + E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell +_commit=05626819a0ed2f5b3db65191803b237992cbf17d +source=(git+https://invent.kde.org/frameworks/kirigami.git#commit=$_commit) +sha256sums=(SKIP) options=(!buildflags staticlibs !strip !emptydirs) -prepare() { - mkdir -p build -} +#pkgver() { +# cd kirigami +# echo "$pkgver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" +#} build() { - cd build - - # note: needs workaround for https://gitlab.kitware.com/cmake/cmake/issues/18739 (currently provided outside of the PKGBUILD itself) - - cmake ../$_pkgname-$pkgver \ - -DCMAKE_SYSTEM_NAME=Android \ - -DCMAKE_SYSTEM_VERSION=$_android_platform \ - -DANDROID_ABI=$_android_arch \ - -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \ - -DCMAKE_ANDROID_NDK=/opt/android-ndk \ - -DCMAKE_ANDROID_SDK=/opt/android-sdk \ - -DCMAKE_ANDROID_STL_TYPE=c++_shared \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="$_prefix" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,-rpath-link,$_prefix/lib" \ - -DCMAKE_FIND_ROOT_PATH="/opt/android-ndk/sysroot;$_prefix" \ - -DECM_DIR=/usr/share/ECM/cmake \ + source android-env ${_android_arch} + android-${_android_arch}-cmake -G Ninja -B build-$_android_arch -S $_pkgname \ + -DCMAKE_FIND_ROOT_PATH="${ANDROID_PREFIX}" \ + -DECM_DIR:PATH=/usr/share/ECM/cmake \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTING=OFF \ -DBUILD_QCH=OFF - make VERBOSE=1 + VERBOSE=1 cmake --build build-$_android_arch } package() { - cd build - make DESTDIR="$pkgdir" install + source android-env ${_android_arch} + DESTDIR="$pkgdir" VERBOSE=1 cmake --install build-$_android_arch }