From 2ab65f943e311f3fe623e0fcf272beab59773ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 12 Dec 2014 13:58:54 +0100 Subject: [PATCH] sonnet-native: build parsetrigrams only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...l-parsetrigrams-only-we-need-the-nat.patch | 71 +++++++++++++++++++ ...grams-we-need-the-native-one-for-cro.patch | 32 --------- .../framework-tier1/sonnet/sonnet-native.bb | 2 +- 3 files changed, 72 insertions(+), 33 deletions(-) create mode 100644 recipes-kde/framework-tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch delete mode 100644 recipes-kde/framework-tier1/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch diff --git a/recipes-kde/framework-tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch b/recipes-kde/framework-tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch new file mode 100644 index 00000000..58d8dabc --- /dev/null +++ b/recipes-kde/framework-tier1/sonnet/files/0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch @@ -0,0 +1,71 @@ +From 3a6f33573dc8a15d7b283f546352ae9423257a55 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 1 Dec 2014 17:15:46 +0100 +Subject: [PATCH] build and install parsetrigrams only - we need the native one + for cross compilation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [cross-specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 10 +++------- + data/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7d1d70..1c7a32e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ include(KDEFrameworkCompilerSettings) + include(KDECMakeSettings) + + set(REQUIRED_QT_VERSION 5.2.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) + + include(FeatureSummary) + include(GenerateExportHeader) +@@ -33,12 +33,9 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + ecm_install_po_files_as_qm(po) + endif() + +-add_subdirectory(src) +-add_subdirectory(autotests) + add_subdirectory(data) +-add_subdirectory(examples) +- + ++if(False) + # create a Config.cmake and a ConfigVersion.cmake file and install them + set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Sonnet") + +@@ -52,9 +49,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5SonnetConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KF5SonnetConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) + +-install(EXPORT KF5SonnetTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5SonnetTargets.cmake NAMESPACE KF5:: ) +- + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sonnet_version.h + DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) + + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index edf4b9a..bd82228 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -3,7 +3,7 @@ project(sonnetdata) + add_executable(parsetrigrams parsetrigrams.cpp) + + TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core) +-#INSTALL(TARGETS parsetrigrams DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) ++INSTALL(TARGETS parsetrigrams DESTINATION ${BIN_INSTALL_DIR}) + + macro(create_trigrams_map _target_name _in_DIR _out_FILE) + get_target_property(PARSETRIGRAMS_EXECUTABLE parsetrigrams LOCATION) +-- +1.8.3.1 + diff --git a/recipes-kde/framework-tier1/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch b/recipes-kde/framework-tier1/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch deleted file mode 100644 index b81b24c7..00000000 --- a/recipes-kde/framework-tier1/sonnet/files/0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8c6887cd57e862b919f7aa359a6721435c55ceae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 1 Dec 2014 17:15:46 +0100 -Subject: [PATCH] install parsetrigrams - we need the native one for cross - compilation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - data/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index edf4b9a..4d41737 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -3,7 +3,7 @@ project(sonnetdata) - add_executable(parsetrigrams parsetrigrams.cpp) - - TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core) --#INSTALL(TARGETS parsetrigrams DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -+install(TARGETS parsetrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) - - macro(create_trigrams_map _target_name _in_DIR _out_FILE) - get_target_property(PARSETRIGRAMS_EXECUTABLE parsetrigrams LOCATION) --- -1.8.3.1 - diff --git a/recipes-kde/framework-tier1/sonnet/sonnet-native.bb b/recipes-kde/framework-tier1/sonnet/sonnet-native.bb index 04c80276..7a59da92 100644 --- a/recipes-kde/framework-tier1/sonnet/sonnet-native.bb +++ b/recipes-kde/framework-tier1/sonnet/sonnet-native.bb @@ -3,5 +3,5 @@ require ${BPN}.inc inherit native SRC_URI += " \ - file://0001-install-parsetrigrams-we-need-the-native-one-for-cro.patch \ + file://0001-build-and-install-parsetrigrams-only-we-need-the-nat.patch \ "