Provide an installable localcharset.h replacement.

4 files changed, 61 insertions, 1 deletions

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index b6a02c1..025c108 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -20,6 +20,9 @@
 # find . '(' -name Makefile.am ')' -prune -o -type f '!' '(' -name '*.orig' -or -name '*~' ')' -printf '%P\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = \
 lib/unicase.h.diff \
+lib/uniconv.h.diff \
 lib/unictype.h.diff \
+lib/unilbrk.h.diff \
 lib/unistr.h.diff \
-lib/unitypes.h.diff
+lib/unitypes.h.diff \
+lib/uniwidth.h.diff
diff --git a/gnulib-local/lib/uniconv.h.diff b/gnulib-local/lib/uniconv.h.diff
new file mode 100644
index 0000000..db6ac3d
--- /dev/null
+++ b/gnulib-local/lib/uniconv.h.diff
@@ -0,0 +1,19 @@
+*** uniconv.h.orig	2009-03-26 05:18:45.000000000 +0100
+--- uniconv.h	2009-04-10 22:39:33.000000000 +0200
+***************
+*** 29,35 ****
+  #include "striconveha.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  
+  #ifdef __cplusplus
+--- 29,35 ----
+  #include "striconveha.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "unistring-localcharset.h"
+  
+  
+  #ifdef __cplusplus
diff --git a/gnulib-local/lib/unilbrk.h.diff b/gnulib-local/lib/unilbrk.h.diff
new file mode 100644
index 0000000..aea376a
--- /dev/null
+++ b/gnulib-local/lib/unilbrk.h.diff
@@ -0,0 +1,19 @@
+*** unilbrk.h.orig	2008-05-10 14:46:17.000000000 +0200
+--- unilbrk.h	2009-04-10 22:39:40.000000000 +0200
+***************
+*** 24,30 ****
+  #include "unitypes.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  
+  #ifdef __cplusplus
+--- 24,30 ----
+  #include "unitypes.h"
+  
+  /* Get locale_charset() declaration.  */
+! #include "unistring-localcharset.h"
+  
+  
+  #ifdef __cplusplus
diff --git a/gnulib-local/lib/uniwidth.h.diff b/gnulib-local/lib/uniwidth.h.diff
new file mode 100644
index 0000000..80c9f89
--- /dev/null
+++ b/gnulib-local/lib/uniwidth.h.diff
@@ -0,0 +1,19 @@
+*** uniwidth.h.orig	2007-10-07 17:24:38.000000000 +0200
+--- uniwidth.h	2009-04-10 22:39:46.000000000 +0200
+***************
+*** 23,29 ****
+  #include <stddef.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include "localcharset.h"
+  
+  #ifdef __cplusplus
+  extern "C" {
+--- 23,29 ----
+  #include <stddef.h>
+  
+  /* Get locale_charset() declaration.  */
+! #include "unistring-localcharset.h"
+  
+  #ifdef __cplusplus
+  extern "C" {