From 8293db08ccf7b0dc8b6a90753397d90add301d73 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 13 Jul 2022 11:26:48 -0400 Subject: notepadnext 0.5.3 disable i18n for now --- notepadnext/debian/changelog | 2 ++ notepadnext/debian/control | 4 +++- notepadnext/debian/notepadnext.dsc | 2 +- notepadnext/debian/patches/disable-i18n.patch | 14 ++++++++++++++ notepadnext/debian/patches/series | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 notepadnext/debian/patches/disable-i18n.patch diff --git a/notepadnext/debian/changelog b/notepadnext/debian/changelog index 163fdd9..cc7ab31 100644 --- a/notepadnext/debian/changelog +++ b/notepadnext/debian/changelog @@ -11,6 +11,8 @@ notepadnext (0.5.3-1) obs; urgency=low * Ensure lines are visible when going to range * Fix crash when dragging text into the application * Automate publishing GitHub release + * Package changes + * Disable internationalization because of incomplete steps -- B. Stack Mon, 11 Jul 2022 16:33:08 -0400 diff --git a/notepadnext/debian/control b/notepadnext/debian/control index 3e23616..869c1f4 100644 --- a/notepadnext/debian/control +++ b/notepadnext/debian/control @@ -7,7 +7,9 @@ Build-Depends: debhelper-compat (= 12), libqt6core6, qmake6, qt6-base-private-dev, - qtbase5-private-dev + qtbase5-private-dev, +# When i18n works, we will need this b-d: +#qt6-l10n-tools Standards-Version: 4.5.0 Homepage: https://github.com/dail8859/NotepadNext diff --git a/notepadnext/debian/notepadnext.dsc b/notepadnext/debian/notepadnext.dsc index d84ddcd..ae1e6a4 100644 --- a/notepadnext/debian/notepadnext.dsc +++ b/notepadnext/debian/notepadnext.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: notepadnext Binary: notepadnext Architecture: any -Version: 0.4.10-1 +Version: 0.5.3-1 Maintainer: B. Stack Homepage: https://github.com/dail8859/NotepadNext Standards-Version: 4.5.0 diff --git a/notepadnext/debian/patches/disable-i18n.patch b/notepadnext/debian/patches/disable-i18n.patch new file mode 100644 index 0000000..5bf512c --- /dev/null +++ b/notepadnext/debian/patches/disable-i18n.patch @@ -0,0 +1,14 @@ +Author: bgstack15 +Message: Rather than troubleshoot why the internationalization fails to compile, just disable it entirely. +diff --git a/src/NotepadNext/NotepadNext.pro b/src/NotepadNext/NotepadNext.pro +index 36e02d6..1d10fff 100644 +--- a/src/NotepadNext/NotepadNext.pro ++++ b/src/NotepadNext/NotepadNext.pro +@@ -34,7 +34,6 @@ include(../lua.pri) + include(../ads.pri) + include(../editorconfig-core-qt/EditorConfig.pri) + win32:include(../QSimpleUpdater/QSimpleUpdater.pri) +-include(../i18n.pri) + + # Set variables for output executable + VERSION = $$APP_VERSION diff --git a/notepadnext/debian/patches/series b/notepadnext/debian/patches/series index 4a97dfa..86b66ee 100644 --- a/notepadnext/debian/patches/series +++ b/notepadnext/debian/patches/series @@ -1 +1 @@ -# You must remove unused comment lines for the released package. +disable-i18n.patch -- cgit