diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc --- a/recipes-kf5/tier1/sonnet.inc +++ b/recipes-kf5/tier1/sonnet.inc @@ -9,6 +9,7 @@ SRC_URI = "git://anongit.kde.org/sonnet;nobranch=1 \ file://0001-no-widgets.patch \ + file://0002-unexport-helpers.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier1/sonnet/0002-unexport-helpers.patch b/recipes-kf5/tier1/sonnet/0002-unexport-helpers.patch new file mode 100644 --- /dev/null +++ b/recipes-kf5/tier1/sonnet/0002-unexport-helpers.patch @@ -0,0 +1,33 @@ +commit 4104b2ea0db4d65d0cb2fcac6db9e343df5f2d9b +Author: Volker Krause +Date: Sun Jul 30 21:37:48 2017 +0200 + + Don't export internal helper executables + + Summary: + Exporting the executables will make the cmake config file check for their + presence when used, which isn't really necessary, and is actually a problem + for cross-compilation, where the helper executables don't exist for the + target but for the host. + + Reviewers: #frameworks, cordlandwehr + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D7008 + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 100b05f..d86cde1 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -11,8 +11,8 @@ ecm_mark_nongui_executable(gentrigrams) + + TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core) + TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore) +-INSTALL(TARGETS parsetrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +-INSTALL(TARGETS gentrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++INSTALL(TARGETS parsetrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++INSTALL(TARGETS gentrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) + + cmake_policy(SET CMP0026 OLD) # FIXME: make this work with CMP0026 set to NEW + if(CMAKE_CROSSCOMPILING AND PARSETRIGRAMS_EXECUTABLE) diff --git a/recipes-kf5/tier3/ktextwidgets.inc b/recipes-kf5/tier3/ktextwidgets.inc new file mode 100644 --- /dev/null +++ b/recipes-kf5/tier3/ktextwidgets.inc @@ -0,0 +1,23 @@ +DESCRIPTION = "KTextWidgets" +HOMEPAGE = "https://api.kde.org/frameworks/ktextwidgets/html/index.html" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" +PR = "r0" + +DEPENDS = "qtbase kcompletion kconfig kconfig-native kconfigwidgets ki18n kiconthemes kservice kwidgetsaddons kwindowsystem sonnet kcoreaddons-native" + +SRC_URI = "git://anongit.kde.org/ktextwidgets;nobranch=1" +S = "${WORKDIR}/git" + +inherit cmake_kf5 +inherit gettext +inherit python3native + +FILES_${PN} += " \ + ${datadir}/kservicetypes5/*.desktop \ +" + +FILES_${PN}-dev += " \ + ${libdir}/cmake/KF5TextWidgets/*.cmake \ + ${prefix}/mkspecs/modules/qt_KTextWidgets.pri \ +" diff --git a/recipes-kf5/tier3/ktextwidgets_5.36.0.bb b/recipes-kf5/tier3/ktextwidgets_5.36.0.bb new file mode 100644 --- /dev/null +++ b/recipes-kf5/tier3/ktextwidgets_5.36.0.bb @@ -0,0 +1,2 @@ +require ${PN}.inc +SRCREV = "v${PV}"