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

[Pino Toscano]

Author: pino
Date: 2015-12-15 21:29:47 +0000 (Tue, 15 Dec 2015)
New Revision: 20167

Added:
   kde-extras/kphotoalbum/trunk/debian/patches/
   kde-extras/kphotoalbum/trunk/debian/patches/gcc5.diff
   kde-extras/kphotoalbum/trunk/debian/patches/series
Modified:
   kde-extras/kphotoalbum/trunk/debian/changelog
Log:
import NMU 4.5-1.1

for real, with patches


Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog	2015-12-15 21:27:32 UTC (rev 20166)
+++ kde-extras/kphotoalbum/trunk/debian/changelog	2015-12-15 21:29:47 UTC (rev 20167)
@@ -1,3 +1,10 @@
+kphotoalbum (4.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build with GCC 5 (Betty Dall). Closes: #777929.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 14 Jul 2015 18:28:03 +0200
+
 kphotoalbum (4.5-1) unstable; urgency=low
 
   * Team upload.

Added: kde-extras/kphotoalbum/trunk/debian/patches/gcc5.diff
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/gcc5.diff	                        (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/gcc5.diff	2015-12-15 21:29:47 UTC (rev 20167)
@@ -0,0 +1,22 @@
+Description: Initialize bool with false instead of nullptr
+GCC-5 compiler is giving an error for the initialziation of the variable
+m_pendiingRequest because nullptr is not a bool. Changing to false.
+ kphotoalbum (4.5-1.1) UNRELEASED; urgency=serious
+   * Non-maintainer upload.
+   * Fixing gcc-5 compile failure
+Author: Betty Dall <ejdall at m300-c8n1.hlinux.usa.hp.com>
+
+---
+
+--- kphotoalbum-4.5.orig/ImageManager/VideoThumbnails.cpp
++++ kphotoalbum-4.5/ImageManager/VideoThumbnails.cpp
+@@ -44,7 +44,7 @@ void ImageManager::VideoThumbnails::setV
+         return;
+ 
+     cancelPreviousJobs();
+-    m_pendingRequest = nullptr;
++    m_pendingRequest = false;
+     for ( int i= 0; i < 10; ++i )
+         m_cache[i] = QImage();
+ 
+

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-15 21:29:47 UTC (rev 20167)
@@ -0,0 +1 @@
+gcc5.diff