rpms/kinput2/F-9 kinput2-v3.1-linespace.patch, NONE, 1.1 kinput2.spec, 1.20, 1.21

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/kinput2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30831

Modified Files:
	kinput2.spec 
Added Files:
	kinput2-v3.1-linespace.patch 
Log Message:
* Tue Sep  2 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-39
- Fix a value type of lineSpace attribute. (#458650)

kinput2-v3.1-linespace.patch:

--- NEW FILE kinput2-v3.1-linespace.patch ---
diff -pruN kinput2-v3.1.orig/lib/imlib/imattr.c kinput2-v3.1/lib/imlib/imattr.c
--- kinput2-v3.1.orig/lib/imlib/imattr.c	2008-09-02 14:44:15.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imattr.c	2008-09-02 15:33:53.000000000 +0900
@@ -179,7 +179,7 @@ static ICAttribute icAttributes[] = {
 	  setBgPixmap, getBgPixmap },
     { XNFontSet, TYPE_XFONTSET, OP_C|OP_S|OP_G,
 	  setFontSet, getFontSet },
-    { XNLineSpace, TYPE_CARD16, OP_C|OP_S|OP_G,	  /* should be TYPE_INT16 */
+    { XNLineSpace, TYPE_CARD32, OP_C|OP_S|OP_G,	  /* should be TYPE_INT32 */
 	  setLineSpace, getLineSpace },
     { XNCursor, TYPE_CARD32, OP_C|OP_S|OP_G,
 	  setCursor, getCursor },
@@ -832,14 +832,14 @@ int op;
 
     TRACE(("imlib:setLineSpace()\n"));
 
-    CHECK_ICATTR_SIZE(2, IMBadSomething);
+    CHECK_ICATTR_SIZE(4, IMBadSomething);
 
     if ((ap = getPSPtr(icp, nest)) == NULL) {
 	unnestedError(icp);
 	return -1;
     }
 
-    line_space = getI16(value, order);	/* ??? linespacing is 'int' */
+    line_space = getC32(value, order);	/* ??? linespacing is 'int' */
     TRACE(("\tline space: %d\n", line_space));
 
     if (!(ap->set_mask & ATTR_MASK_LINESPACE) ||


Index: kinput2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kinput2/F-9/kinput2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kinput2.spec	19 Feb 2008 12:51:23 -0000	1.20
+++ kinput2.spec	2 Sep 2008 12:56:15 -0000	1.21
@@ -25,7 +25,7 @@
 
 Name: kinput2
 Version: v3.1
-Release: 38%{?dist}
+Release: 39%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -60,6 +60,7 @@
 Patch8: kinput2-v3.1-activate_im_with_kanji.patch
 Patch9: kinput2-v3.1-jp106_xfer.patch
 Patch10: kinput2-v3.1-status-update-204892.patch
+Patch11: kinput2-v3.1-linespace.patch
 
 Summary: kinput2 - kanji input server for X11
 Group: User Interface/X
@@ -91,6 +92,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 head -21 cmd/kinput2.c >Copyright
 
@@ -256,6 +258,9 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %changelog
+* Tue Sep  2 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-39
+- Fix a value type of lineSpace attribute. (#458650)
+
 * Tue Feb 19 2008 Akira TAGOH <tagoh at redhat.com> - v3.1-38
 - Fix xinput script to get it working on latest im-chooser.