From d2965e8131fa04950b1e8296062896e340cd143f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 29 Oct 2018 22:43:56 +0100 Subject: [PATCH] kexi: fix build with gcc8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...by-try_compile-in-breeze-icon-check.patch} | 36 +++++++++---------- recipes-kde/apps/calligra/kexi_3.1.0.bb | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) rename recipes-kde/apps/calligra/kexi/{0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch => 0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch} (54%) diff --git a/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch b/recipes-kde/apps/calligra/kexi/0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch similarity index 54% rename from recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch rename to recipes-kde/apps/calligra/kexi/0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch index ce76d499..42322647 100644 --- a/recipes-kde/apps/calligra/kexi/0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch +++ b/recipes-kde/apps/calligra/kexi/0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch @@ -1,7 +1,7 @@ -From 11f1c4adc5141a66552f6862d943c7af3c8972b3 Mon Sep 17 00:00:00 2001 +From 8ed7b093ea4d7ed8e435cb7704e5a30418356796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 18 Jun 2018 23:31:15 +0200 -Subject: [PATCH] replace try_run by try_compile in breeze-icon-check +Date: Mon, 29 Oct 2018 22:40:32 +0100 +Subject: [PATCH] remove try_run by try_compile in breeze-icon-check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,31 +12,29 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller --- - cmake/modules/CheckGlobalBreezeIcons.cmake | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) + cmake/modules/CheckGlobalBreezeIcons.cmake | 18 ------------------ + 1 file changed, 18 deletions(-) diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake -index 9763213..46a218a 100644 +index 9763213..dfff662 100644 --- a/cmake/modules/CheckGlobalBreezeIcons.cmake +++ b/cmake/modules/CheckGlobalBreezeIcons.cmake -@@ -24,21 +24,14 @@ else() +@@ -24,21 +24,3 @@ else() set(CheckGlobalBreezeIcons_libs Qt5::Xml) endif() -try_run(RUN_RESULT COMPILE_OK -+try_compile(COMPILE_OK - ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp - ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp - COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs} - LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs} - CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp +- ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp +- COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs} +- LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs} +- CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags} - COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT - RUN_OUTPUT_VARIABLE RUN_OUTPUT) -+ OUTPUT_VARIABLE COMPILE_OUTPUT) - - if(NOT COMPILE_OK) - message(FATAL_ERROR "${COMPILE_OUTPUT}") - endif() +- +-if(NOT COMPILE_OK) +- message(FATAL_ERROR "${COMPILE_OUTPUT}") +-endif() - -if(NOT ${RUN_RESULT} EQUAL 0) - message(FATAL_ERROR "No valid breeze-icons.rcc resource file found. \ @@ -44,5 +42,5 @@ index 9763213..46a218a 100644 -Result: ${RUN_OUTPUT}") -endif() -- -2.14.3 +2.14.4 diff --git a/recipes-kde/apps/calligra/kexi_3.1.0.bb b/recipes-kde/apps/calligra/kexi_3.1.0.bb index 9886f186..efa2abd4 100644 --- a/recipes-kde/apps/calligra/kexi_3.1.0.bb +++ b/recipes-kde/apps/calligra/kexi_3.1.0.bb @@ -38,7 +38,7 @@ DEPENDS += " \ SRC_URI = " \ ${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \ - file://0001-replace-try_run-by-try_compile-in-breeze-icon-check.patch \ + file://0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch \ file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \ " SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8"