diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2006-06-15 09:51:39 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2006-06-15 09:51:39 +0000 |
| commit | 32b1abd4ae59f75d738e28a5138d0b5d206af6d5 (patch) | |
| tree | 9a4103d83a2cf23ff695fba438efd9e6892cec1e /chinese/fcitx/files | |
| parent | d10b20badbed8e845a1746b830436ec5758fd827 (diff) | |
| download | ports-32b1abd4ae59f75d738e28a5138d0b5d206af6d5.tar.gz ports-32b1abd4ae59f75d738e28a5138d0b5d206af6d5.zip | |
Notes
Diffstat (limited to 'chinese/fcitx/files')
| -rw-r--r-- | chinese/fcitx/files/patch-doc-Makefile.in | 16 | ||||
| -rw-r--r-- | chinese/fcitx/files/patch-src-ui.c | 29 | ||||
| -rw-r--r-- | chinese/fcitx/files/patch-xpm-Makefile.in | 16 |
3 files changed, 16 insertions, 45 deletions
diff --git a/chinese/fcitx/files/patch-doc-Makefile.in b/chinese/fcitx/files/patch-doc-Makefile.in index 9f2ef7cc148a..5428af110565 100644 --- a/chinese/fcitx/files/patch-doc-Makefile.in +++ b/chinese/fcitx/files/patch-doc-Makefile.in @@ -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 --git a/chinese/fcitx/files/patch-src-ui.c b/chinese/fcitx/files/patch-src-ui.c deleted file mode 100644 index f86dc9de1d62..000000000000 --- a/chinese/fcitx/files/patch-src-ui.c +++ /dev/null @@ -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 --git a/chinese/fcitx/files/patch-xpm-Makefile.in b/chinese/fcitx/files/patch-xpm-Makefile.in index 3ddad8792788..59ac0767cae4 100644 --- a/chinese/fcitx/files/patch-xpm-Makefile.in +++ b/chinese/fcitx/files/patch-xpm-Makefile.in @@ -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 |