[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-release-team
Subject: [kpackage/v5.29.1] /: Fix cmake failure when two packages with different type have same id
From: l10n daemon script <null () kde ! org>
Date: 2016-12-14 13:39:43
Message-ID: E1cH9mZ-00044i-Hq () code ! kde ! org
[Download RAW message or body]
Git commit 58aec5c1f7005caa307408a36ab6e82456e6aa75 by l10n daemon script, =
on behalf of Bhushan Shah.
Committed on 14/12/2016 at 13:39.
Pushed by dfaure into tag 'v5.29.1'.
Fix cmake failure when two packages with different type have same id
Earlier we used to create temporary json in $component-metadata.json,
but this failed if we have two packages with same id, for instance in
phone there is org.kde.plasma.phone shell package and look-and-feel
package.
CCMAIL: release-team@kde.org
CCMAIL: distributions@kde.org
CCMAIL: faure@kde.org
Reviewed-by: notmart@gmail.com
David, can you please do 5.29 re-tar with this?
(cherry picked from commit 26e59d58438cc777873a6afc7817418ec735aaa3)
M +2 -2 KF5PackageMacros.cmake
https://commits.kde.org/kpackage/58aec5c1f7005caa307408a36ab6e82456e6aa75
diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
index a14ab0b..4a4d081 100644
--- a/KF5PackageMacros.cmake
+++ b/KF5PackageMacros.cmake
@@ -36,8 +36,8 @@ function(kpackage_install_package dir component)
PATTERN Messages.sh EXCLUDE
PATTERN dummydata EXCLUDE)
=
- if(NOT EXISTS ${component}-metadata.json)
- set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-m=
etadata.json")
+ if(NOT EXISTS ${component}-${root}-metadata.json)
+ set(GENERATED_METADATA "${CMAKE_CURRENT_BINARY_DIR}/${component}-$=
{root}-metadata.json")
add_custom_command(OUTPUT ${GENERATED_METADATA}
COMMAND KF5::desktoptojson -i ${CMAKE_CURRENT_S=
OURCE_DIR}/${dir}/metadata.desktop -o ${GENERATED_METADATA})
add_custom_target(${component}-metadata-json ALL DEPENDS ${GENERAT=
ED_METADATA})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic