zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syntax-highlighting-native: workaround race by not building data we don't need

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-10-06 21:58:37 +02:00
parent 5d41d5c96c
commit 34ae0190dd
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-do-not-build-data-and-install-katehighlightin.patch Normal file
View File

@@ -0,0 +1,41 @@
From 967a2dc9a0df33091991b1e9405fdeb4d2c078d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 6 Oct 2017 21:52:04 +0200
Subject: [PATCH] native: do not build data and install katehighlightingindexer
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 <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 1 -
src/indexer/CMakeLists.txt | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d503995..17637d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,6 @@ endif()
# Actually build the stuff
#
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_subdirectory(data)
add_subdirectory(src)
if(TARGET Qt5::Gui)
add_subdirectory(examples)
diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt
index acb1647..a083c5d 100644
--- a/src/indexer/CMakeLists.txt
+++ b/src/indexer/CMakeLists.txt
@@ -11,3 +11,5 @@ else()
target_link_libraries(katehighlightingindexer Qt5::Core)
endif()
endif()
+
+install(TARGETS katehighlightingindexer DESTINATION "${CMAKE_INSTALL_BINDIR}")
--
2.9.5

28
recipes-kde/kf5/tier1/syntax-highlighting/files/0001-native-install-katehighlightingindexer-onl.patch
View File

@@ -1,28 +0,0 @@
From a92cfa17c92b589aea69221aa28658b7c948be68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 13 Dec 2016 23:24:59 +0100
Subject: [PATCH] native: install katehighlightingindexer
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 <schnitzeltony@googlemail.com>
---
src/indexer/CMakeLists.txt | 2 ++
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt
index a2c7ef7..7eed2a1 100644
--- a/src/indexer/CMakeLists.txt
+++ b/src/indexer/CMakeLists.txt
@@ -5,3 +5,5 @@ if(Qt5XmlPatterns_FOUND)
else()
target_link_libraries(katehighlightingindexer Qt5::Core)
endif()
+
+install(TARGETS katehighlightingindexer DESTINATION "${CMAKE_INSTALL_BINDIR}")
--
2.5.5

2
recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting-native.bb
View File

@@ -3,7 +3,7 @@ require ${BPN}.inc
inherit native
SRC_URI += " \
file://0001-native-install-katehighlightingindexer-onl.patch \
file://0001-native-do-not-build-data-and-install-katehighlightin.patch \
"
EXTRA_OECMAKE += "-DKSYNTAXHIGHLIGHTING_USE_GUI=OFF"