[SCM] KDevelop Platform packaging branch, master, updated. debian/1.7.3-2-3-g1033022

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=fe6b88a

The following commit has been merged in the master branch:
commit fe6b88a96602d60c6da3ea6a4794aff6f7b1ddad
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 6 21:33:58 2016 +0200

    fix build without parallel jobs (#821805)
    
    backport upstream commit dd18e9a13558cbe519c382d3fe358ae97e39cd38
---
 debian/changelog                                   |  5 ++++
 debian/patches/series                              |  1 +
 ...es-plugin-Make-testfiletemplates-depend-o.patch | 35 ++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 09332b5..b456277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kdevplatform (1.7.3-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit dd18e9a13558cbe519c382d3fe358ae97e39cd38 to fix
+    build without parallel jobs; patch
+    upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch.
+    (Closes: #821805)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Jun 2016 21:30:26 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a6a68c8..fd9342a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 11_disable_examples_tests.diff
+upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch
diff --git a/debian/patches/upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch b/debian/patches/upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch
new file mode 100644
index 0000000..c3e0587
--- /dev/null
+++ b/debian/patches/upstream_filetemplates-plugin-Make-testfiletemplates-depend-o.patch
@@ -0,0 +1,35 @@
+From dd18e9a13558cbe519c382d3fe358ae97e39cd38 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Thu, 17 Mar 2016 15:32:21 +0100
+Subject: [PATCH] filetemplates plugin: Make testfiletemplates depend on
+ kdevfiletemplates
+
+There is currently no dependency between both targets, however some of
+the files built by both testfiletemplates and kdevfiletemplates (such as
+classidentifierpage.cpp) depend on ui files that only the latter target
+generates. This means that if one does make testfiletemplates the build
+fails like this:
+
+  /tmp/kdevplatform/plugins/filetemplates/classidentifierpage.cpp:23:25:
+  fatal error: ui_newclass.h: No such file or directory
+
+Differential Revision:	https://phabricator.kde.org/D1160
+---
+ plugins/filetemplates/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
+index f9a16ec..061ee29 100644
+--- a/plugins/filetemplates/CMakeLists.txt
++++ b/plugins/filetemplates/CMakeLists.txt
+@@ -81,6 +81,7 @@ main.cpp
+ )
+ 
+ kde4_add_executable(testfiletemplates ${test_srcs})
++add_dependencies(testfiletemplates kdevfiletemplates)
+ 
+ target_link_libraries(testfiletemplates
+     ${KDE4_KDECORE_LIBS}
+-- 
+2.8.1
+

-- 
KDevelop Platform packaging