diff --git a/testing/lomiri-system-settings/APKBUILD b/testing/lomiri-system-settings/APKBUILD index e877f0b118e..df5c3db5ebc 100644 --- a/testing/lomiri-system-settings/APKBUILD +++ b/testing/lomiri-system-settings/APKBUILD @@ -51,6 +51,7 @@ subpackages="$pkgname-lang" source="https://gitlab.com/ubports/development/core/lomiri-system-settings/-/archive/$pkgver/lomiri-system-settings-$pkgver.tar.gz 0001-Migrate-to-upstream-maliit-keyboard.patch 0002-Use-qmltestrunner-qt5.patch + c++17.patch " options="!check" # fails tst-bluetooth-device # Somehow on armv7 the tests try to use zink from mesa which doesn't work @@ -79,4 +80,5 @@ sha512sums=" fa1a65a183748f296cb71c6597a2578c55bb0476ce0c1a3fdc6677cb4d4e83efc1c108732ca02fa4530ee6996ca3aeeed3f0427010d0c6658802d0406430dc7d lomiri-system-settings-1.3.0.tar.gz be893d76d15040409576e452cf97d25a48a90a9a8c68a0eef2028be3711e220ab2bf944fab12c4f7f1c9f32ab78690b8f0405f25f9bbec594d8a26ccac95f6e3 0001-Migrate-to-upstream-maliit-keyboard.patch 169dda7b2fab1e6e7b791579aa15eb79b08442463a71a786d7b3506c3ae8ad14a9000d3ca8b67b6d4facf81066fe210c62b6e130143f4f04de604ea233307412 0002-Use-qmltestrunner-qt5.patch +9b54383b3c22e8f23cca9f3781d403100cea365b35a124bb7723b3a1725f20dc968bbf2eb5294fc59ab4248e88ead862457a0624510cefd7ec1b193d92faa9c4 c++17.patch " diff --git a/testing/lomiri-system-settings/c++17.patch b/testing/lomiri-system-settings/c++17.patch new file mode 100644 index 00000000000..3230adc4153 --- /dev/null +++ b/testing/lomiri-system-settings/c++17.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e196879..49d139d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ if(cmake_build_type_lower MATCHES coverage) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g" ) + endif() + +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fno-permissive -pedantic -Wall -Wextra") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fno-permissive -pedantic -Wall -Wextra") + find_package(Qt5Concurrent REQUIRED) + find_package(Qt5Core REQUIRED) + find_package(Qt5DBus REQUIRED)