[SCM] QImageBlitz packaging branch, master, updated. debian/0.0.6-4-12-g17b9753

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qimageblitz.git;a=commitdiff;h=1b6ddb8

The following commit has been merged in the master branch:
commit 1b6ddb8079960e631268edc17b0fa0464f281e6f
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 26 19:41:18 2017 +0200

    fix build
    
    backport upstream r1286623
---
 debian/changelog             |  2 ++
 debian/patches/r1286623.diff | 16 ++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e94bcca..40635bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qimageblitz (1:0.0.6-5~) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * Backport upstream r1203426 to use the proper C compiler when building
     assembler sources; patch r1203426.diff.
+  * Backport upstream r1286623 to fix build with newer/different C++
+    compilers; patch r1286623.diff.
 
   [ Helmut Grohne ]
   * Fix build/host confusion in rules. (Closes: #839283)
diff --git a/debian/patches/r1286623.diff b/debian/patches/r1286623.diff
new file mode 100644
index 0000000..b7c5876
--- /dev/null
+++ b/debian/patches/r1286623.diff
@@ -0,0 +1,16 @@
+Author: Christoph Feck <cfeck at kde.org>
+Description: Fix return value (wrong type)
+Applied-Upstream: commit:1286623
+
+diff --git a/blitz/convolve.cpp b/trunk/kdesupport/blitz/convolve.cpp
+--- a/blitz/convolve.cpp	(revision 1286622)
++++ b/blitz/convolve.cpp	(revision 1286623)
+@@ -940,7 +940,7 @@
+     long i;
+ 
+     if(sigma == 0.0)
+-        return(false);
++        return(0);
+     if(kernel_width == 0)
+         kernel_width = 3;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 57d3cf1..4d222bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 12_remove_FindQt4.cmake.diff
 13_disable_usr_lib_rpath.diff
 r1203426.diff
+r1286623.diff

-- 
QImageBlitz packaging