rev 20182 - in kde-extras/kphotoalbum/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2015-12-16 07:29:29 +0000 (Wed, 16 Dec 2015)
New Revision: 20182

Added:
   kde-extras/kphotoalbum/trunk/debian/patches/upstream_Add-missing-QMap-and-QDate-includes.patch
Modified:
   kde-extras/kphotoalbum/trunk/debian/changelog
   kde-extras/kphotoalbum/trunk/debian/patches/series
Log:
add missing includes, fixing build

backport upstream commit 8dafd2c36ae8ed71577e4ff3c7c7ade18f670e37


Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog	2015-12-16 07:06:12 UTC (rev 20181)
+++ kde-extras/kphotoalbum/trunk/debian/changelog	2015-12-16 07:29:29 UTC (rev 20182)
@@ -1,9 +1,11 @@
 kphotoalbum (4.6.2-2) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
-  * Backport part of upstream commit d83730a934437f18e0406bddb244a7a9c497565c
-    to add a missing forward declaration, fixing build; patch
-    upstream_Fix-compilation-for-Ubuntu-15.04.patch.
+  * Backport part of upstream commit d83730a934437f18e0406bddb244a7a9c497565c,
+    and upstream commit 8dafd2c36ae8ed71577e4ff3c7c7ade18f670e37, to add a
+    missing forward declaration and missing includes, fixing build; patches
+    upstream_Fix-compilation-for-Ubuntu-15.04.patch and
+    upstream_Add-missing-QMap-and-QDate-includes.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 16 Dec 2015 08:00:51 +0100
 

Modified: kde-extras/kphotoalbum/trunk/debian/patches/series
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/series	2015-12-16 07:06:12 UTC (rev 20181)
+++ kde-extras/kphotoalbum/trunk/debian/patches/series	2015-12-16 07:29:29 UTC (rev 20182)
@@ -1 +1,2 @@
 upstream_Fix-compilation-for-Ubuntu-15.04.patch
+upstream_Add-missing-QMap-and-QDate-includes.patch

Added: kde-extras/kphotoalbum/trunk/debian/patches/upstream_Add-missing-QMap-and-QDate-includes.patch
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/upstream_Add-missing-QMap-and-QDate-includes.patch	                        (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/upstream_Add-missing-QMap-and-QDate-includes.patch	2015-12-16 07:29:29 UTC (rev 20182)
@@ -0,0 +1,27 @@
+From 8dafd2c36ae8ed71577e4ff3c7c7ade18f670e37 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Wed, 16 Dec 2015 08:19:46 +0100
+Subject: [PATCH] Add missing QMap and QDate includes
+
+BirthdayPage has class members of these types, so we need to make sure
+their definition is available.
+---
+ Settings/BirthdayPage.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Settings/BirthdayPage.h b/Settings/BirthdayPage.h
+index 2fb5325..a738622 100644
+--- a/Settings/BirthdayPage.h
++++ b/Settings/BirthdayPage.h
+@@ -21,6 +21,8 @@
+ 
+ // Qt includes
+ #include <QWidget>
++#include <QMap>
++#include <QDate>
+ 
+ // Qt classes
+ class QLineEdit;
+-- 
+2.6.4
+