From 4c6d5c5d4332a15e65df420262d3566afaa551b0 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 28 Nov 2022 15:38:21 -0600 Subject: [PATCH] Build using Qt 6. --- debian/changelog | 1 + debian/control | 25 ++++++++++++------------- debian/rules | 3 +++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 06ae7bc..3b665ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ featherpad (1.3.3-0ubuntu1) UNRELEASED; urgency=medium * Manually fix the watch file. * Change the maintainer. * Remove obsolete Breaks/Replaces. + * Build using Qt 6. -- Simon Quigley Mon, 28 Nov 2022 15:10:23 -0600 diff --git a/debian/control b/debian/control index 6910c53..4e76f5a 100644 --- a/debian/control +++ b/debian/control @@ -8,14 +8,13 @@ Priority: optional Build-Depends: cmake, debhelper-compat (= 13), libhunspell-dev, - libqt5svg5-dev, - libqt5x11extras5-dev, + libqt6svg6-dev, libx11-dev, libxext-dev, pkgconf, - qtbase5-dev, - qttools5-dev, - qttools5-dev-tools + qt6-base-dev, + qt6-tools-dev, + qt6-tools-dev-tools Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/lxqt-team/featherpad Vcs-Git: https://salsa.debian.org/lxqt-team/featherpad.git @@ -25,10 +24,10 @@ Package: featherpad Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: featherpad-l10n, libglib2.0-bin -Description: Lightweight Qt5 plain-text editor - FeatherPad is a lightweight Qt5 plain-text editor for Linux. It is independent - of any desktop environment and comes with all features one would expect in a - modern editor. +Description: Lightweight Qt 6 plain-text editor + FeatherPad is a lightweight Qt 6 plain-text editor for Linux. It is + independent of any desktop environment and comes with all features one would + expect in a modern editor. . This package contains the application files. @@ -36,10 +35,10 @@ Package: featherpad-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: qttranslations5-l10n, ${misc:Depends} +Depends: qt6-translations-l10n, ${misc:Depends} Description: Language package for featherpad - FeatherPad is a lightweight Qt5 plain-text editor for Linux. It is independent - of any desktop environment and comes with all features one would expect in a - modern editor. + FeatherPad is a lightweight Qt 6 plain-text editor for Linux. It is + independent of any desktop environment and comes with all features one would + expect in a modern editor. . This package contains the l10n files needed by the featherpad. diff --git a/debian/rules b/debian/rules index 8ce55ae..62353a1 100755 --- a/debian/rules +++ b/debian/rules @@ -8,3 +8,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_missing: dh_missing --fail-missing + +override_dh_auto_configure: + dh_auto_configure -- -DENABLE_QT5=OFF