From ad949ef08ca08583091b4b998593be3af60f3a7b Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Tue, 18 Apr 2017 21:18:36 +0100
Subject: [PATCH] use repo version of gnu-libiconv rather than compile it

---
 Dockerfile | 24 +++++++-----------------
 README.md  |  1 +
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 42e01b1..4af8c3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,6 +58,10 @@ RUN \
 	uriparser-dev \
 	wget \
 	zlib-dev && \
+ apk add --no-cache --virtual=build-dependencies \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
+	gnu-libiconv-dev && \
+
 
 # add runtime dependencies required in build stage
  apk add --no-cache \
@@ -131,23 +135,6 @@ RUN \
  curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches && \
 
-# build libiconv
- mkdir -p \
- /tmp/iconv-src && \
- curl -o \
- /tmp/iconv.tar.gz -L \
-	ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz && \
- tar xf /tmp/iconv.tar.gz -C \
-	/tmp/iconv-src --strip-components=1 && \
- cd /tmp/iconv-src && \
- ./configure \
-	--prefix=/usr/local && \
- patch -p1 -i \
-	/tmp/patches/libiconv-1-fixes.patch && \
- make && \
- make install && \
- libtool --finish /usr/local/lib && \
-
 # build dvb-apps
  hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
  cd /tmp/dvb-apps && \
@@ -221,6 +208,9 @@ RUN \
 	libhdhomerun-libs \
 	libxml2 \
 	libxslt && \
+ apk add --no-cache \
+	--repository http://nl.alpinelinux.org/alpine/edge/testing \
+	gnu-libiconv && \
 
 # cleanup
  apk del --purge \
diff --git a/README.md b/README.md
index 004aa40..d2c2369 100644
--- a/README.md
+++ b/README.md
@@ -151,6 +151,7 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
++ **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
 + **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
 + **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
 + **07.02.2017:** Add variable to add additional runtime paramters.