From 048249f71d337274ce8cf1bcf698f700599f701d Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Mon, 3 May 2010 17:58:17 +0000
Subject: Build libparserutils (and NetSurf) against libiconv instead of
 newlib's iconv. This fixes the bug with lpu's iconv filter causing freezing
 on OS4 NetSurf.  With an appropriate font (eg. Bitstream Cyberbit) Japanese
 characters will now display. Test websites work, but proper Japanese websites
 cause an assert which may be caused by amiga/font.c incorrect text size
 calculations.

svn path=/trunk/netsurf/; revision=10546
---
 Docs/BUILDING-AmigaOS | 7 +++++--
 Makefile              | 3 +--
 Makefile.defaults     | 4 ++++
 amiga/pkg/makepackage | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS
index 6eb8a3bb4..ef9b40595 100644
--- a/Docs/BUILDING-AmigaOS
+++ b/Docs/BUILDING-AmigaOS
@@ -69,12 +69,15 @@
   
       1> gmake install
 
-  | Note: We advise enabling ivonv() support in libparserutils, which vastly
+  | Note: We advise enabling iconv() support in libparserutils, which vastly
   |       increases the number of supported character sets.  To do this,
   |       create a file called Makefile.config.override in the libparserutils
-  |       directory, containing the following line:
+  |       directory, containing the following lines:
   |
   |           CFLAGS += -DWITH_ICONV_FILTER
+  |           LDFLAGS += -liconv
+  |
+  |       This requires libiconv as iconv support in newlib.library is buggy.
   |
   |       For more information, consult the libparserutils README file.
 
diff --git a/Makefile b/Makefile
index 6e4c90ee0..29c41bdf9 100644
--- a/Makefile
+++ b/Makefile
@@ -517,14 +517,13 @@ ifeq ($(TARGET),amiga)
     $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
 
   CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga
-  LDFLAGS += -lxml2 -ldl -lcurl -lpthread -lregex -lauto
+  LDFLAGS += -lxml2 -ldl -lcurl -lpthread -lregex -liconv -lauto
   LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
 
   ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
     CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
     LDFLAGS += -use-dynld -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
     SUBTARGET := -cairo
-    EXETARGET := NetSurf_Cairo
   endif
 endif
 
diff --git a/Makefile.defaults b/Makefile.defaults
index 0fa7c2ead..e6f26b315 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -189,6 +189,10 @@ endif
 # ----------------------------------------------------------------------------
 ifeq ($(TARGET),amiga)
 
+  # Force using glibc internal iconv implementation instead of external libiconv
+  # Valid options: YES, NO
+  NETSURF_USE_LIBICONV_PLUG := NO
+
   # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
   # Valid options: YES, NO, AUTO
   NETSURF_USE_ROSPRITE := YES
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index b04d4196d..701847732 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -13,13 +13,13 @@ delete ram:netsurf/resources/options
 copy resources/Pointers/~(.svn) ram:NetSurf/Resources/Pointers
 copy (COPYING|ChangeLog) ram:NetSurf/
 copy NetSurf ram:NetSurf/NetSurf
-copy NetSurf_Cairo ram:NetSurf/NetSurf_Cairo
+copy NetSurf-Cairo ram:NetSurf/NetSurf-Cairo
 copy amiga/dist/AutoInstall ram:
 copy amiga/dist/~(.svn|AutoInstall) ram:NetSurf/
 copy amiga/pkg/fitr ram:NetSurf/
 makedir ram:NetSurf/Rexx
 copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
 makedir ram:NetSurf/SObjs
-copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 ram:NetSurf/SObjs clone
+copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libiconv.so ram:NetSurf/SObjs clone
 ;sobjs:libssl-0.9.8.so sobjs:libexpat.so sobjs:libpng14.so.14
 ;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so
\ No newline at end of file
-- 
cgit v1.2.3