Date: Fri, 16 May 2008 10:13:15 GMT From: Seiya Yanagita <s_yanagita@ybb.ne.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/123730: [PATCH] japanese/scim-uim : update to 0.2.0 Message-ID: <200805161013.m4GADF8T066284@www.freebsd.org> Resent-Message-ID: <200805161020.m4GAK1g9009023@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123730 >Category: ports >Synopsis: [PATCH] japanese/scim-uim : update to 0.2.0 >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: Fri May 16 10:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Seiya Yanagita >Release: 6.3-STABLE i386 >Organization: >Environment: FreeBSD vista.ybb.ne.jp 6.3-STABLE FreeBSD 6.3-STABLE #2: Thu Feb 21 14:54:56 JST 2008 s_yanagita@vista.ybb.ne.jp:/usr/src/sys/i386/compile/GENERIC i386 >Description: japanese/scim-uim update to 0.2.0 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -uwrN scim-uim/Makefile scim-uim020/Makefile --- scim-uim/Makefile Mon Apr 21 13:54:06 2008 +++ scim-uim020/Makefile Fri May 16 18:45:45 2008 @@ -6,8 +6,7 @@ # PORTNAME= scim-uim -PORTVERSION= 0.1.4 -PORTREVISION= 8 +PORTVERSION= 0.2.0 CATEGORIES= japanese MASTER_SITES= SF \ http://freedesktop.org/~suzhe/sources/ @@ -20,7 +19,6 @@ LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim RUN_DEPENDS= ${BUILD_DEPENDS} -USE_AUTOTOOLS= libtool:15 USE_GNOME= lthack USE_ICONV= yes USE_GMAKE= yes @@ -31,16 +29,11 @@ .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${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \ - LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}" -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-4-stable +IGNORE= does not build on FreeBSD < 5.x .else -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .endif post-install: diff -uwrN scim-uim/distinfo scim-uim020/distinfo --- scim-uim/distinfo Mon Jan 30 19:52:39 2006 +++ scim-uim020/distinfo Fri May 16 18:19:05 2008 @@ -1,3 +1,3 @@ -MD5 (scim-uim-0.1.4.tar.gz) = e4a1f7731a62ca8dd81c0204e5fb96d6 -SHA256 (scim-uim-0.1.4.tar.gz) = 44196eca4e7bbb7666dd9a7b410f0cf7a6392b9044d0c25e6752389c262fd4aa -SIZE (scim-uim-0.1.4.tar.gz) = 329980 +MD5 (scim-uim-0.2.0.tar.gz) = 3841556bc0e5a94b1a268751432712d3 +SHA256 (scim-uim-0.2.0.tar.gz) = 457eb89f40dda70f813c0b401aaec8b397e7daa340d53136aba3b97407533e13 +SIZE (scim-uim-0.2.0.tar.gz) = 344389 diff -uwrN scim-uim/files/extra-patch-4-stable scim-uim020/files/extra-patch-4-stable --- scim-uim/files/extra-patch-4-stable Wed Dec 1 01:25:27 2004 +++ scim-uim020/files/extra-patch-4-stable Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- src/scim_uim_imengine.cpp.orig Thu Nov 11 20:27:26 2004 -+++ src/scim_uim_imengine.cpp Thu Nov 11 20:28:09 2004 -@@ -36,6 +36,7 @@ - - #include <scim.h> - #include "scim_uim_imengine.h" -+#include <cstdio> - - #define scim_module_init uim_LTX_scim_module_init - #define scim_module_exit uim_LTX_scim_module_exit diff -uwrN scim-uim/files/extra-patch-aa scim-uim020/files/extra-patch-aa --- scim-uim/files/extra-patch-aa Fri Apr 6 01:47:00 2007 +++ scim-uim020/files/extra-patch-aa Thu Jan 1 09:00:00 1970 @@ -1,42 +0,0 @@ ---- 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 -uwrN scim-uim/files/extra-patch-ab scim-uim020/files/extra-patch-ab --- scim-uim/files/extra-patch-ab Fri Apr 6 01:47:00 2007 +++ scim-uim020/files/extra-patch-ab Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- 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 - /* diff -uwrN scim-uim/files/patch-src-Makefile.in scim-uim020/files/patch-src-Makefile.in --- scim-uim/files/patch-src-Makefile.in Wed Feb 8 20:03:51 2006 +++ scim-uim020/files/patch-src-Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- src/Makefile.in.orig Wed Feb 8 11:53:06 2006 -+++ src/Makefile.in Wed Feb 8 11:53:28 2006 -@@ -211,7 +211,6 @@ - uim_la_LDFLAGS = -avoid-version \ - -rpath $(moduledir) \ - -module \ -- @LIBTOOL_EXPORT_OPTIONS@ \ - @SCIM_LIBS@ \ - @UIM_LIBS@ - >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805161013.m4GADF8T066284>