Date: Thu, 29 Mar 2007 09:43:24 GMT From: Seiya Yanagita<s_yanagita@ybb.ne.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/111005: [patch] japanese/scim-uim: remove obsoleted codes Message-ID: <200703290943.l2T9hOoE048166@www.freebsd.org> Resent-Message-ID: <200703290950.l2T9o7e4097151@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
+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 <UIMInstance *> (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 <UIMInstance *> (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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703290943.l2T9hOoE048166>