[neon/qt/qtcreator/Neon/release] debian: switch to qt6

Pino Toscano null at kde.org
Mon Jan 16 22:09:46 GMT 2023


Git commit 0ea08cef3961bba7ab854ec6f5f1d84dc62b9c3c by Pino Toscano.
Committed on 05/06/2022 at 20:32.
Pushed by carlosdem into branch 'Neon/release'.

switch to qt6

M  +28   -0    debian/changelog
M  +23   -29   debian/control
M  +1    -3    debian/rules

https://invent.kde.org/neon/qt/qtcreator/commit/0ea08cef3961bba7ab854ec6f5f1d84dc62b9c3c

diff --git a/debian/changelog b/debian/changelog
index af48f14..db6831d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,33 @@
 qtcreator (7.0.2-100) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Switch qtcreator to build with Qt6 instead of Qt5:
+    - remove libkf5syntaxhighlighting-dev, libqt5opengl5-dev,
+      libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev,
+      libqt5x11extras5-dev, qml-module-qtquick-controls, qml-module-qtquick2,
+      qtbase5-dev, qtbase5-private-dev, qtdeclarative5-dev,
+      qtdeclarative5-private-dev, qtscript5-dev, qttools5-dev,
+      qttools5-dev-tools, and qttools5-private-dev
+    - add libqt6core5compat6-dev, libqt6opengl6-dev, libqt6quicktimeline6-dev,
+      libqt6serialport6-dev, libqt6shadertools6-dev, libqt6svg6-dev,
+      qt6-base-dev, qt6-base-private-dev, qt6-declarative-dev,
+      qt6-declarative-private-dev, qt6-quick3d-dev, qt6-tools-dev, and
+      qt6-tools-private-dev
+    - stop exporting QT_SELECT, no more needed
+    - replace libqt5designercomponents5 with libqt6designercomponents6 in the
+      strict dependency for Designer bits
+    - update the runtime dependencies/recommends/suggests:
+      - switch libqt5sql5-sqlite to libqt6sql6-sqlite
+      - switch qml-module-qtqml-models2 to qml6-module-qtqml-models
+      - switch qml-module-qtquick-controls to qml6-module-qtquick-controls
+      - switch qml-module-qtquick2 to qml6-module-qtquick
+      - drop qtchooser, no more needed with Qt6
+      - switch qmlscene to qmlscene-qt6
+      - drop qt5-doc, there is no Qt6 equivalent in Debian yet
+      - switch qtbase5-dev-tools to qt6-base-dev-tools
+      - switch qtdeclarative5-dev-tools to qt6-declarative-dev-tools
+      - switch qttools5-dev-tools to qt6-tools-dev-tools
+      - switch qttranslations5-l10n to qt6-translations-l10n
 
  -- 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 74c64bf..cb15ed5 100644
--- a/debian/control
+++ b/debian/control
@@ -10,27 +10,24 @@ Build-Depends: clang (>= 1:10~),
                libclang-dev (>= 1:10~),
                libdw-dev,
                libicu-dev,
-               libkf5syntaxhighlighting-dev,
                liblitehtml-dev,
-               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~),
+               libqt6core5compat6-dev,
+               libqt6opengl6-dev,
+               libqt6quicktimeline6-dev,
+               libqt6serialport6-dev,
+               libqt6shadertools6-dev (>= 6.2.4-2~),
+               libqt6svg6-dev,
                libyaml-cpp-dev (>= 0.5~),
                libzstd-dev,
                llvm-dev (>= 1:10~),
                pkg-config,
-               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~),
+               qt6-base-dev (>= 6.2.4+dfsg-3~),
+               qt6-base-private-dev (>= 6.2.4+dfsg-3~),
+               qt6-declarative-dev,
+               qt6-declarative-private-dev,
+               qt6-quick3d-dev (>= 6.2.4-2~),
+               qt6-tools-dev (>= 6.2.4-2~),
+               qt6-tools-private-dev (>= 6.2.4-2~),
                zlib1g-dev
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
@@ -40,11 +37,10 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt/qtcreator
 
 Package: qtcreator
 Architecture: any
-Depends: libqt5sql5-sqlite,
-         qml-module-qtqml-models2,
-         qml-module-qtquick-controls (>= 5.5.0~),
-         qml-module-qtquick2 (>= 5.5.0~),
-         qtchooser,
+Depends: libqt6sql6-sqlite,
+         qml6-module-qtqml-models,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick,
          qtcreator-data (= ${source:Version}),
          ${misc:Depends},
          ${qtcreator:clang},
@@ -52,14 +48,13 @@ Depends: libqt5sql5-sqlite,
 Recommends: clang-tidy,
             gdb,
             make,
-            qmlscene,
-            qt5-doc,
-            qt5-qmltooling-plugins,
-            qtbase5-dev-tools,
+            qmlscene-qt6,
+            qt6-qmltooling-plugins,
+            qt6-base-dev-tools,
             qtcreator-doc,
-            qtdeclarative5-dev-tools,
-            qttools5-dev-tools,
-            qttranslations5-l10n,
+            qt6-declarative-dev-tools,
+            qt6-tools-dev-tools,
+            qt6-translations-l10n,
             xterm | x-terminal-emulator
 Suggests: clazy (>= 1.5), cmake, g++, git, meson, subversion, valgrind,
           python3-pylsp,
@@ -92,7 +87,6 @@ Architecture: all
 Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
-Suggests: qt5-doc
 Description: documentation for Qt Creator IDE
  Qt Creator is a cross-platform integrated development environment (IDE)
  designed to make development with the Qt application framework faster
diff --git a/debian/rules b/debian/rules
index 0d9294e..4007501 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@
 
 include /usr/share/dpkg/architecture.mk
 
-export QT_SELECT := qt5
-
 # Upstream changelog
 upstream_changes = $(wildcard dist/changes-*)
 
@@ -57,7 +55,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/qtcreator/
 
 override_dh_shlibdeps:
-	echo 'libQt5DesignerComponents 5 libqt5designercomponents5 (>= $(call upstream_version_of_pkg,libqt5designercomponents5)~)' > debian/shlibs.local
+	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
 



More information about the Neon-commits mailing list