From nl@anthesphoria.net  Sat Jan  7 21:44:23 2012
Return-Path: <nl@anthesphoria.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F023106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Jan 2012 21:44:23 +0000 (UTC)
	(envelope-from nl@anthesphoria.net)
Received: from anthesphoria.net (anthesphoria.net [204.109.61.206])
	by mx1.freebsd.org (Postfix) with ESMTP id 448AA8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Jan 2012 21:44:22 +0000 (UTC)
Received: from anthesphoria.net (anthesphoria.net [127.0.0.1] (may be forged))
	by anthesphoria.net (8.14.4/8.14.4) with ESMTP id q07KSoRf089073
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 7 Jan 2012 21:28:50 +0100 (CET)
	(envelope-from nl@anthesphoria.net)
Received: (from nl@localhost)
	by anthesphoria.net (8.14.4/8.14.4/Submit) id q07KSodI089072;
	Sat, 7 Jan 2012 21:28:50 +0100 (CET)
	(envelope-from nl)
Message-Id: <201201072028.q07KSodI089072@anthesphoria.net>
Date: Sat, 7 Jan 2012 21:28:50 +0100 (CET)
From: Nikola Lecic <nikola.lecic@anthesphoria.net>
Reply-To: Nikola Lecic <nikola.lecic@anthesphoria.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer] textproc/ibus-kmfl: Fix build with ibus-1.4.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         163899
>Category:       ports
>Synopsis:       [Maintainer] textproc/ibus-kmfl: Fix build with ibus-1.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 07 21:50:07 UTC 2012
>Closed-Date:    Sun Jan 08 18:02:08 UTC 2012
>Last-Modified:  Sun Jan 08 18:02:08 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun Jan 8 07:23:02 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163899 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/163899: commit references a PR
Date: Sun,  8 Jan 2012 08:12:39 +0000 (UTC)

 eadler      2012-01-08 08:12:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/ibus-kmfl   Makefile 
   Added files:
     textproc/ibus-kmfl/files patch-src-main.c 
   Log:
   * Unbreak ibus-kmfl build with new ibus-1.4.0.
   
   PR:             ports/163899
   Submitted by:   Nikola Lecic <nikola.lecic@anthesphoria.net> (maintainer)
   
   Revision  Changes    Path
   1.5       +2 -2      ports/textproc/ibus-kmfl/Makefile
   1.1       +11 -0     ports/textproc/ibus-kmfl/files/patch-src-main.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Sun Jan 8 18:02:07 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163899 
>Unformatted:
