[SCM] KDevelop packaging branch, master, updated. debian/4%5.2.0-2-5-g482a5dc

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 48eb4db2fccd7bdad274a814a90344452bfafdaf
Author: Pino Toscano <pino at debian.org>
Date:   Tue Nov 21 22:53:28 2017 +0100

    allow to build kdevelop w/o clang
---
 debian/changelog                   | 13 +++++++++++++
 debian/control                     |  5 +++--
 debian/kdevelop.install            |  5 +++--
 debian/patches/optional-clang.diff | 18 ++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  3 +++
 6 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff4e70c..8e31293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,19 @@ kdevelop (4:5.2.0-3) UNRELEASED; urgency=medium
     versions have versioned symbols, we do not need to use the same version
     used by mesa anymore (see #846410); hence, using whatever is the default
     llvm version should be fine (Closes: #873411)
+  * Make kdevelop buildable also without Clang, on the architectures where
+    it is not available:
+    - do not consider Clang a mandatory requirement; patch optional-clang.diff
+    - add the dh-exec build dependency
+    - ensure /usr/share/kdevclangsupport/ always exists, so there is no need
+      to change kdevelop-data.install (even if its actual packaged content
+      will change)
+    - exclude libKDevClangPrivate.so, and kdevclangsupport.so on architectures
+      without Clang
+    - exclude the libclang-dev, and llvm-dev build dependency on architectures
+      without Clang
+    - the architectures without Clang are:
+      alpha hppa hurd-any kfreebsd-any m68k powerpcspe sh4 sparc64 x32
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 21 Nov 2017 22:35:25 +0100
 
diff --git a/debian/control b/debian/control
index f8fd7de..344af31 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,11 @@ Uploaders: Jeremy Lainé <jeremy.laine at m4x.org>,
            Andreas Cord-Landwehr <cola at uni-paderborn.de>,
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
+               dh-exec,
                extra-cmake-modules (>= 0.0.9),
                kdevelop-pg-qt (>= 2.0),
                libboost-serialization-dev,
-               libclang-dev (>= 1:3.8),
+               libclang-dev (>= 1:3.8) [!alpha !hppa !hurd-any !kfreebsd-any !m68k !powerpcspe !sh4 !sparc64 !x32],
                libgrantlee5-dev,
                libkf5archive-dev (>= 5.15.0),
                libkf5config-dev (>= 5.15.0),
@@ -42,7 +43,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkomparediff2-dev,
                libqt5webkit5-dev (>= 5.4.0),
                libsvn-dev,
-               llvm-dev (>= 1:3.8),
+               llvm-dev (>= 1:3.8) [!alpha !hppa !hurd-any !kfreebsd-any !m68k !powerpcspe !sh4 !sparc64 !x32],
                okteta-dev (>= 4:16.08.0-1~),
                pkg-config,
                pkg-kde-tools (>= 0.15.16),
diff --git a/debian/kdevelop.install b/debian/kdevelop.install
old mode 100644
new mode 100755
index edba7af..4bafad1
--- a/debian/kdevelop.install
+++ b/debian/kdevelop.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 etc/xdg/kdevelop.categories
 etc/xdg/kdevplatform.categories
 usr/bin/kdev_dbus_socket_transformer
@@ -6,14 +7,14 @@ usr/bin/kdev_includepathsconverter
 usr/bin/kdevelop
 usr/bin/kdevelop!
 usr/bin/kdevplatform_shell_environment.sh
-usr/lib/*/libKDevClangPrivate.so.30
+[!alpha !hppa !hurd-any !kfreebsd-any !m68k !powerpcspe !sh4 !sparc64 !x32] usr/lib/*/libKDevClangPrivate.so.30
 usr/lib/*/libkdevcmakecommon.so
 usr/lib/*/qt5/plugins/grantlee/5.*/kdev_filters.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevandroid.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevappwizard.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevastyle.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevbazaar.so
-usr/lib/*/qt5/plugins/kdevplatform/30/kdevclangsupport.so
+[!alpha !hppa !hurd-any !kfreebsd-any !m68k !powerpcspe !sh4 !sparc64 !x32] usr/lib/*/qt5/plugins/kdevplatform/30/kdevclangsupport.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevclassbrowser.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevcmakebuilder.so
 usr/lib/*/qt5/plugins/kdevplatform/30/kdevcmakedocumentation.so
diff --git a/debian/patches/optional-clang.diff b/debian/patches/optional-clang.diff
new file mode 100644
index 0000000..f107ee4
--- /dev/null
+++ b/debian/patches/optional-clang.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Make Clang an optional requirement
+ This allows to build kdevelop, albeith without C++ support, also on
+ architectures that do not have Clang.
+Forwarded: no
+Last-Update: 2017-11-21
+
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -43,7 +43,7 @@ endif()
+ set_package_properties(Clang PROPERTIES
+     DESCRIPTION "Clang libraries from the LLVM project. ${clangSearchHint}"
+     PURPOSE "Used for KDevelop's C++/C support plugin."
+-    TYPE REQUIRED
++    TYPE RECOMMENDED
+ )
+ 
+ if (CLANG_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6a0734c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+optional-clang.diff
diff --git a/debian/rules b/debian/rules
index 10c9a29..6117163 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,9 @@ override_dh_auto_build:
 	done
 
 override_dh_install:
+	# create this directory if not existing, so kdevelop-data.install
+	# is the same, no matter whether clang is built
+	mkdir -p debian/tmp/usr/share/kdevclangsupport/
 	dh_install --list-missing
 
 override_dh_strip:

-- 
KDevelop packaging