Date: Wed, 23 Feb 2005 12:40:49 +0800 From: Dryice Liu <dryice@hotpop.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Dryice Liu <dryice@liu.com.cn> Subject: ports/77948: [maintainer] chinese/fcitx: update to 3.0.4 Message-ID: <20050223044106.2F5DBE8804D@smtp-2.hotpop.com> Resent-Message-ID: <200502230450.j1N4oGR2011805@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77948 >Category: ports >Synopsis: [maintainer] chinese/fcitx: update to 3.0.4 >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 Feb 23 04:50:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Dryice Liu >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD dryice.3322.org 5.3-STABLE FreeBSD 5.3-STABLE #1: Tue Feb 1 21:29:03 CST 2005 >Description: Changes: - update to 3.0.4 - new file: files/patch-xpm-Makefile.in >How-To-Repeat: N/A >Fix: --- fcitx.diff begins here --- diff -ruN fcitx.old/Makefile fcitx/Makefile --- fcitx.old/Makefile Mon Jan 3 18:20:06 2005 +++ fcitx/Makefile Wed Feb 2 12:34:03 2005 @@ -6,7 +6,7 @@ # PORTNAME= fcitx -PORTVERSION= 3.0.3 +PORTVERSION= 3.0.4 CATEGORIES= chinese x11 MASTER_SITES= http://www.fcitx.org/download/ \ http://bsdchat.com/dist/dryice/ diff -ruN fcitx.old/distinfo fcitx/distinfo --- fcitx.old/distinfo Wed Dec 15 11:53:22 2004 +++ fcitx/distinfo Wed Feb 2 12:45:17 2005 @@ -1,2 +1,2 @@ -MD5 (fcitx-3.0.3.tar.bz2) = 7c807617d36764e3c049dd500dc46a75 -SIZE (fcitx-3.0.3.tar.bz2) = 2567530 +MD5 (fcitx-3.0.4.tar.bz2) = e139aebeb9eb45fb61204be18ed40114 +SIZE (fcitx-3.0.4.tar.bz2) = 2581392 diff -ruN fcitx.old/files/patch-src-ui.c fcitx/files/patch-src-ui.c --- fcitx.old/files/patch-src-ui.c Wed Oct 27 23:25:11 2004 +++ fcitx/files/patch-src-ui.c Wed Feb 2 12:55:59 2005 @@ -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 Jan 26 01:08:09 2005 ++++ src/ui.c Wed Feb 2 12:54:01 2005 +@@ -356,7 +356,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 != xftFont) +@@ -381,7 +381,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); +@@ -435,7 +435,7 @@ 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, (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 Thu Jan 1 08:00:00 1970 +++ fcitx/files/patch-xpm-Makefile.in Wed Feb 23 12:31:26 2005 @@ -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 --- fcitx.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050223044106.2F5DBE8804D>