Attachment #67059 for bug #98921

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

Lines 6-12 Link Here

(-)fcitx/Makefile (-1 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= fcitx	8	PORTNAME= fcitx
9	PORTVERSION= 3.1.1	9	PORTVERSION= 3.2
10	CATEGORIES= chinese x11	10	CATEGORIES= chinese x11
11	MASTER_SITES= http://www.fcitx.org/download/ \	11	MASTER_SITES= http://www.fcitx.org/download/ \
12	http://dryice.name/computer/FreeBSD/distfiles/	12	http://dryice.name/computer/FreeBSD/distfiles/
Lines 21-26 Link Here
21	USE_XLIB= yes	21	USE_XLIB= yes
22	USE_ICONV= yes	22	USE_ICONV= yes
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
		24	USE_GMAKE= yes
24		25
25	post-patch:	26	post-patch:
26	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/src/xim.c	27	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/src/xim.c

Lines 1-3 Link Here

(-)fcitx/distinfo (-3 / +3 lines)
1	MD5 (fcitx-3.1.1.tar.bz2) = cd871c585dc260ebf48e2bdb5cbe596c	1	MD5 (fcitx-3.2.tar.bz2) = 36514e2b6b592b592c7d4fcbed82d78e
2	SHA256 (fcitx-3.1.1.tar.bz2) = 011863a2964e64b89f2eabf1f98bed2caf8201e4a998847ffff55098dc7dadaa	2	SHA256 (fcitx-3.2.tar.bz2) = e15d4a82c44cccaef623a8e20e502eb59abbbc8661936cee93b5b943ca3ccb8a
3	SIZE (fcitx-3.1.1.tar.bz2) = 2920856	3	SIZE (fcitx-3.2.tar.bz2) = 4167299




--- doc/Makefile.in.orig	Tue Jun  6 22:17:38 2006
+++ doc/Makefile.in	Wed Jun 14 10:42:58 2006
@@ -90,7 +90,7 @@
 install_sh = @install_sh@
 mkdir_p = @mkdir_p@
 
-docdir = $(pkgdatadir)/doc
+docdir = $(datadir)/doc/@PACKAGE@
 doc_DATA =          cjkvinput.txt wb_fh.htm fcitx3.pdf pinyin.txt
         cjkvinput.txt wb_fh.htm fcitx3.pdf
 
 EXTRA_DIST = $(doc_DATA)




--- src/ui.c.orig	Wed Feb 23 03:34:39 2005
+++ src/ui.c	Wed Mar  2 09:53:26 2005
@@ -361,7 +361,7 @@
     l2 = 99;
     ps = str1;
 
-    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
+    l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
     *ps = '\0';
     XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str1, strlen (str1), &extents);
     if (font == xftMainWindowFont)
@@ -386,7 +386,7 @@
     ps2 = str2;
     ps1 = str1;
 
-    l1 = iconv (convUTF8, &ps1, &l1, &ps2, &l2);
+    l1 = iconv (convUTF8, (const char**) &ps1, &l1, &ps2, &l2);
     *ps2 = '\0';
 
     XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str2, strlen (str2), &extents);
@@ -439,7 +439,7 @@
     l1 = strlen (str);
     l2 = 99;
     ps = strOutput;
-    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
+    l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
     *ps = '\0';
 
     renderColor.red = color.red;

Lines 1-11 Link Here

(-)fcitx/files/patch-xpm-Makefile.in (-8 / +8 lines)
1	--- xpm/Makefile.in.orig Mon Jan 17 20:56:42 2005	1	--- xpm/Makefile.in.orig Tue Jun 6 22:17:38 2006
2	+++ xpm/Makefile.in Wed Feb 23 12:25:47 2005	2	+++ xpm/Makefile.in Wed Jun 14 10:47:39 2006
3	@@ -147,7 +147,7 @@	3	@@ -90,7 +90,7 @@
4	sharedstatedir = @sharedstatedir@	4	install_sh = @install_sh@
5	sysconfdir = @sysconfdir@	5	mkdir_p = @mkdir_p@
6	target_alias = @target_alias@	6
7	-xpmdir = $(pkgdatadir)/xpm	7	-xpmdir = $(pkgdatadir)/xpm
8	+xpmdir =	8	+xpmdir =
9	xpm_DATA =	9	xpm_DATA =
10	EXTRA_DIST = $(xpm_DATA)	10	EXTRA_DIST = $(xpm_DATA)
11	all: all-am	11	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs




%%DATADIR%%/data/pyphrase.mb
%%DATADIR%%/data/sp.dat
%%DATADIR%%/data/tables.conf
%%DATADIR%%/data/vk.conf
%%DATADIR%%/data/wbx.mb
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
%%DOCSDIR%%/cjkvinput.txt
%%DOCSDIR%%/fcitx3.pdf
%%DOCSDIR%%/pinyin.txt
%%DOCSDIR%%/wb_fh.htm
@dirrm %%DOCSDIR%%

Return to bug 98921

Lines 1-11 Link Here

(-)fcitx/files/patch-doc-Makefile.in (-8 / +8 lines)
1	--- doc/Makefile.in.orig Wed Oct 27 22:57:42 2004	1	--- doc/Makefile.in.orig Tue Jun 6 22:17:38 2006
2	+++ doc/Makefile.in Wed Oct 27 23:06:38 2004	2	+++ doc/Makefile.in Wed Jun 14 10:42:58 2006
3	@@ -147,7 +147,7 @@	3	@@ -90,7 +90,7 @@
4	sharedstatedir = @sharedstatedir@	4	install_sh = @install_sh@
5	sysconfdir = @sysconfdir@	5	mkdir_p = @mkdir_p@
6	target_alias = @target_alias@	6
7	-docdir = $(pkgdatadir)/doc	7	-docdir = $(pkgdatadir)/doc
8	+docdir = $(datadir)/doc/@PACKAGE@	8	+docdir = $(datadir)/doc/@PACKAGE@
9	doc_DATA = \	9	doc_DATA = cjkvinput.txt wb_fh.htm fcitx3.pdf pinyin.txt
10	cjkvinput.txt wb_fh.htm fcitx3.pdf
11		10
		11	EXTRA_DIST = $(doc_DATA)

Lines 1-29 Link Here

(-)fcitx/files/patch-src-ui.c (-29 lines)
1	--- src/ui.c.orig Wed Feb 23 03:34:39 2005
2	+++ src/ui.c Wed Mar 2 09:53:26 2005
3	@@ -361,7 +361,7 @@
4	l2 = 99;
5	ps = str1;
6
7	- l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
8	+ l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
9	*ps = '\0';
10	XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str1, strlen (str1), &extents);
11	if (font == xftMainWindowFont)
12	@@ -386,7 +386,7 @@
13	ps2 = str2;
14	ps1 = str1;
15
16	- l1 = iconv (convUTF8, &ps1, &l1, &ps2, &l2);
17	+ l1 = iconv (convUTF8, (const char**) &ps1, &l1, &ps2, &l2);
18	*ps2 = '\0';
19
20	XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str2, strlen (str2), &extents);
21	@@ -439,7 +439,7 @@
22	l1 = strlen (str);
23	l2 = 99;
24	ps = strOutput;
25	- l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
26	+ l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2);
27	*ps = '\0';
28
29	renderColor.red = color.red;

Lines 10-19 Link Here

(-)fcitx/pkg-plist (+2 lines)
10	%%DATADIR%%/data/pyphrase.mb	10	%%DATADIR%%/data/pyphrase.mb
11	%%DATADIR%%/data/sp.dat	11	%%DATADIR%%/data/sp.dat
12	%%DATADIR%%/data/tables.conf	12	%%DATADIR%%/data/tables.conf
		13	%%DATADIR%%/data/vk.conf
13	%%DATADIR%%/data/wbx.mb	14	%%DATADIR%%/data/wbx.mb
14	@dirrm %%DATADIR%%/data	15	@dirrm %%DATADIR%%/data
15	@dirrm %%DATADIR%%	16	@dirrm %%DATADIR%%
16	%%DOCSDIR%%/cjkvinput.txt	17	%%DOCSDIR%%/cjkvinput.txt
17	%%DOCSDIR%%/fcitx3.pdf	18	%%DOCSDIR%%/fcitx3.pdf
		19	%%DOCSDIR%%/pinyin.txt
18	%%DOCSDIR%%/wb_fh.htm	20	%%DOCSDIR%%/wb_fh.htm
19	@dirrm %%DOCSDIR%%	21	@dirrm %%DOCSDIR%%