[kbd] [patch] fixup previous changes to loadunimap.c

[kbd] [patch] fixup previous changes to loadunimap.c

[Mike Frysinger]

[-- Attachment #1.1: Type: text/plain, Size: 298 bytes --]

iirc, a Debian patch made the change to loadunimap.c:
-static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
+static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };

that shouldnt be an exclusive change, it should be both dirs.  the attached 
patch fixes things.
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: kbd-1.12-unimap.patch --]
[-- Type: text/x-diff, Size: 487 bytes --]

--- kbd-1.12/src/loadunimap.c.orig	2006-08-24 13:48:11.000000000 +0100
+++ kbd-1.12/src/loadunimap.c	2006-08-24 13:49:07.000000000 +0100
@@ -28,7 +28,7 @@
 extern char *progname;
 extern int force;
 
-static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
-static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };
+static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", DATADIR "/" TRANSDIR "/", 0 };
+static char *unisuffixes[] = { "", ".uni", ".sfm", 0 };

 #ifdef MAIN

Re: [kbd] [patch] fixup previous changes to loadunimap.c

[Alexey Gladkov]

Mike Frysinger wrote:
> iirc, a Debian patch made the change to loadunimap.c:
> -static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
> +static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
> 
> that shouldnt be an exclusive change, it should be both dirs.  the attached 
> patch fixes things.

Commit 1.12-21-g5f2bf61 was wrong. It should be fixed.
Only following change is needed for compatibility with console-tools:

-static char *unisuffixes[] = { "", ".uni", 0 };
+static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };

Thanks!

-- 
Rgrds, legion