[neon/qt/qtcreator/Neon/release] debian: clangd is needed now

[Pino Toscano]

Git commit 36b37645c2a855cb7a394688346ffcb436cac800 by Pino Toscano.
Committed on 17/06/2022 at 17:16.
Pushed by carlosdem into branch 'Neon/release'.

clangd is needed now

M  +9    -0    debian/changelog
M  +3    -2    debian/control
M  +0    -5    debian/rules

https://invent.kde.org/neon/qt/qtcreator/commit/36b37645c2a855cb7a394688346ffcb436cac800

diff --git a/debian/changelog b/debian/changelog
index 9f25e81..82eb7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,15 @@ qtcreator (8.0.0~beta1-0r1) UNRELEASED; urgency=medium
       KSyntaxHighlighting
     - the switch enables the build of the QML Designer plugin, which is built
       only when using Qt >= 6.2.0 (Closes: #1006555)
+  * qtcreator now uses clangd instead of libclang for the Clang code model:
+    - add clangd >= 14 as dependency: the unversioned name is used, and the
+      current requirement is 14+
+    - stop depending on the version of clang-N used by the unversioned clang,
+      as there is no more need for the exact Clang version to locale the Clang
+      includes
+    - add the same clangd version also as build dependency: while it is not
+      needed at build time, it makes sure that qtcreator can be built only when
+      the runtime clangd requirement is satisfied
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Jun 2022 22:10:50 +0200
 
diff --git a/debian/control b/debian/control
index 2135875..7f78927 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Adam Majer <adamm at zombino.com>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
 Build-Depends: clang (>= 1:10~),
+               clangd (>= 1:14~),
                cmake (>= 3.16~),
                debhelper-compat (= 13),
                libclang-dev (>= 1:10~),
@@ -37,13 +38,13 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/qtcreator/-/tree/experiment
 
 Package: qtcreator
 Architecture: any
-Depends: libqt6sql6-sqlite,
+Depends: clangd (>= 1:14~),
+         libqt6sql6-sqlite,
          qml6-module-qtqml-models,
          qml6-module-qtquick-controls,
          qml6-module-qtquick,
          qtcreator-data (= ${source:Version}),
          ${misc:Depends},
-         ${qtcreator:clang},
          ${shlibs:Depends}
 Recommends: clang-tidy,
             gdb,
diff --git a/debian/rules b/debian/rules
index 67544ae..785072b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ upstream_changes = $(wildcard dist/changes-*)
 # Do not build the HelloWorld plugin, as it is not needed
 export QTC_BUILD_PLUGIN_HELLOWORLD=FALSE
 
-# The clang-N used for the build by the unversioned clang
-current_clang_pkg = $(shell dpkg -S "$(shell realpath $(shell env PATH=$$(echo "$$PATH" | sed -r -e 's|/usr/lib/ccache/?:||') which clang))" | cut -d: -f1)
 # The upstream version of a package passed as parameter
 upstream_version_of_pkg = $(shell dpkg-query -f '$${Version}' -W $(1) | sed -e 's/-[^-]*$$//')
 
@@ -61,6 +59,3 @@ override_dh_shlibdeps:
 	echo 'libQt6DesignerComponents 6 libqt6designercomponents6 (>= $(call upstream_version_of_pkg,libqt6designercomponents6)~)' > debian/shlibs.local
 	dh_shlibdeps -l$(CURDIR)/debian/qtcreator/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator
 	rm debian/shlibs.local
-
-override_dh_gencontrol-arch:
-	dh_gencontrol -a -- -V'qtcreator:clang=$(current_clang_pkg) (>= $(call upstream_version_of_pkg,$(current_clang_pkg))~)'