From 3041f2de2b4d61bbd6e5970131b60108a271abc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Jan 2015 15:42:58 +0100 Subject: [PATCH] ktexteditor: update to 5.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...-only-native-katehighlightingindexer.patch | 59 --------- ...-install-katehighlightingindexer-onl.patch | 115 ++++++++++++++++++ .../ktexteditor/ktexteditor-native.bb | 2 +- .../ktexteditor/ktexteditor.inc | 5 +- 4 files changed, 119 insertions(+), 62 deletions(-) delete mode 100644 recipes-kde/framework-tier3/ktexteditor/files/0001-build-only-native-katehighlightingindexer.patch create mode 100644 recipes-kde/framework-tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch diff --git a/recipes-kde/framework-tier3/ktexteditor/files/0001-build-only-native-katehighlightingindexer.patch b/recipes-kde/framework-tier3/ktexteditor/files/0001-build-only-native-katehighlightingindexer.patch deleted file mode 100644 index 67a47656..00000000 --- a/recipes-kde/framework-tier3/ktexteditor/files/0001-build-only-native-katehighlightingindexer.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e2067d92e3f962a6efa51e7a5902b64f4d58f949 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 10 Dec 2014 08:11:46 +0100 -Subject: [PATCH] build only native katehighlightingindexer -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [cross] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9746c7a..798b0a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,13 +34,6 @@ set(REQUIRED_QT_VERSION "5.2.0") - # Required Qt5 components to build this framework - find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Script PrintSupport Xml XmlPatterns) - --find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5Parts ${KF5_DEP_VERSION} REQUIRED) --find_package(KF5Sonnet ${KF5_DEP_VERSION} REQUIRED) - - # vi mode on per default - option (BUILD_VIMODE "Build vimode in" ON) -@@ -50,7 +43,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"ktexteditor5\") - if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ki18n_install(po) - endif() --add_subdirectory(src) -+add_subdirectory(src/syntax/data) - if (BUILD_TESTING) - add_subdirectory(autotests) - endif() -@@ -71,13 +64,6 @@ install(FILES - COMPONENT Devel - ) - --install(EXPORT -- KF5TextEditorTargets -- DESTINATION "${CMAKECONFIG_INSTALL_DIR}" -- FILE KF5TextEditorTargets.cmake -- NAMESPACE KF5:: --) -- - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/ktexteditor_version.h" - DESTINATION "${KF5_INCLUDE_INSTALL_DIR}" --- -1.8.3.1 - diff --git a/recipes-kde/framework-tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch b/recipes-kde/framework-tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch new file mode 100644 index 00000000..31e90372 --- /dev/null +++ b/recipes-kde/framework-tier3/ktexteditor/files/0001-native-build-and-install-katehighlightingindexer-onl.patch @@ -0,0 +1,115 @@ +From aa93d50c49cefa8780dce38cc7f7cc7d406b89ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 29 Jan 2015 23:32:04 +0100 +Subject: [PATCH] native: build and install katehighlightingindexer only +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded-specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 6 +++++- + src/CMakeLists.txt | 4 ++++ + src/syntax/data/CMakeLists.txt | 8 +++++++- + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7dda78b..5c7b82c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,8 +32,9 @@ ecm_setup_version( + set(REQUIRED_QT_VERSION "5.2.0") + + # Required Qt5 components to build this framework +-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Script PrintSupport Xml XmlPatterns) ++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Xml XmlPatterns) + ++if(False) + find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) +@@ -50,7 +51,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"ktexteditor5\") + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + ki18n_install(po) + endif() ++endif() + add_subdirectory(src) ++if(False) + if (BUILD_TESTING) + add_subdirectory(autotests) + endif() +@@ -90,5 +93,6 @@ configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + + # let our config.h be found first in any case + include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR}) ++endif() + + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 18c49c5..d9ce2db 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if(False) + # libgit2 integration + find_package(LibGit2 "0.22.0") + if(LIBGIT2_FOUND) +@@ -314,12 +315,15 @@ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + + # handle data files, .desktop & .cmake + add_subdirectory(data) ++endif() + + # syntax highlighting data files + add_subdirectory( syntax/data ) + ++if(False) + # jscripts for the part + add_subdirectory( script/data ) + + # add part + add_subdirectory(part) ++endif() +diff --git a/src/syntax/data/CMakeLists.txt b/src/syntax/data/CMakeLists.txt +index 481fbf2..950234b 100644 +--- a/src/syntax/data/CMakeLists.txt ++++ b/src/syntax/data/CMakeLists.txt +@@ -1,5 +1,6 @@ + ########### install files ############### + ++if(False) + find_package(Perl REQUIRED) + + add_custom_target(GeneratePhpXmlFiles ALL DEPENDS +@@ -16,9 +17,10 @@ endmacro(GENERATE_PHP_XML) + generate_php_xml(javascript-php.xml javascript.xml) + generate_php_xml(css-php.xml css.xml) + generate_php_xml(html-php.xml html.xml) ++endif() + + # allow to disable the compilation + install for update xml generation +-if (NOT ONLY_GENERATE_XML) ++if (False) + + # all hls + file(GLOB HIGHLIGHTERS "${CMAKE_CURRENT_SOURCE_DIR}/*.xml") +@@ -40,11 +42,15 @@ file(REMOVE ${INDEXFILE_IN}) + foreach(highlighter ${ALL_HIGHLIGHTERS}) + file(APPEND ${INDEXFILE_IN} "${highlighter}\n") + endforeach() ++endif() + + # tool to create json index of highlightings, will validate all highlightings, too! + add_executable(katehighlightingindexer katehighlightingindexer.cpp) + target_link_libraries(katehighlightingindexer Qt5::XmlPatterns + ) ++install(TARGETS katehighlightingindexer EXPORT KF5TextEditorTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++ ++if(False) + add_custom_command(OUTPUT ${INDEXFILE_OUT} + COMMAND katehighlightingindexer ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${INDEXFILE_IN} + DEPENDS katehighlightingindexer.cpp ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} ${INDEXFILE_IN}) +-- +1.8.3.1 diff --git a/recipes-kde/framework-tier3/ktexteditor/ktexteditor-native.bb b/recipes-kde/framework-tier3/ktexteditor/ktexteditor-native.bb index 2f9ae975..f0231740 100644 --- a/recipes-kde/framework-tier3/ktexteditor/ktexteditor-native.bb +++ b/recipes-kde/framework-tier3/ktexteditor/ktexteditor-native.bb @@ -4,7 +4,7 @@ inherit native DEPENDS += "qtxmlpatterns-native" -SRC_URI += "file://0001-build-only-native-katehighlightingindexer.patch" +SRC_URI += "file://0001-native-build-and-install-katehighlightingindexer-onl.patch" do_install_append() { install -d ${D}/${bindir} diff --git a/recipes-kde/framework-tier3/ktexteditor/ktexteditor.inc b/recipes-kde/framework-tier3/ktexteditor/ktexteditor.inc index 6284c089..c9063b1f 100644 --- a/recipes-kde/framework-tier3/ktexteditor/ktexteditor.inc +++ b/recipes-kde/framework-tier3/ktexteditor/ktexteditor.inc @@ -4,11 +4,12 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde perlnative DEPENDS += "karchive kconfig kguiaddons ki18n kio kparts sonnet" -SRCREV = "8b467c021a978215a28bd44e5dbfc023f0007dfc" -PV = "5.5.0" +SRCREV = "0d0924fb7900505bc9f9fab7767e35bb2b417f30" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"