From e3c5c67c9464922349faad6a90fd7bc49f085f76 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 6 Mar 2023 19:46:59 -0600 Subject: [PATCH] Revert to building with Qt 5, until the Qt 6 theming story is improved under native LXQt. --- debian/changelog | 7 +++++++ debian/patches/qt6-theming.patch | 20 -------------------- debian/patches/series | 1 - debian/rules | 3 --- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/qt6-theming.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 7a33ff0..2757ae7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +featherpad (1.3.5-0ubuntu2) lunar; urgency=medium + + * Revert to building with Qt 5, until the Qt 6 theming story is improved + under native LXQt. + + -- Simon Quigley Mon, 06 Mar 2023 19:47:06 -0600 + featherpad (1.3.5-0ubuntu1) lunar; urgency=medium * New upstream release. diff --git a/debian/patches/qt6-theming.patch b/debian/patches/qt6-theming.patch deleted file mode 100644 index fec10b3..0000000 --- a/debian/patches/qt6-theming.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Manual override to use theming specified by qt6ct - This is a temporary patch to make Featherpad look (at least somewhat) - presentable until the Qt 6 theming story in LXQt improves. -Author: Simon Quigley -Origin: vendor -Forwarded: not-needed -Last-Update: 2023-01-24 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/featherpad/data/featherpad.desktop -+++ b/featherpad/data/featherpad.desktop -@@ -50,7 +50,7 @@ Name[it]=Nuova finestra - Name[hu]=Új ablak - Name[pt]=Nova Janela - Name[sv]=Nytt Fönster --Exec=featherpad --win -+Exec=env QT_QPA_PLATFORMTHEME=qt6ct featherpad --win - - [Desktop Action standalone-window] - Name=Standalone Window diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d951c5b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -qt6-theming.patch diff --git a/debian/rules b/debian/rules index 62353a1..8ce55ae 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_missing: dh_missing --fail-missing - -override_dh_auto_configure: - dh_auto_configure -- -DENABLE_QT5=OFF