[SCM] kmix packaging branch, master, updated. debian/16.04.1-1-5-g6bd68ba

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kmix.git;a=commitdiff;h=dc3c638

The following commit has been merged in the master branch:
commit dc3c638a3f184da68af6b2cf4636b2b4ad61d44c
Author: Jurica Stanojkovic <Jurica.Stanojkovic at imgtec.com>
Date:   Sun Jun 5 17:02:58 2016 +0200

    Fix assertion fail error on mips
    
    Closes: 799992
    Thanks: Chris Lamb for the report and Jurica Stanojkovic for the patch
---
 debian/patches/mips-no-as-needed-workaround.diff | 15 +++++++++++++++
 debian/patches/series                            |  1 +
 debian/rules                                     |  6 +++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/patches/mips-no-as-needed-workaround.diff b/debian/patches/mips-no-as-needed-workaround.diff
new file mode 100644
index 0000000..d911508
--- /dev/null
+++ b/debian/patches/mips-no-as-needed-workaround.diff
@@ -0,0 +1,15 @@
+--- kmix-15.08.1.orig/CMakeLists.txt
++++ kmix-15.08.1/CMakeLists.txt
+@@ -29,7 +29,11 @@ if(POLICY CMP0046)
+   cmake_policy (SET CMP0046 NEW)
+ endif()
+ 
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++
++if (WITH_MIPS_BUILD)
++   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed")
++endif(WITH_MIPS_BUILD)
+ 
+ if (KMIX_KF5_BUILD)
+ 	find_package(ECM 5.10.0 REQUIRED NO_MODULE)
diff --git a/debian/patches/series b/debian/patches/series
index 061ef34..1b0073a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kmix_showeverywhere.diff
 kubuntu_cmake-policy.diff
+mips-no-as-needed-workaround.diff
diff --git a/debian/rules b/debian/rules
index e1cbcf1..28a5d97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,9 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+MIPS_BUILD = OFF
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel mips64 mips64el))
+  MIPS_BUILD = ON
+endif
 override_dh_auto_configure:
-	$(overridden_command) -- -DKMIX_KF5_BUILD=0
+	$(overridden_command) -- -DKMIX_KF5_BUILD=0 -DWITH_MIPS_BUILD:BOOL=$(MIPS_BUILD)

-- 
kmix packaging