Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Jan 2012 21:28:50 +0100 (CET)
From:      Nikola Lecic <nikola.lecic@anthesphoria.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/163899: [Maintainer] textproc/ibus-kmfl: Fix build with ibus-1.4.0
Message-ID:  <201201072028.q07KSodI089072@anthesphoria.net>
Resent-Message-ID: <201201072150.q07Lo76E005927@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         163899
>Category:       ports
>Synopsis:       [Maintainer] textproc/ibus-kmfl: Fix build with ibus-1.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 07 21:50:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Nikola Lecic
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:

System: FreeBSD tundra 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Feb 26 10:23:40 UTC 2010 nikola@tundra...:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

This PR depends on ports/163791 (ibus update to 1.4.0).

Log:
* Unbreak ibus-kmfl build with new ibus-1.4.0.
* New file: files/patch-src-main.c.

>How-To-Repeat:
	
>Fix:

--- ibus-kmfl-1.0.3_2.patch begins here ---

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/ibus-kmfl/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	23 Sep 2011 22:25:43 -0000	1.4
+++ Makefile	6 Jan 2012 10:40:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	ibus-kmfl
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/kmfl/${PORTNAME}/${PORTVERSION} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -16,7 +16,7 @@
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL IMEngine for IBus framework
 
-LIB_DEPENDS=	ibus.2:${PORTSDIR}/textproc/ibus \
+LIB_DEPENDS=	ibus-1.0.400:${PORTSDIR}/textproc/ibus \
 		kmfl.0:${PORTSDIR}/textproc/libkmfl \
 		kmflcomp.0:${PORTSDIR}/textproc/kmflcomp
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
Index: files/patch-src-main.c
===================================================================
RCS file: files/patch-src-main.c
diff -N files/patch-src-main.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-main.c	6 Jan 2012 18:37:41 -0000
@@ -0,0 +1,11 @@
+--- src/main.c	2010-05-05 01:49:36.000000000 +0400
++++ src/main.c	2012-01-06 21:36:53.000000000 +0300
+@@ -51,7 +51,7 @@
+     engines = ibus_component_get_engines (component);
+     for (p = engines; p != NULL; p = p->next) {
+         IBusEngineDesc *engine = (IBusEngineDesc *)p->data;
+-        ibus_factory_add_engine (factory, engine->name, IBUS_TYPE_KMFL_ENGINE);
++        ibus_factory_add_engine (factory, ibus_engine_desc_get_name (engine), IBUS_TYPE_KMFL_ENGINE);
+     }
+ 
+     if (ibus) {
--- ibus-kmfl-1.0.3_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201072028.q07KSodI089072>