From e9328b1e4991852dda9547604102186f62a8a6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sun, 5 Apr 2020 22:16:44 +0800 Subject: Add build instructions --- .gitignore | 4 ++-- README.md | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 README.md diff --git a/.gitignore b/.gitignore index 7bb4c87..f1b95a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -build-kelakon-* -*.user* *.swp +*.user* +build* diff --git a/README.md b/README.md new file mode 100644 index 0000000..9887ea3 --- /dev/null +++ b/README.md @@ -0,0 +1,58 @@ +# Personal task manager to help you reach your goal + +# Building + +## Getting + +```sh +$ git clone git://darapsa.org/kelakon.git +$ cd kelakon +``` + +## Configuring for various target hosts (with optional debugging) + +```sh +$ mkdir build +$ cmake -DCMAKE_BUILD_TYPE=Debug .. +``` + +or + +```sh +$ mkdir build-Android_arm64_v8a-Debug +$ cd build-Android_arm64_v8a-Debug +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_arm64_v8a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=arm64-v8a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +``` + +or + +```sh +$ mkdir build-Android_armeabi_v7a-Debug +$ cd build-Android_armeabi_v7a-Debug +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_armeabi_v7a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=armeabi-v7a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +``` + +or + +```sh +$ mkdir build-Android_x86-Debug +$ cd build-Android_x86-Debug +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +``` + +or + +```sh +$ mkdir build-Android_x86_64-Debug +$ cd build-Android_x86_64-Debug +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86_64=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86_64 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +``` + +or so on. + +## Compiling, linking, and producing executable + +```sh +$ make # -jN (with N an integer number of parallel tasks you allow your computer to run for compiling this) +$ /opt/Qt5.14.1/5.14.1/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build +``` -- cgit v1.2.3 From dba2e6bb68be73318700e30c32857893822d3ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 17:21:54 +0800 Subject: Update qrtclient --- qrtclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrtclient b/qrtclient index 905f99a..cf6b665 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit 905f99a3e38d10bf3902584a0a0cfa1cd9c355ea +Subproject commit cf6b6658aa3f477d57e094fd73898244e2069935 -- cgit v1.2.3 From 2a733582c459f0aeb753b370d16247a27bfaec19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 17:36:01 +0800 Subject: Update to Qt5.14.2 and NDK r19c --- kelakon.pro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kelakon.pro b/kelakon.pro index 437e784..d8814a1 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -23,7 +23,7 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) { /usr/local/aarch64-linux-android/sysroot/usr/lib/libssl.so \ /usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so \ /usr/local/aarch64-linux-android/sysroot/usr/lib/librtclient.so \ - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient-arm64-v8a.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient-arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { @@ -33,7 +33,7 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) { /usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \ /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so \ /usr/local/arm-linux-androideabi/sysroot/usr/lib/librtclient.so \ - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_armeabi-v7a.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { @@ -43,7 +43,7 @@ contains(ANDROID_TARGET_ARCH,x86) { /usr/local/i686-linux-android/sysroot/usr/lib/libssl.so \ /usr/local/i686-linux-android/sysroot/usr/lib/libcurl.so \ /usr/local/i686-linux-android/sysroot/usr/lib/librtclient.so \ - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so } contains(ANDROID_TARGET_ARCH,x86_64) { @@ -53,11 +53,11 @@ contains(ANDROID_TARGET_ARCH,x86_64) { /usr/local/x86_64-linux-android/sysroot/usr/lib64/libssl.so \ /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcurl.so \ /usr/local/x86_64-linux-android/sysroot/usr/lib64/librtclient.so \ - /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86_64.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so } android { - INCLUDEPATH += /opt/android-ndk/sources/cxx-stl/llvm-libc++/include + INCLUDEPATH += /opt/android-ndkr19c/sources/cxx-stl/llvm-libc++/include QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 33d0ade622b37b0124a5ce6847d314c43d842e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 18:09:39 +0800 Subject: Fix typo --- kelakon.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kelakon.pro b/kelakon.pro index d8814a1..911638b 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -57,7 +57,7 @@ contains(ANDROID_TARGET_ARCH,x86_64) { } android { - INCLUDEPATH += /opt/android-ndkr19c/sources/cxx-stl/llvm-libc++/include + INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 5b04ed2203cc52f1ed9937a7dc9eae86e1596f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 18:10:18 +0800 Subject: Update build settings for NDK > r18 --- kelakon.pro | 56 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/kelakon.pro b/kelakon.pro index 911638b..e98f408 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -13,51 +13,63 @@ RESOURCES += \ LIBS += \ -lcurl \ - -lrtclient \ - -lqrtclient + -lrtclient + +!android { + LIBS += -lqrtclient +} contains(ANDROID_TARGET_ARCH,arm64-v8a) { - LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib + LIBS += \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21 \ + -lqrtclient_arm64-v8a ANDROID_EXTRA_LIBS += \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libcrypto.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libssl.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient-arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { - LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib + LIBS += \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21 \ + -lqrtclient_armeabi-v7a ANDROID_EXTRA_LIBS += \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { - LIBS += -L/usr/local/i686-linux-android/sysroot/usr/lib + LIBS += \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21 \ + -lqrtclient_x86 ANDROID_EXTRA_LIBS += \ - /usr/local/i686-linux-android/sysroot/usr/lib/libcrypto.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/libssl.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/libcurl.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so } contains(ANDROID_TARGET_ARCH,x86_64) { - LIBS += -L/usr/local/x86_64-linux-android/sysroot/usr/lib64 + LIBS += \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21 \ + -lqrtclient_x86_64 ANDROID_EXTRA_LIBS += \ - /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcrypto.so \ - /usr/local/x86_64-linux-android/sysroot/usr/lib64/libssl.so \ - /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcurl.so \ - /usr/local/x86_64-linux-android/sysroot/usr/lib64/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so } android { INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include + LIBS += -L/opt/Qt5.14.2/5.14.2/android/lib QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 70d625f68084e563add5b77c97c2534c071f7587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 19:25:57 +0800 Subject: Update instructions for Qt5.14.2 and NDK r19c --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9887ea3..d71ae1e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ or ```sh $ mkdir build-Android_arm64_v8a-Debug $ cd build-Android_arm64_v8a-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_arm64_v8a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=arm64-v8a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_arm64_v8a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=arm64-v8a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. ``` or @@ -29,7 +29,7 @@ or ```sh $ mkdir build-Android_armeabi_v7a-Debug $ cd build-Android_armeabi_v7a-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_armeabi_v7a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=armeabi-v7a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_armeabi_v7a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=armeabi-v7a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. ``` or @@ -37,7 +37,7 @@ or ```sh $ mkdir build-Android_x86-Debug $ cd build-Android_x86-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. ``` or @@ -45,7 +45,7 @@ or ```sh $ mkdir build-Android_x86_64-Debug $ cd build-Android_x86_64-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.1/5.14.1/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86_64=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86_64 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.1/5.14.1/android .. +$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86_64=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86_64 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. ``` or so on. @@ -54,5 +54,5 @@ or so on. ```sh $ make # -jN (with N an integer number of parallel tasks you allow your computer to run for compiling this) -$ /opt/Qt5.14.1/5.14.1/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build +$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build ``` -- cgit v1.2.3 From fc52f04d19ffb86ba456dab3e801e7848a2d3a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 20:04:23 +0800 Subject: Instructions on this branch is for qmake --- README.md | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index d71ae1e..bb541ad 100644 --- a/README.md +++ b/README.md @@ -6,53 +6,28 @@ ```sh $ git clone git://darapsa.org/kelakon.git -$ cd kelakon ``` ## Configuring for various target hosts (with optional debugging) ```sh -$ mkdir build -$ cmake -DCMAKE_BUILD_TYPE=Debug .. +$ mkdir build-kelakon-Desktop-Debug +$ cd build-kelakon-Desktop-Debug +$ qmake ../kelakon/kelakon.pro -spec linux-g++ CONFIG+='debug qml_debug' ``` or ```sh -$ mkdir build-Android_arm64_v8a-Debug -$ cd build-Android_arm64_v8a-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_arm64_v8a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=arm64-v8a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. +$ mkdir build-kelakon-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_14_2_for_Android-Debug +$ cd build-kelakon-Android_for_armeabi_v7a_arm64_v8a_x86_x86_64_Clang_Qt_5_14_2_for_Android-Debug +$ /opt/Qt5.14.2/5.14.2/android/bin/qmake ../kelakon/kelakon.pro -spec android-clang CONFIG+='debug qml_debug' ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" ``` - -or - -```sh -$ mkdir build-Android_armeabi_v7a-Debug -$ cd build-Android_armeabi_v7a-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_armeabi_v7a=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=armeabi-v7a -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. -``` - -or - -```sh -$ mkdir build-Android_x86-Debug -$ cd build-Android_x86-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. -``` - -or - -```sh -$ mkdir build-Android_x86_64-Debug -$ cd build-Android_x86_64-Debug -$ cmake -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk-r19c/build/cmake/android.toolchain.cmake -DCMAKE_FIND_ROOT_PATH=/opt/Qt5.14.2/5.14.2/android -DANDROID_NATIVE_API_LEVEL=21 -DANDROID_BUILD_ABI_x86_64=1 -DCMAKE_BUILD_TYPE=Debug -DANDROID_ABI=x86_64 -DANDROID_SDK=/opt/android-sdk-update-manager -DCMAKE_PREFIX_PATH=/opt/Qt5.14.2/5.14.2/android .. -``` - or so on. ## Compiling, linking, and producing executable ```sh $ make # -jN (with N an integer number of parallel tasks you allow your computer to run for compiling this) -$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build +$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build --android-platform android-24 ``` -- cgit v1.2.3 From c40ea266dac518db082b69927950b0fe6acdd27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 20:13:13 +0800 Subject: android-clang spec links to libc++ explicitly --- kelakon.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kelakon.pro b/kelakon.pro index e98f408..8b82a16 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -69,7 +69,9 @@ contains(ANDROID_TARGET_ARCH,x86_64) { android { INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include - LIBS += -L/opt/Qt5.14.2/5.14.2/android/lib + LIBS += \ + -L/opt/Qt5.14.2/5.14.2/android/lib \ + -lc++ QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -- cgit v1.2.3 From 786624cacf3c5f60976af4954f1ad83d34872011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 20:17:08 +0800 Subject: Fix typos --- kelakon.pro | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/kelakon.pro b/kelakon.pro index 8b82a16..0272335 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -21,49 +21,49 @@ LIBS += \ contains(ANDROID_TARGET_ARCH,arm64-v8a) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21 \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 \ -lqrtclient_arm64-v8a ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/aarch64-linux-android/21/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient-arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21 \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21 \ -lqrtclient_armeabi-v7a ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/arm-linux-androideabi/21/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21 \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21 \ -lqrtclient_x86 ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/i686-linux-android/21/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86.so } contains(ANDROID_TARGET_ARCH,x86_64) { LIBS += \ - -L/opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21 \ + -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21 \ -lqrtclient_x86_64 ANDROID_EXTRA_LIBS += \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libcrypto_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libssl_1_1.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/libcurl.so \ - /opt/android-ndk-r19c/toolchains/llvm/prebuild/linux-x86_64/21/x86_64-linux-android/21/librtclient.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcrypto_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libssl_1_1.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/libcurl.so \ + /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/21/librtclient.so \ /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so } -- cgit v1.2.3 From e5463f53923f8a8bcf64f2b8b3d34c1e01b9f5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 20:18:33 +0800 Subject: Fix another typo --- kelakon.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kelakon.pro b/kelakon.pro index 0272335..c4bedcf 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -28,7 +28,7 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) { /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libssl_1_1.so \ /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/libcurl.so \ /opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21/librtclient.so \ - /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient-arm64-v8a.so + /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { -- cgit v1.2.3 From 3d8f808fe907eb5957571971e222119efe37368a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 20:22:10 +0800 Subject: Adjust deployment settings file name for qmake --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb541ad..fd6817e 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,5 @@ or so on. ```sh $ make # -jN (with N an integer number of parallel tasks you allow your computer to run for compiling this) -$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build --android-platform android-24 +$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-24 ``` -- cgit v1.2.3 From 82a5a432f4903a132a64caae9425b5376b7bce43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 21:02:29 +0800 Subject: Remove Android Manifest It doesn't seem to be needed any more. When creating a new project by current version of Qt Creator for Android platform, it's not included. And it fails build too. --- android/AndroidManifest.xml | 95 --------------------------------------------- kelakon.pro | 2 - 2 files changed, 97 deletions(-) delete mode 100644 android/AndroidManifest.xml diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml deleted file mode 100644 index 361cec0..0000000 --- a/android/AndroidManifest.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kelakon.pro b/kelakon.pro index c4bedcf..b5a7a8d 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -73,8 +73,6 @@ android { -L/opt/Qt5.14.2/5.14.2/android/lib \ -lc++ QT += svg - DISTFILES += android/AndroidManifest.xml - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android certs.path = /assets/certs certs.files = /etc/ssl/certs/ca-certificates.crt INSTALLS += certs -- cgit v1.2.3 From 60f6ce2613a70645b3c71ee968886d764d4d1d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Tue, 2 Jun 2020 21:16:45 +0800 Subject: Reorder lines --- kelakon.pro | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/kelakon.pro b/kelakon.pro index b5a7a8d..beceb6b 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -19,6 +19,17 @@ LIBS += \ LIBS += -lqrtclient } +android { + INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include + LIBS += \ + -L/opt/Qt5.14.2/5.14.2/android/lib \ + -lc++ + QT += svg + certs.path = /assets/certs + certs.files = /etc/ssl/certs/ca-certificates.crt + INSTALLS += certs +} + contains(ANDROID_TARGET_ARCH,arm64-v8a) { LIBS += \ -L/opt/android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/21 \ @@ -67,15 +78,4 @@ contains(ANDROID_TARGET_ARCH,x86_64) { /opt/Qt5.14.2/5.14.2/android/lib/libqrtclient_x86_64.so } -android { - INCLUDEPATH += /opt/android-ndk-r19c/sources/cxx-stl/llvm-libc++/include - LIBS += \ - -L/opt/Qt5.14.2/5.14.2/android/lib \ - -lc++ - QT += svg - certs.path = /assets/certs - certs.files = /etc/ssl/certs/ca-certificates.crt - INSTALLS += certs -} - debug: DEFINES += DEBUG -- cgit v1.2.3 From 068dbeb5a9e4a4e2dc20e9ad5040ca06ec268c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Fri, 5 Jun 2020 14:08:51 +0800 Subject: Update qrtclient --- qrtclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrtclient b/qrtclient index cf6b665..e564b9c 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit cf6b6658aa3f477d57e094fd73898244e2069935 +Subproject commit e564b9cc80a49565f939d4883417f6ac783b8575 -- cgit v1.2.3 From 6c96192b55f43ca92fc42fb9ca43522a1315e414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Fri, 5 Jun 2020 14:11:58 +0800 Subject: Add missing step to APK build instruction --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fd6817e..bb93754 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,6 @@ or so on. ```sh $ make # -jN (with N an integer number of parallel tasks you allow your computer to run for compiling this) +$ make install INSTALL_ROOT=android-build $ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-24 ``` -- cgit v1.2.3 From 9be2b63ed3260d270e535f8def3fd18d01cfc1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 6 Jun 2020 23:54:41 +0800 Subject: Update qrtclient --- qrtclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrtclient b/qrtclient index e564b9c..f59ee7e 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit e564b9cc80a49565f939d4883417f6ac783b8575 +Subproject commit f59ee7e17a7d44ee8920cf45d5e825f579d8650d -- cgit v1.2.3