diff options
| author | Cheng-Lung Sung <clsung@FreeBSD.org> | 2005-03-02 03:21:58 +0000 |
|---|---|---|
| committer | Cheng-Lung Sung <clsung@FreeBSD.org> | 2005-03-02 03:21:58 +0000 |
| commit | c2574fcb07cce4647c17254af6522f0cfb786d50 (patch) | |
| tree | edc95515a6a8e7e63c97e723420c14f7c175bd5a /chinese/fcitx | |
| parent | - botan-1.4.4 does not build on perl5.005 (diff) | |
- update to 3.1
- new file: files/patch-xpm-Makefile.in
PR: ports/78267
Submitted by: Dryice Liu (maintainer)
Notes
Notes:
svn path=/head/; revision=130137
Diffstat (limited to 'chinese/fcitx')
| -rw-r--r-- | chinese/fcitx/Makefile | 2 | ||||
| -rw-r--r-- | chinese/fcitx/distinfo | 4 | ||||
| -rw-r--r-- | chinese/fcitx/files/patch-src-ui.c | 28 | ||||
| -rw-r--r-- | chinese/fcitx/files/patch-xpm-Makefile.in | 11 | ||||
| -rw-r--r-- | chinese/fcitx/pkg-plist | 1 |
5 files changed, 28 insertions, 18 deletions
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 472d75546b83..4314e3985253 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fcitx -PORTVERSION= 3.0.3 +PORTVERSION= 3.1 CATEGORIES= chinese x11 MASTER_SITES= http://www.fcitx.org/download/ \ http://bsdchat.com/dist/dryice/ diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo index bc91f4900840..6a54b9bee3b8 100644 --- a/chinese/fcitx/distinfo +++ b/chinese/fcitx/distinfo @@ -1,2 +1,2 @@ -MD5 (fcitx-3.0.3.tar.bz2) = 7c807617d36764e3c049dd500dc46a75 -SIZE (fcitx-3.0.3.tar.bz2) = 2567530 +MD5 (fcitx-3.1.tar.bz2) = 0b2f3908a1d7bcd0b12266da98bb42e0 +SIZE (fcitx-3.1.tar.bz2) = 2123900 diff --git a/chinese/fcitx/files/patch-src-ui.c b/chinese/fcitx/files/patch-src-ui.c index 247443582304..f86dc9de1d62 100644 --- a/chinese/fcitx/files/patch-src-ui.c +++ b/chinese/fcitx/files/patch-src-ui.c @@ -1,29 +1,29 @@ ---- src/ui.c.orig Wed Oct 27 23:19:07 2004 -+++ src/ui.c Wed Oct 27 23:20:59 2004 -@@ -339,7 +339,7 @@ +--- 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!=xftFont) -@@ -364,7 +364,7 @@ + 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'; ++ l1 = iconv (convUTF8, (const char**) &ps1, &l1, &ps2, &l2); + *ps2 = '\0'; - XftTextExtentsUtf8 (dpy, font, (FcChar8 *)str2, strlen (str2), &extents); -@@ -418,7 +418,7 @@ + XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str2, strlen (str2), &extents); +@@ -439,7 +439,7 @@ + l1 = strlen (str); l2 = 99; ps = strOutput; - -- l1 = iconv (convUTF8, (char **) (&str), &l1, &ps, &l2); -+ l1 = iconv (convUTF8, (const char **) (&str), &l1, &ps, &l2); - *ps='\0'; +- l1 = iconv (convUTF8, &str, &l1, &ps, &l2); ++ l1 = iconv (convUTF8, (const char**) &str, &l1, &ps, &l2); + *ps = '\0'; renderColor.red = color.red; diff --git a/chinese/fcitx/files/patch-xpm-Makefile.in b/chinese/fcitx/files/patch-xpm-Makefile.in new file mode 100644 index 000000000000..3ddad8792788 --- /dev/null +++ b/chinese/fcitx/files/patch-xpm-Makefile.in @@ -0,0 +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@ +-xpmdir = $(pkgdatadir)/xpm ++xpmdir = + xpm_DATA = + EXTRA_DIST = $(xpm_DATA) + all: all-am diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist index 910bf055c84e..238fe3e6f34c 100644 --- a/chinese/fcitx/pkg-plist +++ b/chinese/fcitx/pkg-plist @@ -5,7 +5,6 @@ bin/txt2mb %%DATADIR%%/data/cj.mb %%DATADIR%%/data/erbi.mb %%DATADIR%%/data/punc.mb -%%DATADIR%%/data/py.mb %%DATADIR%%/data/pySym.mb %%DATADIR%%/data/pybase.mb %%DATADIR%%/data/pyphrase.mb |