svn commit: r428351 - in head/devel/m17n-lib: . files

[Thierry Thomas]

Author: thierry
Date: Sun Dec 11 15:14:01 2016
New Revision: 428351
URL: https://svnweb.freebsd.org/changeset/ports/428351

Log:
  Fix a transliteration with a patch from Mike Fabian.
  It has been approved by upstream, but a chunk is missing.
  
  See https://lists.nongnu.org/archive/html/m17n-list/2015-08/msg00001.html
  and https://bugzilla.redhat.com/show_bug.cgi?id=1256244
  
  PR:		214968
  Approved by:	maintainer
  Obtained from:	Mike Fabian

Added:
  head/devel/m17n-lib/files/patch-src_input.c   (contents, props changed)
Modified:
  head/devel/m17n-lib/Makefile

Modified: head/devel/m17n-lib/Makefile
==============================================================================
--- head/devel/m17n-lib/Makefile	Sun Dec 11 15:00:48 2016	(r428350)
+++ head/devel/m17n-lib/Makefile	Sun Dec 11 15:14:01 2016	(r428351)
@@ -3,13 +3,16 @@
 
 PORTNAME=	m17n-lib
 PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel textproc
 MASTER_SITES=	SAVANNAH/m17n
 
 MAINTAINER=	nikola.lecic at anthesphoria.net
 COMMENT=	Library for the multilingual text handling
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	bison:devel/bison \
 		m17n-db>=1.6.4:devel/m17n-db
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
@@ -22,7 +25,7 @@ RUN_DEPENDS=	m17n-db>=1.6.4:devel/m17n-d
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		autoreconf gettext-tools libtool pathfix pkgconfig
-USE_XORG=	ice sm x11 xaw xft xt
+USE_XORG=	ice sm x11 xaw xft xmu xrender xt
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

Added: head/devel/m17n-lib/files/patch-src_input.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/m17n-lib/files/patch-src_input.c	Sun Dec 11 15:14:01 2016	(r428351)
@@ -0,0 +1,20 @@
+--- 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;