[Pkg-matrix-maintainers] Bug#1089828: Please build Quaternion against Qt6

[Aurélien COUDERC]

Package: quaternion
Version: 0.0.96.1-1
Severity: serious
Tags: patch
X-Debbugs-Cc: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>

Dear Maintainer,

as explained on #1089827 I need a Qt6 build of libquotient so unblock
the KQuickImageEditor transition.

This means a Qt6 build of Quaternion build against the Qt6 libquotient
is needed.

Please find a patch in attachment that adapts the Quaternion packaging
to build it against Qt6. I’ve tested that it builds and launches against
unstable, using the Qt6 version of libquotient.

Would you please upload this change so we can unblock the
KQuickImageEditor transition ?


Thanks !
--
Aurélien

-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'unstable-debug'), (500, 'testing'), (500, 'stable'), (100, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.11.10-amd64 (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages quaternion depends on:
ii  libc6                         2.40-4
ii  libgcc-s1                     14.2.0-8
ii  libqt6core6t64                6.7.2+dfsg-5
ii  libqt6gui6                    6.7.2+dfsg-5
ii  libqt6keychain1               0.14.3-3
ii  libqt6network6                6.7.2+dfsg-5
ii  libqt6qml6                    6.7.2+dfsg-11
ii  libqt6quick6                  6.7.2+dfsg-11
ii  libqt6quickcontrols2-6        6.7.2+dfsg-11
ii  libqt6quickwidgets6           6.7.2+dfsg-11
ii  libqt6widgets6                6.7.2+dfsg-5
ii  libquotientqt6-0.8            0.8.2-2
ii  libstdc++6                    14.2.0-8
ii  qml-module-qtquick-controls   5.15.15-2
ii  qml-module-qtquick-controls2  5.15.15+dfsg-2

quaternion recommends no packages.

quaternion suggests no packages.

-- no debconf information
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 92745d3..b4bef8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quaternion (0.0.96.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Build against Qt6.
+
+ -- Aurélien COUDERC <coucouf at debian.org>  Fri, 13 Dec 2024 11:56:01 +0100
+
 quaternion (0.0.96.1-1) unstable; urgency=medium
 
   * New ustream release.
diff --git a/debian/control b/debian/control
index 60e10c0..3b428a3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,12 @@ Maintainer: Matrix Packaging Team <pkg-matrix-maintainers at lists.alioth.debian.or
 Uploaders: Hubert Chathi <uhoreg at debian.org>
 Build-Depends: cmake
  , debhelper-compat (=12)
- , libquotient-dev (>= 0.8.1.2)
- , qt5keychain-dev
- , qtbase5-dev
- , qtdeclarative5-dev
- , qtmultimedia5-dev
- , qttools5-dev
- , qtquickcontrols2-5-dev
+ , libquotient-dev (>= 0.8.2~)
+ , qtkeychain-qt6-dev
+ , qt6-base-dev (>= 6.2~)
+ , qt6-declarative-dev (>= 6.2~)
+ , qt6-multimedia-dev (>= 6.2~)
+ , qt6-tools-dev (>= 6.2~)
 Standards-Version: 4.5.0
 Homepage: https://github.com/quotient-im/Quaternion
 Vcs-Git: https://salsa.debian.org/matrix-team/quaternion.git
diff --git a/debian/rules b/debian/rules
index d841eb0..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_WITH_QT6=OFF