[neon/qt/qtcreator/Neon/release] debian: Revert "revert to qtcreator 6"
Jonathan Esk-Riddell
null at kde.org
Thu Oct 6 11:49:38 BST 2022
Git commit cfe85e744ba6b66065691ab59d4000e3b0de2140 by Jonathan Esk-Riddell.
Committed on 06/10/2022 at 10:47.
Pushed by jriddell into branch 'Neon/release'.
Revert "revert to qtcreator 6"
This reverts commit 86819abdf88995592c38061248bc9fb040b62fab.
A +1 -0 debian/.gitattributes
M +60 -3 debian/changelog
M +16 -19 debian/control
M +0 -1 debian/patches/series
D +0 -31 debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
M +3 -9 debian/rules
https://invent.kde.org/neon/qt/qtcreator/commit/cfe85e744ba6b66065691ab59d4000e3b0de2140
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index fa06349..c465bc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,65 @@
-qtcreator (6.0.2-2build1) jammy; urgency=medium
+qtcreator (7.0.1-1) unstable; urgency=medium
- * No-change rebuild against Qt 5.15.3.
+ * Team upload.
+ * New upstream release.
+ * Drop the libjs-jquery build dependency, unused for a long time.
+
+ -- Pino Toscano <pino at debian.org> Thu, 28 Apr 2022 04:47:18 +0200
+
+qtcreator (7.0.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * Upload to unstable.
+ * New upstream release.
+ * Switch watch file back to stable releases.
+
+ -- Pino Toscano <pino at debian.org> Wed, 23 Mar 2022 22:03:33 +0100
+
+qtcreator (7.0.0~rc1-1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream development release.
+ * Drop the qtxmlpatterns5-dev-tools build dependency, not actually needed.
+ * Stop recommending qtxmlpatterns5-dev-tools: nothing in qtcreator actually
+ uses it, and QtXmlPatterns is considered deprecated upstream, so avoid
+ installing it by default.
+
+ -- Pino Toscano <pino at debian.org> Sat, 12 Mar 2022 08:11:01 +0100
+
+qtcreator (7.0.0~beta2-2) experimental; urgency=medium
+
+ * Team upload.
+ * 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
+ * Pass -DCLANGTOOLING_LINK_CLANG_DYLIB=ON to cmake to link against the
+ available shared libraries of clang rather than the static LLVM ones.
+ * Remove a no more existing path from the dh_shlibdeps invocation.
+
+ -- Pino Toscano <pino at debian.org> Sat, 26 Feb 2022 08:12:53 +0100
+
+qtcreator (7.0.0~beta2-1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream development release.
+
+ -- Pino Toscano <pino at debian.org> Thu, 24 Feb 2022 21:27:31 +0100
+
+qtcreator (7.0.0~beta1-1) experimental; urgency=medium
+
+ * Team upload.
+ * New upstream development release.
+ * Switch watch file to the unstable releases, mangling -beta/-rc in the
+ version.
+ * Switch Vcs-* fields to the 'experimental' packaging branch.
+ * Update the build dependencies according to the upstream build system:
+ - bump cmake to 3.16
+ - bump the Qt packages to 5.15.2
+ * Update the patches:
+ - upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch:
+ dropped, backported from upstream
- -- Dmitry Shachnev <mitya57 at ubuntu.com> Sat, 19 Mar 2022 17:59:20 +0300
+ -- Pino Toscano <pino at debian.org> Mon, 14 Feb 2022 21:38:02 +0100
qtcreator (6.0.2-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 5b810ce..f03dd21 100644
--- a/debian/control
+++ b/debian/control
@@ -7,34 +7,32 @@ Uploaders: Adam Majer <adamm at zombino.com>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
Simon Quigley <tsimonq2 at debian.org>
Build-Depends: clang (>= 1:10~),
- cmake (>= 3.10~),
+ cmake (>= 3.16~),
debhelper-compat (= 13),
libclang-dev (>= 1:10~),
libdw-dev,
libicu-dev,
- libjs-jquery,
libkf5syntaxhighlighting-dev,
liblitehtml-dev,
- libqt5opengl5-dev (>= 5.14.0~),
- libqt5serialport5-dev (>= 5.14.0~),
- libqt5sql5-sqlite (>= 5.14.0~),
- libqt5svg5-dev (>= 5.14.0~),
- libqt5x11extras5-dev (>= 5.14.0~),
+ libqt5opengl5-dev (>= 5.15.2~),
+ libqt5serialport5-dev (>= 5.15.2~),
+ libqt5sql5-sqlite (>= 5.15.2~),
+ libqt5svg5-dev (>= 5.15.2~),
+ libqt5x11extras5-dev (>= 5.15.2~),
libyaml-cpp-dev (>= 0.5~),
libzstd-dev,
llvm-dev (>= 1:10~),
pkg-config,
- qml-module-qtquick-controls (>= 5.14.0~),
- qml-module-qtquick2 (>= 5.14.0~),
- qtbase5-dev (>= 5.14.0~),
- qtbase5-private-dev (>= 5.14.0~),
- qtdeclarative5-dev (>= 5.14.0~),
- qtdeclarative5-private-dev (>= 5.14.0~),
- qtscript5-dev (>= 5.14.0~),
- qttools5-dev (>= 5.14.0~),
- qttools5-dev-tools (>= 5.14.0~),
- qttools5-private-dev (>= 5.14.0~),
- qtxmlpatterns5-dev-tools (>= 5.14.0~),
+ qml-module-qtquick-controls (>= 5.15.2~),
+ qml-module-qtquick2 (>= 5.15.2~),
+ qtbase5-dev (>= 5.15.2~),
+ qtbase5-private-dev (>= 5.15.2~),
+ qtdeclarative5-dev (>= 5.15.2~),
+ qtdeclarative5-private-dev (>= 5.15.2~),
+ qtscript5-dev (>= 5.15.2~),
+ qttools5-dev (>= 5.15.2~),
+ qttools5-dev-tools (>= 5.15.2~),
+ qttools5-private-dev (>= 5.15.2~),
zlib1g-dev
Standards-Version: 4.6.0
Rules-Requires-Root: no
@@ -64,7 +62,6 @@ Recommends: clang-tidy,
qtdeclarative5-dev-tools,
qttools5-dev-tools,
qttranslations5-l10n,
- qtxmlpatterns5-dev-tools,
xterm | x-terminal-emulator
Suggests: clazy (>= 1.5), cmake, g++, git, meson, subversion, valgrind,
python3-pylsp,
diff --git a/debian/patches/series b/debian/patches/series
index ac985ed..860a57d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
#Backported patches
-upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
# Debian patches.
debian_paths.diff
diff --git a/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch b/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
deleted file mode 100644
index 4999a8c..0000000
--- a/debian/patches/upstream_Disable-QmlDesigner-plugin-for-Qt-5-based-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8acd2b15a9f12ba7de7281e6617963543a96056e Mon Sep 17 00:00:00 2001
-From: Eike Ziller <eike.ziller at qt.io>
-Date: Tue, 18 Jan 2022 14:46:14 +0100
-Subject: [PATCH] Disable QmlDesigner plugin for Qt 5 based builds
-
-Design Studio is Qt 6 based only, and since QmlDesigner development is
-mostly done for that and by that team, don't restrict it to stay
-compatible.
-
-Change-Id: I9252a2a34f7395d9dc6800f59a37fc23d9f30052
-Reviewed-by: hjk <hjk at qt.io>
----
- src/plugins/qmldesigner/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
-index aad701fc30..b032f2c818 100644
---- a/src/plugins/qmldesigner/CMakeLists.txt
-+++ b/src/plugins/qmldesigner/CMakeLists.txt
-@@ -4,7 +4,7 @@ if (APPLE)
- endif()
-
- add_qtc_plugin(QmlDesigner
-- CONDITION TARGET Qt5::QuickWidgets AND TARGET Qt5::Svg
-+ CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt5::QuickWidgets AND TARGET Qt5::Svg
- DEPENDS
- QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
- Qt5::QuickWidgets Qt5::CorePrivate Sqlite Qt5::Xml Qt5::Svg
---
-2.34.1
-
diff --git a/debian/rules b/debian/rules
index b552a4e..0d9294e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,8 @@ export QT_SELECT := qt5
# Upstream changelog
upstream_changes = $(wildcard dist/changes-*)
-# Do build the HelloWorld plugin, as it is not needed
+# Do not 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)
@@ -33,6 +27,7 @@ override_dh_auto_configure:
-DBUILD_QBS=OFF \
-DWITH_TESTS=OFF \
-DBUILD_TESTING=OFF \
+ -DCLANGTOOLING_LINK_CLANG_DYLIB=ON \
-DWITH_DOCS=$(if $(filter qtcreator-doc, $(shell dh_listpackages)),ON,OFF)
execute_after_dh_auto_build-indep:
@@ -63,8 +58,7 @@ override_dh_makeshlibs:
override_dh_shlibdeps:
echo 'libQt5DesignerComponents 5 libqt5designercomponents5 (>= $(call upstream_version_of_pkg,libqt5designercomponents5)~)' > debian/shlibs.local
- dh_shlibdeps -l$(CURDIR)/debian/qtcreator/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator:\
- $(CURDIR)/debian/qtcreator/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator/plugins/QtProject
+ dh_shlibdeps -l$(CURDIR)/debian/qtcreator/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator
rm debian/shlibs.local
override_dh_gencontrol-arch:
More information about the Neon-commits
mailing list