From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 29 09:50:08 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1DA2C16A408 for ; Thu, 29 Mar 2007 09:50:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 0070313C4BB for ; Thu, 29 Mar 2007 09:50:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2T9o771097152 for ; Thu, 29 Mar 2007 09:50:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2T9o7e4097151; Thu, 29 Mar 2007 09:50:07 GMT (envelope-from gnats) Resent-Date: Thu, 29 Mar 2007 09:50:07 GMT Resent-Message-Id: <200703290950.l2T9o7e4097151@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Seiya Yanagita Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 96AD016A400 for ; Thu, 29 Mar 2007 09:48:25 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 88ABB13C4AD for ; Thu, 29 Mar 2007 09:48:25 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l2T9mP4L049113 for ; Thu, 29 Mar 2007 09:48:25 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l2T9hOoE048166; Thu, 29 Mar 2007 09:43:24 GMT (envelope-from nobody) Message-Id: <200703290943.l2T9hOoE048166@www.freebsd.org> Date: Thu, 29 Mar 2007 09:43:24 GMT From: Seiya Yanagita To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/111005: [patch] japanese/scim-uim: remove obsoleted codes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2007 09:50:08 -0000 >Number: 111005 >Category: ports >Synopsis: [patch] japanese/scim-uim: remove obsoleted codes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Mar 29 09:50:07 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Seiya Yanagita >Release: 6.2-PRERELEASE >Organization: >Environment: FreeBSD vista.bbtec.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #3: Mon Oct 16 15:06:17 JST 2006 yana@vista.bbtec.net:/usr/src/sys/i386/compile/GENERIC i386 >Description: A japanese/scim-uim cannot compile because japanese/scim-uim uses some functions which were obsoleted in current version of uim. This patch removes some codes which use the obsoleted functions. As far as I investigated, these functions are not used anywhere. So I consider that a removal of the methods do not occur incompatibility. >How-To-Repeat: >Fix: diff -uPwr scim-uim.old/Makefile scim-uim/Makefile --- scim-uim.old/Makefile Tue Feb 13 13:27:18 2007 +++ scim-uim/Makefile Mon Mar 26 17:16:04 2007 @@ -32,12 +32,13 @@ .include +EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa ${FILESDIR}/extra-patch-ab .if ${OSVERSION} < 500035 BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/include/stlport" \ LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}" -EXTRA_PATCHES= ${FILESDIR}/extra-patch-4-stable +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-4-stable .else CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D__STDC_ISO_10646__" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" diff -uPwr scim-uim.old/files/extra-patch-aa scim-uim/files/extra-patch-aa --- scim-uim.old/files/extra-patch-aa Thu Jan 1 09:00:00 1970 +++ scim-uim/files/extra-patch-aa Mon Mar 26 17:16:10 2007 @@ -0,0 +1,42 @@ +--- src/scim_uim_imengine.cpp.orig Mon Aug 8 12:08:34 2005 ++++ src/scim_uim_imengine.cpp Mon Mar 26 17:12:57 2007 +@@ -823,39 +823,6 @@ + } + } + +-void +-UIMInstance::uim_surrounding_text_request_cb (void *ptr) +-{ +- UIMInstance *this_ptr = static_cast (ptr); +- if (this_ptr) { +- +- SCIM_DEBUG_IMENGINE(2) << "uim_surrounding_text_request_cb.\n"; +- +- WideString wstr; +- int cursor; +- +- if (this_ptr->get_surrounding_text (wstr, cursor)) { +- String str = utf8_wcstombs (wstr); +- uim_set_surrounding_text (this_ptr->m_uc, str.c_str (), cursor, wstr.length ()); +- } +- } +-} +- +-int +-UIMInstance::uim_surrounding_text_delete_cb (void *ptr, int offset, int len) +-{ +- UIMInstance *this_ptr = static_cast (ptr); +- int ret = -1; +- +- if (this_ptr) { +- SCIM_DEBUG_IMENGINE(2) << "uim_surrounding_text_delete_cb.\n"; +- +- if (this_ptr->delete_surrounding_text (offset, len)) +- ret = 0; +- } +- +- return ret; +-} + /* + vi:ts=4:nowrap:ai:expandtab + */ diff -uPwr scim-uim.old/files/extra-patch-ab scim-uim/files/extra-patch-ab --- scim-uim.old/files/extra-patch-ab Thu Jan 1 09:00:00 1970 +++ scim-uim/files/extra-patch-ab Mon Mar 26 17:16:10 2007 @@ -0,0 +1,12 @@ +--- src/scim_uim_imengine.h.orig Mon Mar 26 17:12:19 2007 ++++ src/scim_uim_imengine.h Mon Mar 26 17:12:55 2007 +@@ -104,9 +104,6 @@ + static void uim_cand_select_cb (void *ptr, int index); + static void uim_cand_shift_page_cb (void *ptr, int dir); + static void uim_cand_deactive_cb (void *ptr); +- +- static void uim_surrounding_text_request_cb (void *ptr); +- static int uim_surrounding_text_delete_cb (void *ptr, int offset, int len); + }; + #endif + /* >Release-Note: >Audit-Trail: >Unformatted: