[SCM] kmix packaging branch, master, updated. debian/16.08.0-1-9-g410c411

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ca2e567ae93f8c2104bfef26b79136b17d00013b
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jan 1 11:01:34 2018 +0100

    drop mips* workaround
---
 debian/changelog                                 |  3 +++
 debian/patches/mips-no-as-needed-workaround.diff | 25 ------------------------
 debian/patches/series                            |  1 -
 debian/rules                                     |  6 +-----
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68dfd7e..73aea8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ kmix (4:17.08.3-0r1) UNRELEASED; urgency=medium
     libkf5i18n-dev, libkf5kdelibs4support-dev, libkf5xmlgui-dev, and
     plasma-framework-dev.
   * Because of the above, use version 2 of class debian-qt-kde.mk.
+  * Remove workaround for mips* architectures, as it should be not needed
+    anymore (hopefully)
+    - remove patch mips-no-as-needed-workaround.diff
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Dec 2017 20:43:44 +0100
 
diff --git a/debian/patches/mips-no-as-needed-workaround.diff b/debian/patches/mips-no-as-needed-workaround.diff
deleted file mode 100644
index f180084..0000000
--- a/debian/patches/mips-no-as-needed-workaround.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 18 Aug 2016 19:37:14 +0200
-Subject: mips-no-as-needed-workaround
-
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3aee4d3..16e078c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,7 +30,11 @@ endif()
- 
- cmake_policy (SET CMP0046 OLD)
- 
--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 1b0073a..061ef34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 kmix_showeverywhere.diff
 kubuntu_cmake-policy.diff
-mips-no-as-needed-workaround.diff
diff --git a/debian/rules b/debian/rules
index 0eb94d2..06fd79e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,5 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/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 -DWITH_MIPS_BUILD:BOOL=$(MIPS_BUILD)
+	$(overridden_command) -- -DKMIX_KF5_BUILD=0

-- 
kmix packaging