bump GCompris to 3.3

metadata/net.gcompris.full.yml

@@ -1,6 +1,6 @@
 Categories:
-  - Science & Education
   - Games
+  - Science & Education
 License: AGPL-3.0-only
 WebSite: https://www.gcompris.net/
 SourceCode: https://invent.kde.org/education/gcompris.git
@@ -988,7 +988,88 @@ Builds:
       - make apk_release
     ndk: r21e
 
+  - versionName: '3.3'
+    versionCode: 30300
+    commit: V3.3
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y cmake g++ gettext libarchive13 libgl1-mesa-dev libncurses5
+        make python-is-python3 zlib1g-dev
+      - echo "deb http://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/stretch.list
+      - apt-get update
+      - apt-get remove openjdk-11-jdk-headless openjdk-11-jre-headless
+      - apt-get install -y -t sid openjdk-8-jdk-headless
+    output: android-build/android-build/GCompris-Android-release-armeabi-v7a-dl-$$VERSION$$.apk
+    srclibs:
+      - extra-cmake-modules@v5.99.0
+      - OpenSSL@OpenSSL_1_1_1t
+    prebuild: mkdir qt/ android-build/
+    build:
+      - export ANDROID_NDK=$$NDK$$
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - export ANDROID_SDK_ROOT=$$SDK$$
+      - export ANDROID_API_VERSION=android-28
+      - export QT_VERSION=5.12
+      - 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__=16 --prefix=$PREFIX
+      - PATH=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH make SHLIB_VERSION_NUMBER=
+        SHLIB_EXT=_1_1.so build_libs install_sw
+      - popd
+      - pushd qt/
+      - git clone https://code.qt.io/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 qtquickcontrols2 qtsvg qtandroidextras qtgraphicaleffects qttools
+        qtmultimedia qtimageformats qtcharts 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 -DCMAKE_BUILD_TYPE=Release -DCMAKE_ANDROID_API=16 -DCMAKE_TOOLCHAIN_FILE=$$extra-cmake-modules$$/build/share/ECM/toolchain/Android.cmake
+        -DANDROID_ABI=armeabi-v7a -DQt5_DIR=${CMAKE_QT_LIB}/Qt5/ -DCMAKE_FIND_ROOT_PATH=${PREFIX}/lib/
+        -Wno-dev ../
+      - pushd ../poqm
+      - sed -i 's=\\"==g' en/gcompris_qt.po
+      - popd
+      - make
+      - make apk_release
+    ndk: r21e
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '3.2'
-CurrentVersionCode: 30200
+CurrentVersion: '3.3'
+CurrentVersionCode: 30300