libport: Move the collation table back to libwine and stop updating it.

libs/port/Makefile.in

@@ -75,7 +75,6 @@ C_SRCS = \
 	c_949.c \
 	c_950.c \
 	casemap.c \
-	collation.c \
 	compose.c \
 	cptable.c \
 	decompose.c \

libs/wine/Makefile.in

 EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS)
 
-
 C_SRCS = \
+	collation.c \
 	config.c \
 	cpsymbol.c \
 	debug.c \

libs/port/collation.c → libs/wine/collation.c

@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "windef.h"
 
 const unsigned int DECLSPEC_HIDDEN collation_table[11044] =
@@ -1391,3 +1395,5 @@ const unsigned int DECLSPEC_HIDDEN collation_table[11044] =
     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
     0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x09bf0111, 0x09c00111, 0xffffffff, 0xffffffff
 };
+
+#endif /* __ASM_OBSOLETE */

tools/make_unicode

@@ -2727,7 +2727,6 @@ sub REPLACE_IN_FILE($@)
 chdir ".." if -f "./make_unicode";
 load_data( $DEFAULTS );
 dump_case_mappings( "libs/port/casemap.c" );
-dump_sortkeys( "libs/port/collation.c" );
 dump_sortkeys( "dlls/kernelbase/collation.c" );
 dump_compose_table( "libs/port/compose.c" );
 dump_compose_table( "dlls/kernelbase/compose.c" );