Attachment #87165 for bug #123730

View | Details | Raw Unified | Return to bug 123730
Collapse All | Expand All




#

PORTNAME=	scim-uim
PORTVERSION=	0.2.0
PORTREVISION=	8
CATEGORIES=	japanese
MASTER_SITES=	SF \
		http://freedesktop.org/~suzhe/sources/

LIB_DEPENDS=	uim:${PORTSDIR}/textproc/uim
RUN_DEPENDS=	${BUILD_DEPENDS}

USE_AUTOTOOLS=	libtool:15
USE_GNOME=	lthack
USE_ICONV=	yes
USE_GMAKE=	yes


.include <bsd.port.pre.mk>

EXTRA_PATCHES=	${FILESDIR}/extra-patch-aa ${FILESDIR}/extra-patch-ab
.if ${OSVERSION} < 500035
IGNORE=		does not build on FreeBSD < 5.x
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
.else
CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
.endif

post-install:

Lines 1-3 Link Here

(-)scim-uim020/distinfo (-3 / +3 lines)
1	MD5 (scim-uim-0.1.4.tar.gz) = e4a1f7731a62ca8dd81c0204e5fb96d6	1	MD5 (scim-uim-0.2.0.tar.gz) = 3841556bc0e5a94b1a268751432712d3
2	SHA256 (scim-uim-0.1.4.tar.gz) = 44196eca4e7bbb7666dd9a7b410f0cf7a6392b9044d0c25e6752389c262fd4aa	2	SHA256 (scim-uim-0.2.0.tar.gz) = 457eb89f40dda70f813c0b401aaec8b397e7daa340d53136aba3b97407533e13
3	SIZE (scim-uim-0.1.4.tar.gz) = 329980	3	SIZE (scim-uim-0.2.0.tar.gz) = 344389

Lines 1-10 Link Here

(-)scim-uim020/files/extra-patch-4-stable (-10 lines)
1	--- src/scim_uim_imengine.cpp.orig Thu Nov 11 20:27:26 2004
2	+++ src/scim_uim_imengine.cpp Thu Nov 11 20:28:09 2004
3	@@ -36,6 +36,7 @@
4
5	#include <scim.h>
6	#include "scim_uim_imengine.h"
7	+#include <cstdio>
8
9	#define scim_module_init uim_LTX_scim_module_init
10	#define scim_module_exit uim_LTX_scim_module_exit




--- 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
 */




--- 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
 /*

Lines 1-10 Link Here

(-)scim-uim020/files/patch-src-Makefile.in (-10 lines)
1	--- src/Makefile.in.orig Wed Feb 8 11:53:06 2006
2	+++ src/Makefile.in Wed Feb 8 11:53:28 2006
3	@@ -211,7 +211,6 @@
4	uim_la_LDFLAGS = -avoid-version \
5	-rpath $(moduledir) \
6	-module \
7	- @LIBTOOL_EXPORT_OPTIONS@ \
8	@SCIM_LIBS@ \
9	@UIM_LIBS@
10

Return to bug 123730

Lines 6-13 Link Here

(-)scim-uim020/Makefile (-11 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= scim-uim	8	PORTNAME= scim-uim
9	PORTVERSION= 0.1.4	9	PORTVERSION= 0.2.0
10	PORTREVISION= 8
11	CATEGORIES= japanese	10	CATEGORIES= japanese
12	MASTER_SITES= SF \	11	MASTER_SITES= SF \
13	http://freedesktop.org/~suzhe/sources/	12	http://freedesktop.org/~suzhe/sources/
Lines 20-26 Link Here
20	LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim	19	LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim
21	RUN_DEPENDS= ${BUILD_DEPENDS}	20	RUN_DEPENDS= ${BUILD_DEPENDS}
22		21
23	USE_AUTOTOOLS= libtool:15
24	USE_GNOME= lthack	22	USE_GNOME= lthack
25	USE_ICONV= yes	23	USE_ICONV= yes
26	USE_GMAKE= yes	24	USE_GMAKE= yes
Lines 31-46 Link Here
31		29
32	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
33		31
34	EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa ${FILESDIR}/extra-patch-ab
35	.if ${OSVERSION} < 500035	32	.if ${OSVERSION} < 500035
36	BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport	33	IGNORE= does not build on FreeBSD < 5.x
37	RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
38	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/stlport" \
39	LDFLAGS="-L${LOCALBASE}/lib -lstlport_gcc -lintl ${PTHREAD_LIBS}"
40	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-4-stable
41	.else	34	.else
42	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \	35	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
43	LDFLAGS="-L${LOCALBASE}/lib -lintl"	36	LDFLAGS="-L${LOCALBASE}/lib"
44	.endif	37	.endif
45		38
46	post-install:	39	post-install:

Lines 1-42 Link Here

(-)scim-uim020/files/extra-patch-aa (-42 lines)
1	--- src/scim_uim_imengine.cpp.orig Mon Aug 8 12:08:34 2005
2	+++ src/scim_uim_imengine.cpp Mon Mar 26 17:12:57 2007
3	@@ -823,39 +823,6 @@
4	}
5	}
6
7	-void
8	-UIMInstance::uim_surrounding_text_request_cb (void *ptr)
9	-{
10	- UIMInstance this_ptr = static_cast <UIMInstance > (ptr);
11	- if (this_ptr) {
12	-
13	- SCIM_DEBUG_IMENGINE(2) << "uim_surrounding_text_request_cb.\n";
14	-
15	- WideString wstr;
16	- int cursor;
17	-
18	- if (this_ptr->get_surrounding_text (wstr, cursor)) {
19	- String str = utf8_wcstombs (wstr);
20	- uim_set_surrounding_text (this_ptr->m_uc, str.c_str (), cursor, wstr.length ());
21	- }
22	- }
23	-}
24	-
25	-int
26	-UIMInstance::uim_surrounding_text_delete_cb (void *ptr, int offset, int len)
27	-{
28	- UIMInstance this_ptr = static_cast <UIMInstance > (ptr);
29	- int ret = -1;
30	-
31	- if (this_ptr) {
32	- SCIM_DEBUG_IMENGINE(2) << "uim_surrounding_text_delete_cb.\n";
33	-
34	- if (this_ptr->delete_surrounding_text (offset, len))
35	- ret = 0;
36	- }
37	-
38	- return ret;
39	-}
40	/*
41	vi:ts=4:nowrap:ai:expandtab
42	*/

Lines 1-12 Link Here

(-)scim-uim020/files/extra-patch-ab (-12 lines)
1	--- src/scim_uim_imengine.h.orig Mon Mar 26 17:12:19 2007
2	+++ src/scim_uim_imengine.h Mon Mar 26 17:12:55 2007
3	@@ -104,9 +104,6 @@
4	static void uim_cand_select_cb (void *ptr, int index);
5	static void uim_cand_shift_page_cb (void *ptr, int dir);
6	static void uim_cand_deactive_cb (void *ptr);
7	-
8	- static void uim_surrounding_text_request_cb (void *ptr);
9	- static int uim_surrounding_text_delete_cb (void *ptr, int offset, int len);
10	};
11	#endif
12	/*