File 0001-Ignore-warnings-during-appdata-generation.... of Package kpackage

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Ignore-warnings-during-appdata-generation.patch of Package kpackage

From 6b79f36839ea34df5e6c3dbdbe058c9da030d0c1 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 7 Apr 2017 10:44:35 +0200
Subject: [PATCH] Ignore warnings during appdata generation

The Plasma/PopupApplet service type for example got deprecated and removed,
but is still used by various parts of Plasma 5.8.
This causes kpackagetool to emit warnings, but it still succeeds. However,
this case is handled incorrectly as any stderr output is assumed to be critical
and the file is not installed. As result is 0, no warning message is printed.

This commit fixes this by ignoring the stderr output and using result to indicate
success. Warning messages are printed if applicable.

BUG: 378529
---
 KF5PackageMacros.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
index af26275..8697648 100644
--- a/KF5PackageMacros.cmake
+++ b/KF5PackageMacros.cmake
@@ -51,11 +51,13 @@ function(kpackage_install_package dir component)
         set(APPDATAFILE "${CMAKE_CURRENT_BINARY_DIR}/${component}.appdata.xml")
 
         execute_process(COMMAND ${kpackagetool_cmd} --appstream-metainfo ${CMAKE_CURRENT_SOURCE_DIR}/${dir} OUTPUT_FILE ${APPDATAFILE} ERROR_VARIABLE appstreamerror RESULT_VARIABLE result)
-        if(appstreamerror)
-            if (NOT result EQUAL 0)
-                message(WARNING "couldn't generate metainfo for ${component}: ${appstreamerror}")
-            endif ()
+        if (NOT result EQUAL 0)
+            message(WARNING "couldn't generate metainfo for ${component}: ${appstreamerror}")
         else()
+            if(appstreamerror)
+                message(WARNING "warnings during generation of metainfo for ${component}: ${appstreamerror}")
+            endif()
+
             install(FILES ${APPDATAFILE} DESTINATION ${KDE_INSTALL_METAINFODIR})
         endif()
    else()
-- 
2.12.0

Places

File 0001-Ignore-warnings-during-appdata-generation.patch of Package kpackage

Places