From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vapier@gentoo.org>
X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.3
From: Mike Frysinger <vapier@gentoo.org>
Organization: wh0rd.org
To: kbd <kbd@lists.altlinux.org>
Date: Sun, 30 Mar 2008 13:19:31 -0400
User-Agent: KMail/1.9.7
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ku87HM0zVvPz2EQ"
Message-Id: <200803301319.32320.vapier@gentoo.org>
Subject: [kbd] [patch] fixup previous changes to loadunimap.c
X-BeenThere: kbd@lists.altlinux.org
X-Mailman-Version: 2.1.10b3
Precedence: list
Reply-To: Linux console tools development discussion <kbd@lists.altlinux.org>
List-Id: Linux console tools development discussion <kbd.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/kbd>,
	<mailto:kbd-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/kbd>
List-Post: <mailto:kbd@lists.altlinux.org>
List-Help: <mailto:kbd-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/kbd>,
	<mailto:kbd-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Mar 2008 17:16:04 -0000
Archived-At: <http://lore.altlinux.org/kbd/200803301319.32320.vapier@gentoo.org/>
List-Archive: <http://lore.altlinux.org/kbd/>

--Boundary-00=_ku87HM0zVvPz2EQ
Content-Type: multipart/signed;
  boundary="nextPart2464822.iQ8vvADZh4";
  protocol="application/pgp-signature";
  micalg=pgp-sha1
Content-Transfer-Encoding: 7bit

--nextPart2464822.iQ8vvADZh4
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

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

that shouldnt be an exclusive change, it should be both dirs.  the attached=
=20
patch fixes things.
=2Dmike

--nextPart2464822.iQ8vvADZh4
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)

iQIVAwUAR+/LpEFjO5/oN/WBAQL/eRAAjOX9SnoWUi5C95UmYO/C7G04RF4+5Z8Q
h1LWBiWIFjY4kkAyTtYj8OfW67rM2O2d7leuactMuePGlV6CIQfOXInAojIEH8EK
+q/9goebgkAOXcNsNLn/Iyuly3+BuDIvL1GqS5u22tYgDNk5+7I7d1pv1lbuW9p3
jaMSonJeKA0SU7YHR7Li4VKd29hEMjgMCSl3eRcuc467oFzDN5wkP37fFKst7Df7
rtmyC/BfQ9dpsAmyTSI9iukJXHoGx7miGQ0TbhLmsw0F9CsrNFOuEqWKmN82hQEC
3pPZ6BcYDcOViVp/2nUuSyT4WxFmMjlMCHFfYhhsIJ0l7JY00ppY3pkVYWl090LH
QbjbsChs7aSWGKIsOgI778LAsYo8DOoWcB90lc9U9ncfGrjR6lIwHc+Tem3wa+g+
j6nVntSiQ7apnn/vUouo9BRV89Q8aQYYcOhx/ueTnzm3WMFfd0G+Gruj7b1ZVOmV
HkMaNnTY8Xff72QWD/L42t/QIOMT0+v9L7mwija/KhjFvpE0DogFPhOC8OnJfvnF
BTVMaX5zYkqAbdOaTAuivjfWG0P+p+gUG7Kihzg9jlQJOvacZ7tGjhRYP0PYCHvp
iIbmgFVKwChAZt64BHqXD/JR8cHdVatKKXK5SQyNN3Ir8KxaDvZQkUc6UYmrZywM
npVUEQEEc4o=
=DzFT
-----END PGP SIGNATURE-----

--nextPart2464822.iQ8vvADZh4--

--Boundary-00=_ku87HM0zVvPz2EQ
Content-Type: text/x-diff;
  charset="us-ascii";
  name="kbd-1.12-unimap.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="kbd-1.12-unimap.patch"

--- 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

--Boundary-00=_ku87HM0zVvPz2EQ--