Date: Wed, 14 Jun 2006 11:58:15 +0800 (CST) From: Dryice Liu <dryice@dryice.name> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98921: [maintainer] chinese/fcitx: update to 3.2 Message-ID: <200606140358.k5E3wFQp067720@readonline.info> Resent-Message-ID: <200606140400.k5E40Y46073078@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98921 >Category: ports >Synopsis: [maintainer] chinese/fcitx: update to 3.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 14 04:00:33 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dryice Liu >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD dryice.3322.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Thu Dec 1 15:59:44 CST 2005 >Description: - update to 3.2 - Removed files: files/patch-src-ui.c >How-To-Repeat: >Fix: --- attached file begins here --- diff -ruN fcitx.old/Makefile fcitx/Makefile --- fcitx.old/Makefile Thu May 4 08:35:06 2006 +++ fcitx/Makefile Wed Jun 14 10:56:33 2006 @@ -6,7 +6,7 @@ # PORTNAME= fcitx -PORTVERSION= 3.1.1 +PORTVERSION= 3.2 CATEGORIES= chinese x11 MASTER_SITES= http://www.fcitx.org/download/ \ http://dryice.name/computer/FreeBSD/distfiles/ @@ -21,6 +21,7 @@ USE_XLIB= yes USE_ICONV= yes GNU_CONFIGURE= yes +USE_GMAKE= yes post-patch: @${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' ${WRKSRC}/src/xim.c diff -ruN fcitx.old/distinfo fcitx/distinfo --- fcitx.old/distinfo Sun Jan 22 16:21:02 2006 +++ fcitx/distinfo Wed Jun 14 10:35:26 2006 @@ -1,3 +1,3 @@ -MD5 (fcitx-3.1.1.tar.bz2) = cd871c585dc260ebf48e2bdb5cbe596c -SHA256 (fcitx-3.1.1.tar.bz2) = 011863a2964e64b89f2eabf1f98bed2caf8201e4a998847ffff55098dc7dadaa -SIZE (fcitx-3.1.1.tar.bz2) = 2920856 +MD5 (fcitx-3.2.tar.bz2) = 36514e2b6b592b592c7d4fcbed82d78e +SHA256 (fcitx-3.2.tar.bz2) = e15d4a82c44cccaef623a8e20e502eb59abbbc8661936cee93b5b943ca3ccb8a +SIZE (fcitx-3.2.tar.bz2) = 4167299 diff -ruN fcitx.old/files/patch-doc-Makefile.in fcitx/files/patch-doc-Makefile.in --- fcitx.old/files/patch-doc-Makefile.in Wed Oct 27 23:25:11 2004 +++ fcitx/files/patch-doc-Makefile.in Wed Jun 14 10:43:32 2006 @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Wed Oct 27 22:57:42 2004 -+++ doc/Makefile.in Wed Oct 27 23:06:38 2004 -@@ -147,7 +147,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- 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 + doc_DATA = cjkvinput.txt wb_fh.htm fcitx3.pdf pinyin.txt + EXTRA_DIST = $(doc_DATA) diff -ruN fcitx.old/files/patch-src-ui.c fcitx/files/patch-src-ui.c --- fcitx.old/files/patch-src-ui.c Wed Mar 2 11:21:58 2005 +++ fcitx/files/patch-src-ui.c Thu Jan 1 08:00:00 1970 @@ -1,29 +0,0 @@ ---- 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; diff -ruN fcitx.old/files/patch-xpm-Makefile.in fcitx/files/patch-xpm-Makefile.in --- fcitx.old/files/patch-xpm-Makefile.in Wed Mar 2 11:21:58 2005 +++ fcitx/files/patch-xpm-Makefile.in Wed Jun 14 10:48:16 2006 @@ -1,11 +1,11 @@ ---- xpm/Makefile.in.orig Mon Jan 17 20:56:42 2005 -+++ xpm/Makefile.in Wed Feb 23 12:25:47 2005 -@@ -147,7 +147,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- xpm/Makefile.in.orig Tue Jun 6 22:17:38 2006 ++++ xpm/Makefile.in Wed Jun 14 10:47:39 2006 +@@ -90,7 +90,7 @@ + install_sh = @install_sh@ + mkdir_p = @mkdir_p@ + -xpmdir = $(pkgdatadir)/xpm -+xpmdir = ++xpmdir = xpm_DATA = EXTRA_DIST = $(xpm_DATA) - all: all-am + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -ruN fcitx.old/pkg-plist fcitx/pkg-plist --- fcitx.old/pkg-plist Wed Mar 2 11:21:58 2005 +++ fcitx/pkg-plist Wed Jun 14 11:19:09 2006 @@ -10,10 +10,12 @@ %%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%% --- attached file ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606140358.k5E3wFQp067720>