From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fe00I-0007gI-2f for guix-patches@gnu.org; Fri, 13 Jul 2018 11:29:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fe00E-0008LS-Ur for guix-patches@gnu.org; Fri, 13 Jul 2018 11:29:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51219) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fe00E-0008LD-QH for guix-patches@gnu.org; Fri, 13 Jul 2018 11:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fe00E-00078w-KA for guix-patches@gnu.org; Fri, 13 Jul 2018 11:29:02 -0400 Subject: [bug#32145] [PATCH] gnu: twinkle: Add missing headers Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdzzG-0007Cm-An for guix-patches@gnu.org; Fri, 13 Jul 2018 11:28:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdzzD-0007nx-3o for guix-patches@gnu.org; Fri, 13 Jul 2018 11:28:02 -0400 Received: from mx1.riseup.net ([198.252.153.129]:36557) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fdzzC-0007lc-No for guix-patches@gnu.org; Fri, 13 Jul 2018 11:27:59 -0400 Received: from cotinga.riseup.net (cotinga-pn.riseup.net [10.0.1.164]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id EFBC41A040D for ; Fri, 13 Jul 2018 08:27:56 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by cotinga.riseup.net with ESMTPSA id 5C780CBA69 for ; Fri, 13 Jul 2018 08:27:56 -0700 (PDT) Date: Fri, 13 Jul 2018 10:27:52 -0500 From: "Jovany Leandro G.C" Message-ID: <20180713102630.2bd81dfe@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32145@debbugs.gnu.org =46rom 452650b0d1cce1f81363aa3b2edbc47d2bbfc855 Mon Sep 17 00:00:00 2001 From: "Jovany Leandro G.C" Date: Fri, 13 Jul 2018 10:19:58 -0500 Subject: [PATCH] gnu: twinkle: Add missing headers * gnu/packages/patches/twinkle-include-qregexpvalidator-explicity.patch: New file. --- ...e-include-qregexpvalidator-explicity.patch | 123 ++++++++++++++++++ gnu/packages/telephony.scm | 1 + 2 files changed, 124 insertions(+) create mode 100755 gnu/packages/patches/twinkle-include-qregexpvalidator-e= xplicity.patch diff --git a/gnu/packages/patches/twinkle-include-qregexpvalidator-explicit= y.patch b/gnu/packages/patches/twinkle-include-qregexpvalidator-explicity.p= atch new file mode 100755 index 000000000..8b459425a --- /dev/null +++ b/gnu/packages/patches/twinkle-include-qregexpvalidator-explicity.patch @@ -0,0 +1,123 @@ +Copied from uptsream: + +https://github.com/LubosD/twinkle/commit/4b42755619011c117a76bdf98e417ebed= c47e319 + +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/diamondcardprofi= leform.cpp +index 6656909..517180b 100644 +--- a/src/gui/diamondcardprofileform.cpp ++++ b/src/gui/diamondcardprofileform.cpp +@@ -21,6 +21,7 @@ +=20 + #include + #include ++#include + #include "gui.h" + #include "diamondcard.h" + #include "getprofilenameform.h" +diff --git a/src/gui/getprofilenameform.cpp b/src/gui/getprofilenameform.c= pp +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" +=20 +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 +=20 + /* + 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/numberconversionfo= rm.cpp +index f8ae64c..8481a9b 100644 +--- a/src/gui/numberconversionform.cpp ++++ b/src/gui/numberconversionform.cpp +@@ -1,5 +1,6 @@ + #include "numberconversionform.h" +=20 ++#include + #include "gui.h" +=20 + /* +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" +=20 + #define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP = calls)") +--=20 +2.17.0 + diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 246d85901..df5750c62 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -485,6 +485,7 @@ Mumble consists of two applications for separate usage: (uri (git-reference (url "https://github.com/LubosD/twinkle") (commit commit))) + (patches (search-patches "twinkle-include-qregexpvalidator-ex= plicity.patch")) (file-name (git-file-name name version)) (sha256 (base32 --=20 2.17.0