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

[Pino Toscano]

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

Added:
   kde-extras/kphotoalbum/trunk/debian/patches/
   kde-extras/kphotoalbum/trunk/debian/patches/series
   kde-extras/kphotoalbum/trunk/debian/patches/upstream_Fix-compilation-for-Ubuntu-15.04.patch
Modified:
   kde-extras/kphotoalbum/trunk/debian/changelog
Log:
add a missing forward declaration, fixing build

backport part of upstream commit d83730a934437f18e0406bddb244a7a9c497565c


Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog	2015-12-16 07:01:41 UTC (rev 20180)
+++ kde-extras/kphotoalbum/trunk/debian/changelog	2015-12-16 07:06:12 UTC (rev 20181)
@@ -1,5 +1,9 @@
 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.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 16 Dec 2015 08:00:51 +0100
 

Added: kde-extras/kphotoalbum/trunk/debian/patches/series
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/series	2015-12-16 07:06:12 UTC (rev 20181)
@@ -0,0 +1 @@
+upstream_Fix-compilation-for-Ubuntu-15.04.patch

Added: kde-extras/kphotoalbum/trunk/debian/patches/upstream_Fix-compilation-for-Ubuntu-15.04.patch
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/upstream_Fix-compilation-for-Ubuntu-15.04.patch	                        (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/upstream_Fix-compilation-for-Ubuntu-15.04.patch	2015-12-16 07:06:12 UTC (rev 20181)
@@ -0,0 +1,25 @@
+From d83730a934437f18e0406bddb244a7a9c497565c Mon Sep 17 00:00:00 2001
+From: Johannes Zarl <johannes at zarl.at>
+Date: Thu, 28 May 2015 19:49:52 +0200
+Subject: [PATCH] Fix compilation for Ubuntu 15.04.
+
+---
+ Plugins/ImageInfo.cpp   | 2 +-
+ Settings/BirthdayPage.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Settings/BirthdayPage.h b/Settings/BirthdayPage.h
+index e61d2fe..2fb5325 100644
+--- a/Settings/BirthdayPage.h
++++ b/Settings/BirthdayPage.h
+@@ -30,6 +30,7 @@ class QFont;
+ class QCalendarWidget;
+ class QPushButton;
+ class QTableWidgetItem;
++class QLabel;
+ 
+ // KDE classes
+ class KPageWidgetItem;
+-- 
+2.6.4
+