[SCM] kgpg packaging branch, master, updated. debian/16.04.0-1-3-ge387782

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kgpg.git;a=commitdiff;h=9d8a2e1

The following commit has been merged in the master branch:
commit 9d8a2e1654788ec2b1d0b3747f60c4615046cfc1
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 4 09:04:19 2016 +0200

    fix a sporadic build failure
    
    backport upstream commit 3349d8a48ad1b957859a16643c912c4febec73b0
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  1 +
 ...e-QStringList-instead-of-fwd-declarations.patch | 32 ++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3401413..5b32b0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ kgpg (4:16.04.1-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Backport upstream commit 3349d8a48ad1b957859a16643c912c4febec73b0 to fix
+    a sporadic build failure; patch
+    upstream_include-QStringList-instead-of-fwd-declarations.patch.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Jun 2016 08:55:37 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d347207
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_include-QStringList-instead-of-fwd-declarations.patch
diff --git a/debian/patches/upstream_include-QStringList-instead-of-fwd-declarations.patch b/debian/patches/upstream_include-QStringList-instead-of-fwd-declarations.patch
new file mode 100644
index 0000000..6040b83
--- /dev/null
+++ b/debian/patches/upstream_include-QStringList-instead-of-fwd-declarations.patch
@@ -0,0 +1,32 @@
+From 3349d8a48ad1b957859a16643c912c4febec73b0 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 4 Jun 2016 08:56:46 +0200
+Subject: [PATCH] include <QStringList> instead of fwd declarations
+
+slotAddKey needs the full QStringList definition, a forward declaration
+is not enough
+---
+ model/kgpgsearchresultmodel.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/model/kgpgsearchresultmodel.h b/model/kgpgsearchresultmodel.h
+index d754b12..c1d327e 100644
+--- a/model/kgpgsearchresultmodel.h
++++ b/model/kgpgsearchresultmodel.h
+@@ -20,12 +20,10 @@
+ #define KGPGSEARCHRESULTMODEL_H
+ 
+ #include <QAbstractItemModel>
++#include <QStringList>
+ 
+ #include <kgpgcompiler.h>
+ 
+-class QString;
+-class QStringList;
+-
+ class KGpgSearchResultModelPrivate;
+ 
+ /**
+-- 
+2.8.1
+

-- 
kgpg packaging