[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=04046fb

The following commit has been merged in the master branch:
commit 04046fb1d24663bdd207f68157f23616d3fcb5a5
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 26 19:33:17 2017 +0200

    use the proper C compiler when building assembler sources
    
    backport upstream r1203426
---
 debian/changelog             |  2 ++
 debian/patches/r1203426.diff | 17 +++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4419121..4f82821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qimageblitz (1:0.0.6-5~) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Update Vcs-* fields.
+  * Backport upstream r1203426 to use the proper C compiler when building
+    assembler sources; patch r1203426.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Aug 2015 11:38:20 +0200
 
diff --git a/debian/patches/r1203426.diff b/debian/patches/r1203426.diff
new file mode 100644
index 0000000..29a0835
--- /dev/null
+++ b/debian/patches/r1203426.diff
@@ -0,0 +1,17 @@
+Author: Pavel Heimlich <tropikhajma at gmail.com>
+Description: use the autodetected CMAKE_C_COMPILER instead of hardwired gcc. fixes build with compilers other than gcc
+Bug-Debian: https://bugs.debian.org/839283
+Applied-Upstream: commit:1203426
+
+diff --git a/blitz/CMakeLists.txt b/trunk/kdesupport/blitz/CMakeLists.txt
+--- a/blitz/CMakeLists.txt	(revision 1203425)
++++ b/blitz/CMakeLists.txt	(revision 1203426)
+@@ -33,7 +33,7 @@
+     if(NOT APPLE AND NOT WIN32)
+         set( blitz_LIB_SRCS ${blitz_LIB_SRCS} asm_scale.S )
+         add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o
+-            COMMAND gcc -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
++            COMMAND ${CMAKE_C_COMPILER} -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
+             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S )
+         set( blitz_LIB_EXTRA_SRCS ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o )
+         set(HAVE_EXTERNAL_ASM TRUE)
diff --git a/debian/patches/series b/debian/patches/series
index 2b59611..57d3cf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 11_.gnu.note.diff
 12_remove_FindQt4.cmake.diff
 13_disable_usr_lib_rpath.diff
+r1203426.diff

-- 
QImageBlitz packaging