From 24178e11b08b929e7a7fec4c413e3eef69e0b309 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Mon, 1 Jan 2018 14:53:17 +0100 Subject: [PATCH] Unexport kjscmd, to make this actually usable as a dependency --- recipes-kf5/obsolete/kjsembed.inc | 1 + .../kjsembed/0002-unexport-kjscmd.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 recipes-kf5/obsolete/kjsembed/0002-unexport-kjscmd.patch diff --git a/recipes-kf5/obsolete/kjsembed.inc b/recipes-kf5/obsolete/kjsembed.inc index 6919912..20a1651 100644 --- a/recipes-kf5/obsolete/kjsembed.inc +++ b/recipes-kf5/obsolete/kjsembed.inc @@ -10,6 +10,7 @@ DEPENDS = "qttools qtsvg kjs ki18n" SRC_URI = " \ git://anongit.kde.org/${PN};nobranch=1 \ file://0001-optional-kdoctools.patch \ + file://0002-unexport-kjscmd.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-kf5/obsolete/kjsembed/0002-unexport-kjscmd.patch b/recipes-kf5/obsolete/kjsembed/0002-unexport-kjscmd.patch new file mode 100644 index 0000000..dea36c3 --- /dev/null +++ b/recipes-kf5/obsolete/kjsembed/0002-unexport-kjscmd.patch @@ -0,0 +1,27 @@ +commit ed04f56a66c2a8a7aadfda12b9534850bd6e57c1 +Author: Volker Krause +Date: Mon Jan 1 14:51:00 2018 +0100 + + Unexport kjscmd + + Summary: + This is a user tool, not a build-time tool. Having it exported makes it + required to be available (and runnable) for the corresponding find_package + call to work, which is by default not the case when cross-compiling. + + Reviewers: #frameworks + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D9589 + +diff --git a/src/kjscmd/CMakeLists.txt b/src/kjscmd/CMakeLists.txt +index 95f7c31..5718d29 100644 +--- a/src/kjscmd/CMakeLists.txt ++++ b/src/kjscmd/CMakeLists.txt +@@ -10,4 +10,4 @@ target_link_libraries(kjscmd5 + KF5::JsEmbed + ) + +-install(TARGETS kjscmd5 EXPORT KF5JsEmbedTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS kjscmd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})