From 76014364a112ca1a95d1a7a8700301c6a2f83e74 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Wed, 19 Nov 2008 18:57:02 +0000
Subject: Update patch

svn path=/trunk/iconv/; revision=5739
---
 unicode/unicode.jmb1.p | 65 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

diff --git a/unicode/unicode.jmb1.p b/unicode/unicode.jmb1.p
index 1cb2834..0be8490 100644
--- a/unicode/unicode.jmb1.p
+++ b/unicode/unicode.jmb1.p
@@ -4,7 +4,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/enc_utf8,v
 retrieving revision 1.9
 diff -u -r1.9 enc_utf8
 --- c/enc_utf8	10 Jun 2002 15:08:35 -0000	1.9
-+++ c/enc_utf8	19 Nov 2008 04:54:16 -0000
++++ c/enc_utf8	19 Nov 2008 18:55:18 -0000
 @@ -96,7 +96,7 @@
          }
          else
@@ -20,7 +20,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/encoding,v
 retrieving revision 1.39
 diff -u -r1.39 encoding
 --- c/encoding	26 Aug 2005 15:02:17 -0000	1.39
-+++ c/encoding	19 Nov 2008 04:54:17 -0000
++++ c/encoding	19 Nov 2008 18:55:19 -0000
 @@ -67,20 +67,20 @@
  static EncList enclist[] =
  {
@@ -62,7 +62,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/iso2022,v
 retrieving revision 1.19
 diff -u -r1.19 iso2022
 --- c/iso2022	25 Aug 2005 11:57:08 -0000	1.19
-+++ c/iso2022	19 Nov 2008 04:54:17 -0000
++++ c/iso2022	19 Nov 2008 18:55:19 -0000
 @@ -32,6 +32,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -252,7 +252,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/iso6937,v
 retrieving revision 1.1
 diff -u -r1.1 iso6937
 --- c/iso6937	25 Aug 2005 11:57:08 -0000	1.1
-+++ c/iso6937	19 Nov 2008 04:54:18 -0000
++++ c/iso6937	19 Nov 2008 18:55:20 -0000
 @@ -354,11 +354,13 @@
  
  static int iso6937_find_accent_pair(UCS4 u)
@@ -275,7 +275,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/johab,v
 retrieving revision 1.6
 diff -u -r1.6 johab
 --- c/johab	10 Jun 2002 15:08:35 -0000	1.6
-+++ c/johab	19 Nov 2008 04:54:18 -0000
++++ c/johab	19 Nov 2008 18:55:20 -0000
 @@ -116,10 +116,10 @@
              /* Hangul is --X */
              static const unsigned char final_only[28] =
@@ -339,7 +339,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/shiftjis,v
 retrieving revision 1.13
 diff -u -r1.13 shiftjis
 --- c/shiftjis	10 Jun 2002 15:08:35 -0000	1.13
-+++ c/shiftjis	19 Nov 2008 04:54:18 -0000
++++ c/shiftjis	19 Nov 2008 18:55:20 -0000
 @@ -173,7 +173,7 @@
          else
          {
@@ -378,7 +378,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/textconv,v
 retrieving revision 1.4
 diff -u -r1.4 textconv
 --- c/textconv	25 Aug 2005 11:57:08 -0000	1.4
-+++ c/textconv	19 Nov 2008 04:54:18 -0000
++++ c/textconv	19 Nov 2008 18:55:20 -0000
 @@ -67,8 +67,8 @@
  
  static int src_enc = csCurrent;
@@ -412,7 +412,7 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/unix,v
 retrieving revision 1.3
 diff -u -r1.3 unix
 --- c/unix	5 Mar 2004 18:16:24 -0000	1.3
-+++ c/unix	19 Nov 2008 04:54:18 -0000
++++ c/unix	19 Nov 2008 18:55:20 -0000
 @@ -33,6 +33,8 @@
  #include "layers_dbg.h"
  #endif
@@ -473,49 +473,64 @@ RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/ccsolaris/Makefil
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- ccsolaris/Makefile	25 Aug 2005 11:57:08 -0000	1.2
-+++ ccsolaris/Makefile	19 Nov 2008 04:54:18 -0000
-@@ -17,9 +17,13 @@
++++ ccsolaris/Makefile	19 Nov 2008 18:55:21 -0000
+@@ -17,9 +17,25 @@
  # 
  # Project:   Unicode
  
-+#GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-+
-+#CC=$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
- CC=gcc
-+HOST_CC=gcc
+-CC=gcc
++ifeq ($(findstring riscos,$(TARGET)),riscos)
++  GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
  
 -CCflags=-funsigned-char
-+CCflags=-funsigned-char -g -O0
++  CC = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
++
++  ifeq ($(findstring module,$(TARGET)),module)
++    PlatCCflags = -mmodule
++  endif
++
++  PlatObjs = riscos.o
++else
++  CC = gcc
++
++  PlatObjs = unix.o
++endif
++
++HOST_CC = gcc
++
++CCflags = -funsigned-char -g -O0 $(PlatCCflags)
  
  .c.o:;	$(CC) -c -DDEBUG=0 $(CCflags) -o $@ $<
  
-@@ -43,7 +47,8 @@
+@@ -43,7 +59,8 @@
  	enc_system.o \
  	acorn.o \
  	combine.o \
 -	unix.o
-+	unix.o \
-+	debug.o
++	debug.o \
++	$(PlatObjs)
  
  all:	ucodelib.a textconv
  
-@@ -53,6 +58,9 @@
- textconv: textconv.o ucodelib.a
- 	${CC} -o $@ textconv.o ucodelib.a
+@@ -51,7 +68,10 @@
+ 	${AR} r $@ $(Objects)
  
+ textconv: textconv.o ucodelib.a
+-	${CC} -o $@ textconv.o ucodelib.a
++	${CC} $(CCflags) -o $@ textconv.o ucodelib.a
++
 +mkunictype: mkunictype.c
 +	${HOST_CC} -o $@ $<
-+
+ 
  clean:
  	@-rm mkunictype textconv
- 	@-rm unictype.c
 Index: ccsolaris/mklinks
 ===================================================================
 RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/ccsolaris/mklinks,v
 retrieving revision 1.1
 diff -u -r1.1 mklinks
 --- ccsolaris/mklinks	12 Mar 1999 17:10:01 -0000	1.1
-+++ ccsolaris/mklinks	19 Nov 2008 04:54:18 -0000
++++ ccsolaris/mklinks	19 Nov 2008 18:55:21 -0000
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/bash
 +#!/bin/bash
-- 
cgit v1.2.3