Attachment #177562 for bug #214968

View | Details | Raw Unified | Return to bug 214968
Collapse All | Expand All

Lines 10-15 Link Here

(-)devel/m17n-lib/Makefile (-1 / +4 lines)
10	MAINTAINER= nikola.lecic@anthesphoria.net	10	MAINTAINER= nikola.lecic@anthesphoria.net
11	COMMENT= Library for the multilingual text handling	11	COMMENT= Library for the multilingual text handling
12		12
		13	LICENSE= LGPL21
		14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
13	BUILD_DEPENDS= bison:devel/bison \	16	BUILD_DEPENDS= bison:devel/bison \
14	m17n-db>=1.6.4:devel/m17n-db	17	m17n-db>=1.6.4:devel/m17n-db
15	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	18	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
Lines 22-28 Link Here
22	MAKE_JOBS_UNSAFE= yes	25	MAKE_JOBS_UNSAFE= yes
23		26
24	USES= autoreconf gettext-tools libtool pathfix pkgconfig	27	USES= autoreconf gettext-tools libtool pathfix pkgconfig
25	USE_XORG= ice sm x11 xaw xft xt	28	USE_XORG= ice sm x11 xaw xft xmu xrender xt
26	USE_GNOME= libxml2	29	USE_GNOME= libxml2
27	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
28	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes




--- src/input.c.orig	2014-11-28 22:57:48 UTC
+++ src/input.c
@@ -4264,7 +4264,7 @@ filter (MInputContext *ic, MSymbol key, 
   if (ic_info->commit_key_head > 0)
     {
       memmove (ic_info->keys, ic_info->keys + ic_info->commit_key_head,
-	       sizeof (int) * (ic_info->used - ic_info->commit_key_head));
+	       sizeof (MSymbol *) * (ic_info->used - ic_info->commit_key_head));
       ic_info->used -= ic_info->commit_key_head;
       ic_info->key_head -= ic_info->commit_key_head;
       ic_info->state_key_head -= ic_info->commit_key_head;
@@ -4278,7 +4278,7 @@ filter (MInputContext *ic, MSymbol key, 
       if (ic_info->key_head > 0)
 	{
 	  memmove (ic_info->keys, ic_info->keys + ic_info->key_head,
-		   sizeof (int) * (ic_info->used - ic_info->key_head));
+		   sizeof (MSymbol *) * (ic_info->used - ic_info->key_head));
 	  ic_info->used -= ic_info->key_head;
 	  ic_info->key_head = ic_info->state_key_head
 	    = ic_info->commit_key_head = 0;

Return to bug 214968

Line 0 Link Here

(-)devel/m17n-lib/files/patch-src_input.c (+20 lines)
	1	--- src/input.c.orig 2014-11-28 22:57:48 UTC
	2	+++ src/input.c
	3	@@ -4264,7 +4264,7 @@ filter (MInputContext *ic, MSymbol key,
	4	if (ic_info->commit_key_head > 0)
	5	{
	6	memmove (ic_info->keys, ic_info->keys + ic_info->commit_key_head,
	7	- sizeof (int) * (ic_info->used - ic_info->commit_key_head));
	8	+ sizeof (MSymbol ) (ic_info->used - ic_info->commit_key_head));
	9	ic_info->used -= ic_info->commit_key_head;
	10	ic_info->key_head -= ic_info->commit_key_head;
	11	ic_info->state_key_head -= ic_info->commit_key_head;
	12	@@ -4278,7 +4278,7 @@ filter (MInputContext *ic, MSymbol key,
	13	if (ic_info->key_head > 0)
	14	{
	15	memmove (ic_info->keys, ic_info->keys + ic_info->key_head,
	16	- sizeof (int) * (ic_info->used - ic_info->key_head));
	17	+ sizeof (MSymbol ) (ic_info->used - ic_info->key_head));
	18	ic_info->used -= ic_info->key_head;
	19	ic_info->key_head = ic_info->state_key_head
	20	= ic_info->commit_key_head = 0;