From f1371daa97a521d0e995599cf94fa2516c6784c9 Mon Sep 17 00:00:00 2001 From: "Jovany Leandro G.C" Date: Sun, 1 Sep 2019 05:52:09 -0500 Subject: gnu: twinkle: update to 1.10.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/telephony.scm (twinkle): update to 1.10.2 * gnu/packages/patches/twinkle-include-qregexpvalidator.patch: Delete it. * gnu/local.mk (dist_patch_DATA): Remove patch. Co-authored-by: Ludovic Courtès --- .../patches/twinkle-include-qregexpvalidator.patch | 123 --------------------- 1 file changed, 123 deletions(-) delete mode 100755 gnu/packages/patches/twinkle-include-qregexpvalidator.patch (limited to 'gnu/packages/patches/twinkle-include-qregexpvalidator.patch') diff --git a/gnu/packages/patches/twinkle-include-qregexpvalidator.patch b/gnu/packages/patches/twinkle-include-qregexpvalidator.patch deleted file mode 100755 index 4096cc8712..0000000000 --- a/gnu/packages/patches/twinkle-include-qregexpvalidator.patch +++ /dev/null @@ -1,123 +0,0 @@ -Copied from upstream: - -https://github.com/LubosD/twinkle/commit/4b42755619011c117a76bdf98e417ebedc47e319 - -From 4b42755619011c117a76bdf98e417ebedc47e319 Mon Sep 17 00:00:00 2001 -From: Michal Kubecek -Date: Wed, 6 Jun 2018 10:07:21 +0200 -Subject: [PATCH] Include 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 - 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 - #include -+#include - #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 - #include -+#include - #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 - #include -+#include - - /* - Copyright (C) 2005-2009 Michel de Boer -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 - #include - #include -+#include - #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 - #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 - #include -+#include - #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 - #include "twinkle_config.h" - #include -+#include - #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 - #include "gui.h" - #include -+#include - #include "wizardform.h" - - #define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP calls)") --- -2.17.0 - -- cgit v1.2.3