libport: Move the composition tables back to libwine and stop updating them.

libs/port/Makefile.in

@@ -2,8 +2,6 @@ STATICLIB = libwine_port.a
 
 C_SRCS = \
 	casemap.c \
-	compose.c \
-	decompose.c \
 	ffs.c \
 	fstatvfs.c \
 	getopt.c \

libs/wine/Makefile.in

@@ -67,10 +67,12 @@ C_SRCS = \
 	c_949.c \
 	c_950.c \
 	collation.c \
+	compose.c \
 	config.c \
 	cpsymbol.c \
 	cptable.c \
 	debug.c \
+	decompose.c \
 	digitmap.c \
 	fold.c \
 	ldt.c \

libs/port/compose.c → libs/wine/compose.c

@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "windef.h"
 
 static const WCHAR table[0x85e] =
@@ -403,3 +407,5 @@ WCHAR DECLSPEC_HIDDEN wine_compose( const WCHAR *str )
         count = table[2 * pos + 3];
     }
 }
+
+#endif /* __ASM_OBSOLETE */

libs/port/decompose.c → libs/wine/decompose.c

@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/Public/12.1.0/ucd/UCD.zip:UnicodeData.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "windef.h"
 
 const WCHAR DECLSPEC_HIDDEN nfd_table[6075] =
@@ -959,3 +963,5 @@ const WCHAR DECLSPEC_HIDDEN nfd_table[6075] =
     0x05ea, 0x05bc, 0x05d5, 0x05b9, 0x05d1, 0x05bf, 0x05db, 0x05bf,
     0x05e4, 0x05bf
 };
+
+#endif /* __ASM_OBSOLETE */

tools/make_unicode

@@ -2355,10 +2355,8 @@ chdir ".." if -f "./make_unicode";
 load_data();
 dump_case_mappings( "libs/port/casemap.c" );
 dump_sortkeys( "dlls/kernelbase/collation.c" );
-dump_compose_table( "libs/port/compose.c" );
 dump_compose_table( "dlls/ntdll/compose.c" );
 dump_compose_table( "dlls/kernelbase/compose.c" );
-dump_decompose_table( "libs/port/decompose.c", 0 );
 dump_decompose_table( "dlls/ntdll/decompose.c", 1 );
 dump_decompose_table( "dlls/kernelbase/decompose.c", 0 );
 dump_ctype_tables( "libs/port/wctype.c" );