diff options
| author | Albert Astals Cid <aacid@kde.org> | 2024-04-22 15:56:54 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2024-04-22 17:05:35 +0200 |
| commit | ad67d43e7786eaf364c20f76c68810ad254a994d (patch) | |
| tree | e3f9a7cf2501390d1df747b34706db6835a747c2 | |
| parent | b81b2851feb114c2896ee0a441fe492500f0b3ca (diff) | |
Increase android-qt images
Allows us increasing the min freetype
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06ac8e50..13e64ad3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,17 +105,17 @@ build_clazy_fedora40: - CC=clang-18 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja .. - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja -j ${FDO_CI_CONCURRENT} -build_qt5_android: +build_qt5_android_qt515: stage: build - image: kdeorg/android-sdk + image: invent-registry.kde.org/sysadmin/ci-images/android-qt515 before_script: - echo "workaround for ECM Android toolchain wanting all binaries to be shared libraries" - sed -i -e 's/<LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>/<LINK_FLAGS>/g' /opt/nativetooling/share/ECM/toolchain/Android.cmake script: - mkdir -p build && cd build - - 'ANDROID_ARCH_ABI=arm64-v8a cmake -G Ninja .. + - 'ANDROID_ARCH_ABI=armeabi-v7a cmake -G Ninja .. -DCMAKE_ANDROID_API=28 - -DCMAKE_PREFIX_PATH="/opt/Qt/;/opt/kdeandroid-arm64/" + -DCMAKE_PREFIX_PATH="/home/user/android-arm-clang" -DCMAKE_BUILD_TYPE=debug -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DENABLE_DCTDECODER=unmaintained @@ -131,17 +131,17 @@ build_qt5_android: -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake' - ninja -j ${FDO_CI_CONCURRENT} -build_qt5_android_generic: +build_qt5_android_qt515_generic: stage: build - image: kdeorg/android-sdk + image: invent-registry.kde.org/sysadmin/ci-images/android-qt515 before_script: - echo "workaround for ECM Android toolchain wanting all binaries to be shared libraries" - sed -i -e 's/<LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>/<LINK_FLAGS>/g' /opt/nativetooling/share/ECM/toolchain/Android.cmake script: - mkdir -p build && cd build - - 'ANDROID_ARCH_ABI=arm64-v8a cmake -G Ninja .. + - 'ANDROID_ARCH_ABI=armeabi-v7a cmake -G Ninja .. -DCMAKE_ANDROID_API=28 - -DCMAKE_PREFIX_PATH="/opt/Qt/;/opt/kdeandroid-arm64/" + -DCMAKE_PREFIX_PATH="/home/user/android-arm-clang" -DCMAKE_BUILD_TYPE=debug -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DENABLE_DCTDECODER=unmaintained diff --git a/CMakeLists.txt b/CMakeLists.txt index b27333a6..bdfc8602 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,7 +145,7 @@ set(CAIRO_VERSION "1.16.0") set(GLIB_REQUIRED "2.72") set(GTK_REQUIRED "3.24") set(GDK_PIXBUF_REQUIRED "2.40") -set(FREETYPE_VERSION "2.10") +set(FREETYPE_VERSION "2.11") set(FONTCONFIG_VERSION "2.13") find_package(Freetype ${FREETYPE_VERSION} REQUIRED) |