Control: tags 906657 + patch Control: tags 906657 + pending Dear maintainer,
I've prepared an NMU for twinkle (versioned as 1:1.10.1+dfsg-3.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
diff -Nru twinkle-1.10.1+dfsg/debian/changelog twinkle-1.10.1+dfsg/debian/changelog --- twinkle-1.10.1+dfsg/debian/changelog 2018-03-28 04:25:58.000000000 +0300 +++ twinkle-1.10.1+dfsg/debian/changelog 2018-09-16 19:21:15.000000000 +0300 @@ -1,3 +1,13 @@ +twinkle (1:1.10.1+dfsg-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with Qt 5.11, + thanks to Juhani Numminen. (Closes: #906657) + * Remove alternative dependency on the no longer existing + qtdeclarative5-qtquick2-plugin. (Closes: #904029) + + -- Adrian Bunk <b...@debian.org> Sun, 16 Sep 2018 19:21:15 +0300 + twinkle (1:1.10.1+dfsg-3) unstable; urgency=medium * Drop unneeded build-deps on qtscript5-dev and qttools5-dev-tools. diff -Nru twinkle-1.10.1+dfsg/debian/control twinkle-1.10.1+dfsg/debian/control --- twinkle-1.10.1+dfsg/debian/control 2018-03-28 04:25:58.000000000 +0300 +++ twinkle-1.10.1+dfsg/debian/control 2018-09-16 19:21:15.000000000 +0300 @@ -28,7 +28,7 @@ Package: twinkle Architecture: any -Depends: qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin, +Depends: qml-module-qtquick2, twinkle-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} diff -Nru twinkle-1.10.1+dfsg/debian/patches/0001-Include-QRegExpValidator-explicitly.patch twinkle-1.10.1+dfsg/debian/patches/0001-Include-QRegExpValidator-explicitly.patch --- twinkle-1.10.1+dfsg/debian/patches/0001-Include-QRegExpValidator-explicitly.patch 1970-01-01 02:00:00.000000000 +0200 +++ twinkle-1.10.1+dfsg/debian/patches/0001-Include-QRegExpValidator-explicitly.patch 2018-09-16 13:42:02.000000000 +0300 @@ -0,0 +1,119 @@ +From 4b42755619011c117a76bdf98e417ebedc47e319 Mon Sep 17 00:00:00 2001 +From: Michal Kubecek <mkube...@suse.cz> +Date: Wed, 6 Jun 2018 10:07:21 +0200 +Subject: Include <QRegExpValidator> explicitly + +Since Qt 5.11, generated ui_getprofilename.h no longer includes QHeaderView +which breaks the chain that included qvalidator.h in getprofilename.cpp. +As it feels rather fragile to rely on such indirect includes, let's include +<QRegExpValidator> explicitly in each file using QRegExpValidator class. +--- + src/gui/diamondcardprofileform.cpp | 1 + + src/gui/getprofilenameform.cpp | 2 +- + src/gui/inviteform.cpp | 1 + + src/gui/mphoneform.cpp | 1 + + src/gui/numberconversionform.cpp | 1 + + src/gui/syssettingsform.cpp | 1 + + src/gui/userprofileform.cpp | 1 + + src/gui/wizardform.cpp | 1 + + 8 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/gui/diamondcardprofileform.cpp b/src/gui/diamondcardprofileform.cpp +index 6656909..517180b 100644 +--- a/src/gui/diamondcardprofileform.cpp ++++ b/src/gui/diamondcardprofileform.cpp +@@ -21,6 +21,7 @@ + + #include <QRegExp> + #include <QValidator> ++#include <QRegExpValidator> + #include "gui.h" + #include "diamondcard.h" + #include "getprofilenameform.h" +diff --git a/src/gui/getprofilenameform.cpp b/src/gui/getprofilenameform.cpp +index 1319e1d..89c715e 100644 +--- a/src/gui/getprofilenameform.cpp ++++ b/src/gui/getprofilenameform.cpp +@@ -1,7 +1,7 @@ + #include "getprofilenameform.h" +- + #include <QDir> + #include <QMessageBox> ++#include <QRegExpValidator> + #include "user.h" + #include "protocol.h" + +diff --git a/src/gui/inviteform.cpp b/src/gui/inviteform.cpp +index 433fb22..2a5b68d 100644 +--- a/src/gui/inviteform.cpp ++++ b/src/gui/inviteform.cpp +@@ -7,6 +7,7 @@ + #include "sys_settings.h" + #include <QRegExp> + #include <QValidator> ++#include <QRegExpValidator> + + /* + Copyright (C) 2005-2009 Michel de Boer <mic...@twinklephone.com> +diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp +index 260fda7..c4e3c1d 100644 +--- a/src/gui/mphoneform.cpp ++++ b/src/gui/mphoneform.cpp +@@ -54,6 +54,7 @@ + #include <QRegExp> + #include <QValidator> + #include <QSettings> ++#include <QRegExpValidator> + #include "buddyform.h" + #include "diamondcardprofileform.h" + #include "osd.h" +diff --git a/src/gui/numberconversionform.cpp b/src/gui/numberconversionform.cpp +index f8ae64c..8481a9b 100644 +--- a/src/gui/numberconversionform.cpp ++++ b/src/gui/numberconversionform.cpp +@@ -1,5 +1,6 @@ + #include "numberconversionform.h" + ++#include <QRegExpValidator> + #include "gui.h" + + /* +diff --git a/src/gui/syssettingsform.cpp b/src/gui/syssettingsform.cpp +index 216af54..355df59 100644 +--- a/src/gui/syssettingsform.cpp ++++ b/src/gui/syssettingsform.cpp +@@ -28,6 +28,7 @@ + #include "twinkle_config.h" + #include <QRegExp> + #include <QValidator> ++#include <QRegExpValidator> + #include "syssettingsform.h" + /* + * Constructs a SysSettingsForm as a child of 'parent', with the +diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp +index 28700a6..9ed9209 100644 +--- a/src/gui/userprofileform.cpp ++++ b/src/gui/userprofileform.cpp +@@ -31,6 +31,7 @@ + #include <QStringList> + #include "twinkle_config.h" + #include <QListWidget> ++#include <QRegExpValidator> + #include "numberconversionform.h" + #include "util.h" + #include "userprofileform.h" +diff --git a/src/gui/wizardform.cpp b/src/gui/wizardform.cpp +index 777aa12..f925875 100644 +--- a/src/gui/wizardform.cpp ++++ b/src/gui/wizardform.cpp +@@ -23,6 +23,7 @@ + #include <QTextStream> + #include "gui.h" + #include <QFile> ++#include <QRegExpValidator> + #include "wizardform.h" + + #define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP calls)") +-- +2.11.0 + diff -Nru twinkle-1.10.1+dfsg/debian/patches/series twinkle-1.10.1+dfsg/debian/patches/series --- twinkle-1.10.1+dfsg/debian/patches/series 2016-11-18 19:31:55.000000000 +0200 +++ twinkle-1.10.1+dfsg/debian/patches/series 2018-09-16 19:21:15.000000000 +0300 @@ -1 +1,2 @@ fix-spelling.patch +0001-Include-QRegExpValidator-explicitly.patch