Date: Thu, 14 Oct 2004 15:50:31 GMT From: Dryice Liu <dryice@hotpop.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/72371: 64 bits cleanup patches for fcitx 2.0.1 Message-ID: <200410141550.i9EFoVs2029068@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/72371; it has been noted by GNATS.
From: Dryice Liu <dryice@hotpop.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc: davidxu@FreeBSD.org
Subject: Re: ports/72371: 64 bits cleanup patches for fcitx 2.0.1
Date: Thu, 14 Oct 2004 23:46:08 +0800
Thanks for the patch. Maintainer approve.
Here's a clean-up version to make the ports committer's life easier :)
Added files:
files/patch-InputWindow.c
files/patch-ui.c
files/patch-xim.c
----------------------------------------------------------------------
diff -ruN fcitx.orig/files/patch-InputWindow.c fcitx/files/patch-InputWindo=
w.c
--- fcitx.orig/files/patch-InputWindow.c Thu Jan 1 08:00:00 1970
+++ fcitx/files/patch-InputWindow.c Thu Oct 14 23:22:24 2004
@@ -0,0 +1,20 @@
+--- InputWindow.c.orig Tue Dec 30 15:54:47 2003
++++ InputWindow.c Thu Oct 14 23:18:49 2004
+@@ -110,7 +110,7 @@
+ char str1[] =3D "Ay=D6=D0";
+ char str2[10];
+ char *ps1, *ps2;
+- int l1, l2;
++ size_t l1, l2;
+=20
+ if (!xftFont)
+ return;
+@@ -120,7 +120,7 @@
+ ps2 =3D str2;
+ ps1 =3D str1;
+=20
+- l1 =3D iconv (convUTF8, (char **) &ps1, &l1, &ps2, &l2);
++ l1 =3D iconv (convUTF8, (const char **) &ps1, &l1, &ps2, &l2);
+=20
+ XftTextExtentsUtf8 (dpy, xftFont, str2, strlen (str2), &extents);
+ iInputWindowHeight =3D extents.height * 2 + extents.height / 2 + 8;
diff -ruN fcitx.orig/files/patch-ui.c fcitx/files/patch-ui.c
--- fcitx.orig/files/patch-ui.c Thu Jan 1 08:00:00 1970
+++ fcitx/files/patch-ui.c Thu Oct 14 23:23:50 2004
@@ -0,0 +1,38 @@
+--- ui.c.orig Sun Jan 4 15:42:01 2004
++++ ui.c Thu Oct 14 23:20:27 2004
+@@ -284,7 +284,7 @@
+ XGlyphInfo extents;
+ char str1[100];
+ char *ps, *ps1;
+- int l1, l2;
++ size_t l1, l2;
+=20
+ if (!xftFont)
+ return 0;
+@@ -294,7 +294,7 @@
+ ps =3D str1;
+ ps1 =3D str;
+=20
+- l1 =3D iconv (convUTF8, (char **) &str, &l1, &ps, &l2);
++ l1 =3D iconv (convUTF8, (const char **) &str, &l1, &ps, &l2);
+ *ps =3D '\0';
+ XftTextExtentsUtf8 (dpy, xftFont, str1, strlen (str1), &extents);
+ return extents.width;
+@@ -323,7 +323,7 @@
+ void OutputString (Window window, char *str, int x, int y, XColor color)
+ {
+ char strOutput[100] =3D ""; //=B8=C3=B3=A4=B6=C8=D3=A6=B8=
=C3=B9=BB=D3=C3=C1=CB
+- int l1, l2;
++ size_t l1, l2;
+ char *ps;
+ XftColor xftColor;
+ XRenderColor renderColor;
+@@ -339,7 +339,7 @@
+ l2 =3D 99;
+ ps =3D strOutput;
+=20
+- l1 =3D iconv (convUTF8, (char **) (&str), &l1, &ps, &l2);
++ l1 =3D iconv (convUTF8, (const char **) (&str), &l1, &ps, &l2);
+=20
+ renderColor.red =3D color.red;
+ renderColor.green =3D color.green;
diff -ruN fcitx.orig/files/patch-xim.c fcitx/files/patch-xim.c
--- fcitx.orig/files/patch-xim.c Thu Jan 1 08:00:00 1970
+++ fcitx/files/patch-xim.c Thu Oct 14 23:22:53 2004
@@ -0,0 +1,11 @@
+--- xim.c.orig Tue Jan 6 14:12:11 2004
++++ xim.c Thu Oct 14 23:21:07 2004
+@@ -336,7 +336,7 @@
+ char *ps;
+=20
+ if (bIsUtf8) {
+- int l1, l2;
++ size_t l1, l2;
+=20
+ ps =3D strOutput;
+ l1 =3D strlen (strHZ);
----------------------------------------------------------------------
--=20
Cheers,
Dryice
http://dryice.3322.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410141550.i9EFoVs2029068>