From patchwork Sun Sep 1 10:52:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jovany Leandro G.C" X-Patchwork-Id: 15200 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 896DD172FE; Sun, 1 Sep 2019 16:51:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 211F5172F0 for ; Sun, 1 Sep 2019 16:51:13 +0100 (BST) Received: from localhost ([::1]:58352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4S8G-0000R4-HG for patchwork@mira.cbaines.net; Sun, 01 Sep 2019 11:51:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4S88-0000Pd-AN for guix-patches@gnu.org; Sun, 01 Sep 2019 11:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4S86-0001Tw-Qt for guix-patches@gnu.org; Sun, 01 Sep 2019 11:51:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48261) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4S86-0001Tr-OC for guix-patches@gnu.org; Sun, 01 Sep 2019 11:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4S86-0001HT-LJ for guix-patches@gnu.org; Sun, 01 Sep 2019 11:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37255] [PATCH] gnu: twinkle: update to 1.10.2. Resent-From: "Jovany Leandro G.C" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Sep 2019 15:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37255 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37255@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15673530254875 (code B ref -1); Sun, 01 Sep 2019 15:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Sep 2019 15:50:25 +0000 Received: from localhost ([127.0.0.1]:57082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4S7V-0001GY-9B for submit@debbugs.gnu.org; Sun, 01 Sep 2019 11:50:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:35020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4S7T-0001GR-Cy for submit@debbugs.gnu.org; Sun, 01 Sep 2019 11:50:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50596) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4S7N-0000EN-TZ for guix-patches@gnu.org; Sun, 01 Sep 2019 11:50:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4S7M-0000zG-1r for guix-patches@gnu.org; Sun, 01 Sep 2019 11:50:17 -0400 Received: from mx1.riseup.net ([198.252.153.129]:56918) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i4S7L-0000xg-Mb for guix-patches@gnu.org; Sun, 01 Sep 2019 11:50:15 -0400 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (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 3D09A1A11A4 for ; Sun, 1 Sep 2019 08:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1567353014; bh=02ETBXgn6lc5R6i10bHpWa4FDuBNCBg/wfLa+JecA0o=; h=From:To:Cc:Subject:Date:From; b=EMosRd3HOCbDM/5tFmFXXT0RZy75CLgU0mZ5DpdRVPtAWUOSy+M64t85lGE1fF2HJ IuEzPIO9fwqjOmWEg22kxx92G8OYaOHBkF98v67HJFC5oDbKlHIIkruVL+qRu07pbn sIOczqWWRPxenrKZ02J5sw6nL9Z5POffGrsLHh3Y= X-Riseup-User-ID: 6DA49CFA13665D81095CBF3E8D4332B7FBE013B14FFACB0F0582AEEAC87594DF Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 93F04220B5A; Sun, 1 Sep 2019 08:50:13 -0700 (PDT) From: "Jovany Leandro G.C" Date: Sun, 1 Sep 2019 05:52:09 -0500 Message-Id: <20190901105209.8014-1-bit4bit@riseup.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jovany Leandro G.C" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. --- gnu/local.mk | 1 - .../twinkle-include-qregexpvalidator.patch | 123 ------------------ gnu/packages/telephony.scm | 8 +- 3 files changed, 3 insertions(+), 129 deletions(-) delete mode 100755 gnu/packages/patches/twinkle-include-qregexpvalidator.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c02b8510a..c1e5fc1483 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1362,7 +1362,6 @@ dist_patch_DATA = \ %D%/packages/patches/totem-meson-compat.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ - %D%/packages/patches/twinkle-include-qregexpvalidator.patch \ %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ %D%/packages/patches/unzip-CVE-2014-8139.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 - diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index cf37756503..c14ee1fe4a 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -491,22 +491,20 @@ Mumble consists of two applications for separate usage: license:bsd-2)))) (define-public twinkle - (let ((commit "02e1d1538af3337134bd7381dcd95f8d7775b30f") + (let ((commit "f01694469e873e4d3ef61ed1f9afd19135fafa69") (revision "1")) (package (name "twinkle") - (version (git-version "1.10.1" revision commit)) + (version (git-version "1.10.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/LubosD/twinkle") (commit commit))) - (patches - (search-patches "twinkle-include-qregexpvalidator.patch")) (file-name (git-file-name name version)) (sha256 (base32 - "0ds4rp4vr1wagn4m4m7ldqbsx5vgmgbfcqqgyhn1wf6s1dm0020z")))) + "0s0gi03xwvzp02ah4q6j33r9jx9nbayr6dxlg2ck9pwbay1nq1hx")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target