From 2174068bc08f96eab73e76eda9228bec59994ebf Mon Sep 17 00:00:00 2001
From: Johnny Jazeix <jazeix@gmail.com>
Date: Fri, 14 Jan 2022 18:12:17 +0100
Subject: [PATCH] bump GCompris to 2.1

---
 metadata/net.gcompris.full.yml | 100 ++++++++++++++++++++++++++++++++-
 1 file changed, 98 insertions(+), 2 deletions(-)

diff --git a/metadata/net.gcompris.full.yml b/metadata/net.gcompris.full.yml
index 9702ff523f..747f718d45 100644
--- a/metadata/net.gcompris.full.yml
+++ b/metadata/net.gcompris.full.yml
@@ -362,7 +362,103 @@ Builds:
       - make apk_release
     ndk: r21e
 
+  - versionName: '2.1'
+    versionCode: 20100
+    commit: V2.1
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y -t stretch-backports-sloppy libarchive13
+      - apt-get install -y -t stretch-backports cmake libncurses5
+      - apt-get install -y libgl1-mesa-dev g++ zlib1g-dev
+    output: android-build/android/GCompris-Android-release-armeabi-v7a-dl-$$VERSION$$.apk
+    srclibs:
+      - extra-cmake-modules@v5.63.0
+      - OpenSSL@OpenSSL_1_1_1m
+    prebuild: mkdir qt/ android-build/
+    scandelete:
+      - installer/
+    build:
+      - export ANDROID_NDK=$$NDK$$
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - export ANDROID_SDK_ROOT=$$SDK$$
+      - export QT_VERSION=5.12.9
+      - export PREFIX=$(pwd)/qt/install/
+      - export OPENSSL_LIBS=-L$PREFIX'/lib -lssl -lcrypto'
+      - pushd $$OpenSSL$$
+      - PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH ./Configure shared
+        android-arm -D__ANDROID_API__=21 --prefix=$PREFIX
+      - PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH make depend
+      - PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH make build_libs
+        SHLIB_VERSION_NUMBER= SHLIB_EXT=.so
+      - PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH make install_sw
+        SHLIB_VERSION_NUMBER= SHLIB_EXT=.so
+      - popd
+      - pushd qt/
+      - git clone https://code.qt.io/cgit/qt/qtbase.git --single-branch --branch $QT_VERSION
+      - pushd qtbase
+      - sed -i '/<string.h>/a \#include <limits>\n\#include <algorithm>' src/corelib/global/qendian.h
+      - sed -i '/<QtCore\/qbytearray.h>/a \#include <limits>\n\#include <algorithm>'
+        src/corelib/tools/qbytearraymatcher.h
+      - sed -i '/<stdio.h>/a \#include <limits>\n\#include <algorithm>' src/tools/moc/generator.cpp
+      - ./configure -xplatform android-clang --disable-rpath -openssl-linked -nomake
+        tests -nomake examples -android-ndk $$NDK$$ -android-sdk $$SDK$$ -no-warnings-are-errors
+        -opensource -confirm-license -prefix $PREFIX -I$PREFIX/include
+      - make -j$(nproc)
+      - make install
+      - popd
+      - export CMAKE_QT_LIB=${PREFIX}/lib/cmake/
+      - git clone https://code.qt.io/qt/qtdeclarative.git --single-branch --branch=$QT_VERSION
+      - pushd qtdeclarative
+      - sed -i '/qv4global_p.h>/a \#include <limits>\n\#include <algorithm>\n' src/qml/jsruntime/qv4propertykey_p.h
+      - QMAKESPEC=android-clang $PREFIX/bin/qmake .
+      - make -j$(nproc)
+      - make install
+      - popd
+      - for module in qtquickcontrols qtsvg qtandroidextras qtgraphicaleffects qttools
+        qtmultimedia qtimageformats qtsensors qttranslations; do git clone https://code.qt.io/qt/${module}.git
+        --single-branch --branch=$QT_VERSION
+      - pushd ${module}
+      - QMAKESPEC=android-clang $PREFIX/bin/qmake .
+      - make -j$(nproc)
+      - make install
+      - popd; done
+      - popd
+      - mkdir $$extra-cmake-modules$$/build
+      - pushd $$extra-cmake-modules$$/build
+      - cmake -DCMAKE_INSTALL_PREFIX=. -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF
+        -DBUILD_TESTING=OFF ..
+      - make
+      - make install
+      - popd
+      - sed -i 's=${OPENSSL_DIR}/libcrypto.so.1.1=$$OpenSSL$$/libcrypto.so=g' android/CMakeLists.txt
+      - sed -i 's=${OPENSSL_DIR}/libssl.so.1.1=$$OpenSSL$$/libssl.so=g' android/CMakeLists.txt
+      - pushd android-build
+      - cmake -DANDROID_PLATFORM=android-21 -DANDROID_API_LEVEL=21 -DCMAKE_ANDROID_API=21
+        -DCMAKE_TOOLCHAIN_FILE=$$NDK$$/build/cmake/android.toolchain.cmake -DQt5_DIR=${CMAKE_QT_LIB}/Qt5/
+        -DQt5Core_DIR=${CMAKE_QT_LIB}/Qt5Core/ -DQt5Widgets_DIR=${CMAKE_QT_LIB}/Qt5Widgets
+        -DQt5Qml_DIR=${CMAKE_QT_LIB}/Qt5Qml -DQt5Gui_DIR=${CMAKE_QT_LIB}/Qt5Gui -DQt5Svg_DIR=${CMAKE_QT_LIB}/Qt5Svg
+        -DQt5Sensors_DIR=${CMAKE_QT_LIB}/Qt5Sensors -DQt5AndroidExtras_DIR=${CMAKE_QT_LIB}/Qt5AndroidExtras
+        -DQt5LinguistTools_DIR=${CMAKE_QT_LIB}/Qt5LinguistTools -DQt5Quick_DIR=${CMAKE_QT_LIB}/Qt5Quick
+        -DQt5Multimedia_DIR=${CMAKE_QT_LIB}/Qt5Multimedia -DQt5Network_DIR=${CMAKE_QT_LIB}/Qt5Network
+        -Wno-dev ../
+      - make getSvnTranslations
+      - pushd ../po
+      - rm -rf gcompris_ast.po gcompris_ar.po gcompris_bg.po gcompris_bs.po gcompris_da.po
+        gcompris_ga.po gcompris_gd.po gcompris_gl.po gcompris_hi.po gcompris_ia.po
+        gcompris_ja.po gcompris_ko.po gcompris_lv.po gcompris_nb.po gcompris_sk.po
+        gcompris_ta.po gcompris_th.po gcompris_zh_CN.po
+      - sed -i 's=boy"=boy "=g' gcompris_en.po
+      - sed -i 's=boys"=boys "=g' gcompris_en.po
+      - sed -i 's=girl in the center."=girl in the center. "=g' gcompris_en.po
+      - sed -i 's=girls in the center."=girls in the center. "=g' gcompris_en.po
+      - popd
+      - cmake -DCMAKE_TOOLCHAIN_FILE=/usr/share/ECM/toolchain/Android.cmake ../
+      - make
+      - make apk_release
+    ndk: r21e
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '2.0'
-CurrentVersionCode: 20000
+CurrentVersion: '2.1'
+CurrentVersionCode: 20100