Hello community, here is the log from the commit of package twinkle for openSUSE:Factory checked in at 2018-06-08 23:16:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/twinkle (Old) and /work/SRC/openSUSE:Factory/.twinkle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "twinkle" Fri Jun 8 23:16:23 2018 rev:42 rq:614547 version:1.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/twinkle/twinkle.changes 2016-11-04 21:00:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.twinkle.new/twinkle.changes 2018-06-08 23:16:29.301847454 +0200 @@ -1,0 +2,7 @@ +Wed Jun 6 05:23:53 UTC 2018 - [email protected] + +- add Include-QRegExpValidator-explicitly.patch + fix build against Qt 5.11 +- use %license for license file + +------------------------------------------------------------------- New: ---- Include-QRegExpValidator-explicitly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ twinkle.spec ++++++ --- /var/tmp/diff_new_pack.89nNjq/_old 2018-06-08 23:16:29.997822316 +0200 +++ /var/tmp/diff_new_pack.89nNjq/_new 2018-06-08 23:16:29.997822316 +0200 @@ -1,7 +1,7 @@ # # spec file for package twinkle # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,7 @@ BuildRequires: ilbc %endif +Patch1: Include-QRegExpValidator-explicitly.patch # workaround for broken std::regex in gcc 4.8; please keep at the end Patch91: Revert-Build-fix-for-a-probably-broken-std-match_res.patch Patch92: Revert-Replaced-Boost-regex-dependency-with-C-11-reg.patch @@ -66,6 +67,7 @@ %prep %setup -q +%patch1 -p1 # workaround for broken std::regex in gcc 4.8 %if 0%{?suse_version} <= 1320 %patch91 -p1 @@ -96,7 +98,8 @@ %files %defattr(-, root, root) -%doc AUTHORS COPYING README.md +%doc AUTHORS README.md +%license COPYING %{_bindir}/twinkle %{_bindir}/twinkle-console %{_datadir}/%{name} ++++++ Include-QRegExpValidator-explicitly.patch ++++++ From: Michal Kubecek <[email protected]> Date: Wed, 6 Jun 2018 10:07:21 +0200 Subject: Include <QRegExpValidator> explicitly Patch-mainline: v1.10.2? Git-commit: 4b42755619011c117a76bdf98e417ebedc47e319 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(-) --- 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" --- 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" --- 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 <[email protected]> --- 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" --- a/src/gui/numberconversionform.cpp +++ b/src/gui/numberconversionform.cpp @@ -1,5 +1,6 @@ #include "numberconversionform.h" +#include <QRegExpValidator> #include "gui.h" /* --- 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 --- 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" --- 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)")
