mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: WIP attempt to build with Qt6

Browse source 
Completely non-functional.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2024-08-12 14:56:08 -07:00
parent 02d06072a1
commit 29d9405a72
4 changed files with 72 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/docker/android-build-container/variables.sh
View file

@ -1,14 +1,14 @@
#!/bin/bash
# When changing Qt version remember to update the
# qt-installer-noninteractive file as well.
QT_VERSION=5.15
LATEST_QT=5.15.1
NDK_VERSION=21.3.6528147
QT_VERSION=6.7
LATEST_QT=6.7.2
NDK_VERSION=26.1.10909125
ANDROID_BUILDTOOLS_REVISION=29.0.3
ANDROID_PLATFORM_LEVEL=21
ANDROID_PLATFORM=android-21
ANDROID_PLATFORMS=android-29
ANDROID_PLATFORM_LEVEL=23
ANDROID_PLATFORM=android-31
ANDROID_PLATFORMS=android-34
ANDROID_NDK=ndk/${NDK_VERSION}
# OpenSSL also has an entry in get-dep-lib.sh line 103
# that needs to be updated as well.
OPENSSL_VERSION=1.1.1m
OPENSSL_VERSION=3.0

8
scripts/get-dep-lib.sh
View file

@ -9,11 +9,11 @@ CURRENT_LIBCURL="curl-7_88_1"
CURRENT_LIBUSB="v1.0.25"
CURRENT_OPENSSL="OpenSSL_1_1_1m"
CURRENT_LIBSSH2="libssh2-1.8.0"
CURRENT_XSLT="v1.1.34"
CURRENT_XSLT="v1.1.42"
CURRENT_SQLITE="3190200"
CURRENT_LIBXML2="v2.9.4"
CURRENT_LIBXML2="v2.9.14"
CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72"
CURRENT_KIRIGAMI="v5.76.0"
CURRENT_KIRIGAMI="v6.5.0"
CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02"
CURRENT_MDBTOOLS="v1.0.0"
CURRENT_QT_ANDROID_CMAKE="master"
@ -169,7 +169,7 @@ for package in "${PACKAGES[@]}" ; do
git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
;;
googlemaps)
git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
git_checkout_library googlemaps qt6 https://github.com/Subsurface/googlemaps.git
;;
hidapi)
git_checkout_library hidapi master https://github.com/libusb/hidapi.git

1
scripts/mobilecomponents.sh
View file

@ -27,6 +27,7 @@ cd "$SRC"/subsurface/mobile-widgets/3rdparty/ECM
cmake -DSHARE_INSTALL_DIR=.. ../extra-cmake-modules
make install
exit
# finally, add our patches to Kirigami
cd "$SRC"/subsurface/mobile-widgets/3rdparty
PATCHES=$(echo 00*.patch)