[ncl] 04/07: Don't link against libiconv

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/6.4.0-1
in repository ncl.

commit 448cbaeb81a4d174f03586b15511c8ad0831c682
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Apr 19 09:13:05 2017 +0100

    Don't link against libiconv
---
 debian/patches/rm-iconv.patch | 19 +++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/rm-iconv.patch b/debian/patches/rm-iconv.patch
new file mode 100644
index 0000000..3567a5c
--- /dev/null
+++ b/debian/patches/rm-iconv.patch
@@ -0,0 +1,19 @@
+Index: ncl-6.4.0/config/Project
+===================================================================
+--- ncl-6.4.0.orig/config/Project
++++ ncl-6.4.0/config/Project
+@@ -246,12 +246,12 @@
+ #endif	/* PNGlib */
+ 
+ #ifndef CAIROlib
+-#define CAIROlib -lcairo -lXrender -lfontconfig -lpixman-1 -lfreetype -lexpat -lpng -lz -liconv -lbz2
++#define CAIROlib -lcairo -lXrender -lfontconfig -lpixman-1 -lfreetype -lexpat -lpng -lz  -lbz2
+ #endif
+ 
+ /* This should be same as CAIROlib except with no explicit paths */
+ #ifndef CAIROlibuser
+-#define CAIROlibuser -lcairo -lXrender -lfontconfig -lpixman-1 -lfreetype -lexpat -lpng -lz -liconv -lbz2
++#define CAIROlibuser -lcairo -lXrender -lfontconfig -lpixman-1 -lfreetype -lexpat -lpng -lz  -lbz2
+ #endif
+ 
+ #ifdef	BuildHDFEOS
diff --git a/debian/patches/series b/debian/patches/series
index 257fef8..c26c4b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ ncldriver.patch
 deblibs.patch
 reproducible.patch
 remove-jasper.patch
+rm-iconv.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ncl.git