Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13289
Modified Files:
kinput2.macim.info kinput2.macim.patch
Log Message:
"static void foo()" in a function is illegal. Place it in file scope.
Index: kinput2.macim.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/kinput2.macim.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.macim.patch 27 Apr 2005 03:26:49 -0000 1.1
+++ kinput2.macim.patch 3 May 2005 04:40:32 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nru kinput2-v3.1-macim-20040328.orig/Kinput2.conf
kinput2-v3.1-macim-20040328/Kinput2.conf
---- kinput2-v3.1-macim-20040328.orig/Kinput2.conf Tue Mar 30 04:28:31 2004
-+++ kinput2-v3.1-macim-20040328/Kinput2.conf Tue Mar 30 07:14:38 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/Kinput2.conf
kinput2-v3.1-macim-20040417/Kinput2.conf
+--- kinput2-v3.1-macim-20040417.orig/Kinput2.conf Tue May 3 02:12:41 2005
++++ kinput2-v3.1-macim-20040417/Kinput2.conf Tue May 3 02:14:22 2005
@@ -79,17 +79,17 @@
* If you have already installed Canna header files and libraries..
*/
@@ -24,9 +24,9 @@
XCOMM SJ3 configuration
-diff -Nru kinput2-v3.1-macim-20040328.orig/cmd/Imakefile
kinput2-v3.1-macim-20040328/cmd/Imakefile
---- kinput2-v3.1-macim-20040328.orig/cmd/Imakefile Tue Mar 30 06:30:49 2004
-+++ kinput2-v3.1-macim-20040328/cmd/Imakefile Tue Mar 30 06:56:20 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/cmd/Imakefile
kinput2-v3.1-macim-20040417/cmd/Imakefile
+--- kinput2-v3.1-macim-20040417.orig/cmd/Imakefile Tue May 3 02:12:41 2005
++++ kinput2-v3.1-macim-20040417/cmd/Imakefile Tue May 3 02:14:22 2005
@@ -49,5 +49,5 @@
SRCS = kinput2.c
OBJS = kinput2.o
@@ -35,9 +35,9 @@
-InstallAppDefaults(Kinput2)
+ComplexProgramTargetNoMan(kinput2.macim)
+InstallAppDefaultsLong(Kinput2,Kinput2_macim)
-diff -Nru kinput2-v3.1-macim-20040328.orig/cmd/Kinput2.ad
kinput2-v3.1-macim-20040328/cmd/Kinput2.ad
---- kinput2-v3.1-macim-20040328.orig/cmd/Kinput2.ad Tue Mar 30 04:28:31 2004
-+++ kinput2-v3.1-macim-20040328/cmd/Kinput2.ad Tue Mar 30 06:57:58 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/cmd/Kinput2.ad
kinput2-v3.1-macim-20040417/cmd/Kinput2.ad
+--- kinput2-v3.1-macim-20040417.orig/cmd/Kinput2.ad Tue May 3 02:12:41 2005
++++ kinput2-v3.1-macim-20040417/cmd/Kinput2.ad Tue May 3 02:14:22 2005
@@ -5,9 +5,10 @@
!!
!! things you shouldn't change
@@ -61,9 +61,9 @@
! common to XimpProtocol and IMProtocol
*defaultFontList: -misc-fixed-medium-r-normal--14-*-*-*-c-*
*ConversionStartKeys: \
-diff -Nru kinput2-v3.1-macim-20040328.orig/cmd/kinput2.c
kinput2-v3.1-macim-20040328/cmd/kinput2.c
---- kinput2-v3.1-macim-20040328.orig/cmd/kinput2.c Tue Mar 30 04:28:31 2004
-+++ kinput2-v3.1-macim-20040328/cmd/kinput2.c Tue Mar 30 06:56:20 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/cmd/kinput2.c
kinput2-v3.1-macim-20040417/cmd/kinput2.c
+--- kinput2-v3.1-macim-20040417.orig/cmd/kinput2.c Tue May 3 02:12:41 2005
++++ kinput2-v3.1-macim-20040417/cmd/kinput2.c Tue May 3 02:14:22 2005
@@ -96,9 +96,9 @@
static String fallback_resources[] = {
@@ -86,9 +86,9 @@
options, XtNumber(options),
&ac, av,
fallback_resources, (ArgList)NULL, 0);
-diff -Nru kinput2-v3.1-macim-20040328.orig/copyright
kinput2-v3.1-macim-20040328/copyright
---- kinput2-v3.1-macim-20040328.orig/copyright Thu Jan 1 09:00:00 1970
-+++ kinput2-v3.1-macim-20040328/copyright Tue Mar 30 06:57:58 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/copyright
kinput2-v3.1-macim-20040417/copyright
+--- kinput2-v3.1-macim-20040417.orig/copyright Thu Jan 1 00:00:00 1970
++++ kinput2-v3.1-macim-20040417/copyright Tue May 3 02:14:22 2005
@@ -0,0 +1,22 @@
+/*
+ * kinput2
@@ -112,9 +112,9 @@
+ * [EMAIL PROTECTED]
+ */
+
-diff -Nru kinput2-v3.1-macim-20040328.orig/lib/Canna.c
kinput2-v3.1-macim-20040328/lib/Canna.c
---- kinput2-v3.1-macim-20040328.orig/lib/Canna.c Thu Oct 3 18:35:27 2002
-+++ kinput2-v3.1-macim-20040328/lib/Canna.c Tue Mar 30 06:59:18 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/lib/Canna.c
kinput2-v3.1-macim-20040417/lib/Canna.c
+--- kinput2-v3.1-macim-20040417.orig/lib/Canna.c Thu Oct 3 09:35:27 2002
++++ kinput2-v3.1-macim-20040417/lib/Canna.c Tue May 3 02:14:22 2005
@@ -61,6 +61,10 @@
#include "CannaP.h"
#include "DebugPrint.h"
@@ -154,9 +154,9 @@
if (nCannaContexts == 0) {
#ifdef KC_SETSERVERNAME
-diff -Nru kinput2-v3.1-macim-20040328.orig/lib/IMProto.c
kinput2-v3.1-macim-20040328/lib/IMProto.c
---- kinput2-v3.1-macim-20040328.orig/lib/IMProto.c Thu Oct 3 18:35:28 2002
-+++ kinput2-v3.1-macim-20040328/lib/IMProto.c Tue Mar 30 06:56:20 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/lib/IMProto.c
kinput2-v3.1-macim-20040417/lib/IMProto.c
+--- kinput2-v3.1-macim-20040417.orig/lib/IMProto.c Thu Oct 3 09:35:28 2002
++++ kinput2-v3.1-macim-20040417/lib/IMProto.c Tue May 3 02:14:22 2005
@@ -44,7 +44,7 @@
#include "im.h"
@@ -166,9 +166,28 @@
#define UNIX_SOCKET_DIR "/tmp/.ki2-unix"
/*- resource table -*/
-diff -Nru kinput2-v3.1-macim-20040328.orig/lib/XimpProto.c
kinput2-v3.1-macim-20040328/lib/XimpProto.c
---- kinput2-v3.1-macim-20040328.orig/lib/XimpProto.c Thu Oct 3 18:35:28 2002
-+++ kinput2-v3.1-macim-20040328/lib/XimpProto.c Tue Mar 30 06:56:20 2004
+diff -Naur kinput2-v3.1-macim-20040417.orig/lib/MacIM.c
kinput2-v3.1-macim-20040417/lib/MacIM.c
+--- kinput2-v3.1-macim-20040417.orig/lib/MacIM.c Tue May 3 02:12:41 2005
++++ kinput2-v3.1-macim-20040417/lib/MacIM.c Tue May 3 03:56:34 2005
+@@ -58,6 +58,7 @@
+ static ICString *GetAuxSegments();
+ static int PreeditString();
+ static int StatusString();
++static void setObjectInputMode(MacIMObject, long);
+
+ MacIMClassRec macimClassRec = {
+ { /* object fields */
+@@ -218,7 +219,6 @@
+ extern void PasteFromClipboard(long);
+ extern long SetInputModeByMenuKey(EventRecord *);
+ long mode;
+- static void setObjectInputMode(MacIMObject, long);
+
+ /* KeyPress イベント以外は無視。*/
+ if (event->type == ButtonPress)
+diff -Naur kinput2-v3.1-macim-20040417.orig/lib/XimpProto.c
kinput2-v3.1-macim-20040417/lib/XimpProto.c
+--- kinput2-v3.1-macim-20040417.orig/lib/XimpProto.c Thu Oct 3 09:35:28 2002
++++ kinput2-v3.1-macim-20040417/lib/XimpProto.c Tue May 3 02:14:22 2005
@@ -45,7 +45,7 @@
Index: kinput2.macim.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/kinput2.macim.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kinput2.macim.info 27 Apr 2005 03:26:49 -0000 1.1
+++ kinput2.macim.info 3 May 2005 04:40:32 -0000 1.2
@@ -1,5 +1,5 @@
Package: kinput2.macim
-Version: 3.1+20040417
+Version: 321+20040417
Revision: 1
BuildDepends: system-xfree86-dev | x11-dev
Depends: app-defaults, system-xfree86-shlibs | x11-shlibs, macosx
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
