[SCM] ktexteditor packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-9-g25bc15d

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/ktexteditor.git;a=commitdiff;h=25bc15d

The following commit has been merged in the kubuntu_unstable branch:
commit 25bc15dc731e27b8591a5ec1477a681ab15d1e6a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Jun 12 08:08:06 2015 +0200

    Add kubuntu_workaround-katehighlightingindexer-arm.diff
---
 debian/changelog                                   |  6 +++++
 ...ntu_workaround-katehighlightingindexer-arm.diff | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b3cd7f6..617a6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ktexteditor (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add kubuntu_workaround-katehighlightingindexer-arm.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 12 Jun 2015 08:07:46 +0200
+
 ktexteditor (5.10.0-0ubuntu1) wily; urgency=medium
 
   [ Maximiliano Curia ]
diff --git a/debian/patches/kubuntu_workaround-katehighlightingindexer-arm.diff b/debian/patches/kubuntu_workaround-katehighlightingindexer-arm.diff
new file mode 100644
index 0000000..451266a
--- /dev/null
+++ b/debian/patches/kubuntu_workaround-katehighlightingindexer-arm.diff
@@ -0,0 +1,31 @@
+Description: Work around breaking qt apps on armhf qemu
+ build fails on launchpad because armhf qemu breaks with threads and qt uses thread
+Author: Jonathan and Harald
+Origin: me
+Last-Update: 2015-06-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ktexteditor-5.10.0+git20150604.2354+15.04/src/syntax/data/CMakeLists.txt
+===================================================================
+--- ktexteditor-5.10.0+git20150604.2354+15.04.orig/src/syntax/data/CMakeLists.txt
++++ ktexteditor-5.10.0+git20150604.2354+15.04/src/syntax/data/CMakeLists.txt
+@@ -45,11 +45,14 @@ endforeach()
+ add_executable(katehighlightingindexer katehighlightingindexer.cpp)
+ target_link_libraries(katehighlightingindexer Qt5::XmlPatterns
+ )
+-add_custom_command(OUTPUT ${INDEXFILE_OUT}
+-  COMMAND katehighlightingindexer ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${INDEXFILE_IN}
+-  DEPENDS katehighlightingindexer.cpp ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} ${INDEXFILE_IN})
+-add_custom_target(GenerateIndexFile ALL DEPENDS ${INDEXFILE_OUT})
+ 
+-install(FILES ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} DESTINATION ${KDE_INSTALL_DATADIR}/katepart5/syntax)
++if(NOT "$ENV{DEB_BUILD_ARCH}" STREQUAL "armhf")
++  add_custom_command(OUTPUT ${INDEXFILE_OUT}
++    COMMAND katehighlightingindexer ${INDEXFILE_OUT} ${LANGUAGE_XSD} ${INDEXFILE_IN}
++    DEPENDS katehighlightingindexer.cpp ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} ${INDEXFILE_IN})
++  add_custom_target(GenerateIndexFile ALL DEPENDS ${INDEXFILE_OUT})
++endif()
++
++install(FILES ${LANGUAGE_XSD} ${ALL_HIGHLIGHTERS} DESTINATION ${KDE_INSTALL_DATADIR}/katepart5/syntax)
+ 
+ endif()
diff --git a/debian/patches/series b/debian/patches/series
index 360e81d..9ecbd4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 katesyntaxtest_check_basename
+kubuntu_workaround-katehighlightingindexer-arm.diff

-- 
ktexteditor packaging