Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2017-04-30 21:19:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Sun Apr 30 21:19:58 2017 rev:30 rq:492080 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2017-03-28 15:11:38.431495911 +0200 +++ /work/SRC/openSUSE:Factory/.kpackage.new/kpackage.changes 2017-04-30 21:20:00.253639640 +0200 @@ -1,0 +2,18 @@ +Sat Apr 15 10:11:53 CEST 2017 - lbeltr...@kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * build autotests as regular executables + * Upgrade KF5 version to 5.33.0. + +------------------------------------------------------------------- +Fri Apr 7 08:49:19 UTC 2017 - fab...@ritter-vogt.de + +- Add patch to allow appdata installation even with warnings: + * 0001-Ignore-warnings-during-appdata-generation.patch + +------------------------------------------------------------------- Old: ---- kpackage-5.32.0.tar.xz New: ---- 0001-Ignore-warnings-during-appdata-generation.patch kpackage-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.vYNdIo/_old 2017-04-30 21:20:01.037529113 +0200 +++ /var/tmp/diff_new_pack.vYNdIo/_new 2017-04-30 21:20:01.041528549 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kpackage -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 @@ -42,6 +42,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch101: 0001-Ignore-warnings-during-appdata-generation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +63,7 @@ %lang_package %prep %setup -q +%patch101 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ 0001-Ignore-warnings-during-appdata-generation.patch ++++++ >From 6b79f36839ea34df5e6c3dbdbe058c9da030d0c1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@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 ++++++ kpackage-5.32.0.tar.xz -> kpackage-5.33.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.32.0/CMakeLists.txt new/kpackage-5.33.0/CMakeLists.txt --- old/kpackage-5.32.0/CMakeLists.txt 2017-03-04 17:18:07.000000000 +0100 +++ new/kpackage-5.33.0/CMakeLists.txt 2017-04-01 21:39:01.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.32.0") # handled by release scripts -set(KF5_DEP_VERSION "5.32.0") # handled by release scripts +set(KF5_VERSION "5.33.0") # handled by release scripts +set(KF5_DEP_VERSION "5.33.0") # handled by release scripts project(KPackage VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.32.0 NO_MODULE) +find_package(ECM 5.33.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.32.0/autotests/CMakeLists.txt new/kpackage-5.33.0/autotests/CMakeLists.txt --- old/kpackage-5.32.0/autotests/CMakeLists.txt 2017-03-04 17:18:07.000000000 +0100 +++ new/kpackage-5.33.0/autotests/CMakeLists.txt 2017-04-01 21:39:01.000000000 +0200 @@ -14,6 +14,7 @@ KF5::I18n) add_test(plasma-${_testname} ${_testname}) ecm_mark_as_test(${_testname}) + ecm_mark_nongui_executable(${_testname}) ENDFOREACH(_testname) ENDMACRO(PLASMA_UNIT_TESTS)
