[neon/qt/qtcreator/Neon/release] debian: enable ClangFormat plugin again

[Pino Toscano]

Git commit 0672ae7a2960b42a937ce7286673225023a04316 by Pino Toscano.
Committed on 25/02/2022 at 20:47.
Pushed by jriddell into branch 'Neon/release'.

enable ClangFormat plugin again

M  +4    -0    debian/changelog
M  +0    -6    debian/rules

https://invent.kde.org/neon/qt/qtcreator/commit/0672ae7a2960b42a937ce7286673225023a04316

diff --git a/debian/changelog b/debian/changelog
index 12e30aa..b8cfd73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtcreator (7.0.0~beta2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Enable the ClangFormat plugin, as it should run fine without requiring to
+    be built against a patched LLVM since 4.15.0:
+    - stop exporting QTC_BUILD_PLUGIN_CLANGFORMAT=FALSE
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Feb 2022 21:00:28 +0100
 
diff --git a/debian/rules b/debian/rules
index b552a4e..324cbed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,6 @@ upstream_changes = $(wildcard dist/changes-*)
 
 # Do build the HelloWorld plugin, as it is not needed
 export QTC_BUILD_PLUGIN_HELLOWORLD=FALSE
-# Do not build the ClangFormat plugin, as it requires clang-format with
-# a patch not accepted yet (and available only in the QtC fork):
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939825#49
-# https://bugreports.qt.io/browse/QTCREATORBUG-22923
-# https://reviews.llvm.org/D53072
-export QTC_BUILD_PLUGIN_CLANGFORMAT=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)