rpms/im-sdk/FC-3 httx-32bit-on-64bit-162738.patch, NONE, 1.1 httx-s390x-fixes-160870.patch, NONE, 1.1 iiimsf-unix-socket-size-160872.patch, NONE, 1.1 xiiimp-xft-statusarea-147457.patch, NONE, 1.1 im-sdk.spec, 1.102, 1.103 xiiimp-xft-statusarea-141298.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 28 11:53:59 UTC 2005
Author: petersen
Update of /cvs/dist/rpms/im-sdk/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv4728
Modified Files:
im-sdk.spec
Added Files:
httx-32bit-on-64bit-162738.patch httx-s390x-fixes-160870.patch
iiimsf-unix-socket-size-160872.patch
xiiimp-xft-statusarea-147457.patch
Removed Files:
xiiimp-xft-statusarea-141298.patch
Log Message:
- httx-32bit-on-64bit-162738.patch to fix 32bit apps on 64bit platform
(#162738)
- httx-s390x-fixes-160870.patch to fix httx on s390x (#160870)
- iiimsf-unix-socket-size-160872.patch to fix unix domain socket type
for s390x (#160872)
- reorder newer iiimxcf patches
- apply iiimgcf deadkey patch
- update changelog
httx-32bit-on-64bit-162738.patch:
R6IMProtocol.cpp | 16 ++++++++++------
i18nIc.c | 4 +---
2 files changed, 11 insertions(+), 9 deletions(-)
--- NEW FILE httx-32bit-on-64bit-162738.patch ---
diff -ur im-sdk-r12_1-svn2002.orig/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp im-sdk-r12_1-svn2002/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp
--- im-sdk-r12_1-svn2002.orig/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp 2005-06-22 14:58:48.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp 2005-06-28 11:39:56.200393104 +0900
@@ -321,14 +321,18 @@
icp->value_length = sizeof(CARD32);
}
if (!strcmp(icp->name, XNClientWindow)) {
- icp->value = new Window;
- ic->get_client_window((*(Window*)icp->value));
- icp->value_length = sizeof(Window);
+ Window tmp;
+ icp->value = new CARD32;
+ ic->get_client_window(tmp);
+ *(CARD32*)icp->value = (CARD32)tmp;
+ icp->value_length = sizeof(CARD32);
}
else if (!strcmp(icp->name, XNFocusWindow)) {
- icp->value = new Window;
- ic->get_focus_window((*(Window*)icp->value));
- icp->value_length = sizeof(Window);
+ Window tmp;
+ icp->value = new CARD32;
+ ic->get_focus_window(tmp);
+ *(CARD32*)icp->value = (CARD32)tmp;
+ icp->value_length = sizeof(CARD32);
}
else if (!strcmp(icp->name, XNFilterEvents)) {
icp->value = new CARD32;
diff -ur im-sdk-r12_1-svn2002.orig/iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nIc.c im-sdk-r12_1-svn2002/iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nIc.c
--- im-sdk-r12_1-svn2002.orig/iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nIc.c 2005-06-22 14:58:48.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nIc.c 2005-06-28 13:14:26.599361432 +0900
@@ -424,10 +424,8 @@
length = sizeof(CARD16);
break;
case XimType_CARD32:
- length = sizeof(CARD32);
- break;
case XimType_Window:
- length = sizeof(Window);
+ length = sizeof(CARD32);
break;
case XimType_XIMStyles:
length = sizeof(XIMStyles);
httx-s390x-fixes-160870.patch:
iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp | 16 ++++++++--------
iiimxcf/xiiimp.so/iiimp/iiimpConv.c | 2 +-
lib/iiimcf/iiimcf.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
--- NEW FILE httx-s390x-fixes-160870.patch ---
diff -ur im-sdk-r12_1-svn2002.orig/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp im-sdk-r12_1-svn2002/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp
--- im-sdk-r12_1-svn2002.orig/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp 2005-05-09 10:57:12.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimxcf/htt_xbe/lib/IMdkit/r6im/R6IMProtocol.cpp 2005-05-19 14:59:17.466453328 +0900
@@ -534,10 +534,10 @@
XICAttribute *icp;
for (icp = ic_attr; icp < &ic_attr[ic_attr_num]; icp++) {
if (!strcmp(icp->name, XNClientWindow)) {
- ic->set_client_window((*(Window*)icp->value));
+ ic->set_client_window((Window)(*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNFocusWindow)) {
- ic->set_focus_window((*(Window*)icp->value));
+ ic->set_focus_window((Window)(*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNFilterEvents)) {
ic->set_fwin_select_mask(*(CARD32*)icp->value);
@@ -585,16 +585,16 @@
ic->set_preedit_bg((*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNBackgroundPixmap)) {
- ic->set_preedit_bg_pixmap((*(Pixmap*)icp->value));
+ ic->set_preedit_bg_pixmap((Pixmap)(*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNLineSpace)) {
ic->set_preedit_line_spacing((*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNCursor)) {
- ic->set_preedit_cursor((*(Cursor*)icp->value));
+ ic->set_preedit_cursor((Cursor)(*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNColormap)) {
- ic->set_preedit_colormap((*(Colormap*)icp->value));
+ ic->set_preedit_colormap((Colormap)(*(CARD32*)icp->value));
}
}
// set status_attr
@@ -617,16 +617,16 @@
ic->set_status_bg((*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNBackgroundPixmap)) {
- ic->set_status_bg_pixmap((*(Pixmap*)icp->value));
+ ic->set_status_bg_pixmap((Pixmap)(*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNLineSpace)) {
ic->set_status_line_spacing((*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNCursor)) {
- ic->set_status_cursor((*(Cursor*)icp->value));
+ ic->set_status_cursor((Cursor)(*(CARD32*)icp->value));
}
else if (!strcmp(icp->name, XNColormap)) {
- ic->set_status_colormap((*(Colormap*)icp->value));
+ ic->set_status_colormap((Colormap)(*(CARD32*)icp->value));
}
}
return (char*)0;
diff -ur im-sdk-r12_1-svn2002.orig/iiimxcf/xiiimp.so/iiimp/iiimpConv.c im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/iiimpConv.c
--- im-sdk-r12_1-svn2002.orig/iiimxcf/xiiimp.so/iiimp/iiimpConv.c 2004-04-28 18:28:59.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/iiimpConv.c 2005-05-19 14:42:06.885125504 +0900
@@ -558,7 +558,7 @@
return IIIMF_STATUS_SUCCESS;
} else {
- int dst_len, dst_len_orig, src_len;
+ size_t dst_len, dst_len_orig, src_len;
char *str;
const char *src;
diff -ur im-sdk-r12_1-svn2002.orig/lib/iiimcf/iiimcf.c im-sdk-r12_1-svn2002/lib/iiimcf/iiimcf.c
--- im-sdk-r12_1-svn2002.orig/lib/iiimcf/iiimcf.c 2005-05-09 10:57:12.000000000 +0900
+++ im-sdk-r12_1-svn2002/lib/iiimcf/iiimcf.c 2005-05-19 14:21:03.973117312 +0900
@@ -24,7 +24,7 @@
#include <EIMIL.h>
#define IIIMCF_DEFAULT_IC_HASH_TABLE_SIZE 17
-#define IIIMCF_DEFAULT_TIMEOUT 2000
+#define IIIMCF_DEFAULT_TIMEOUT 8000
static void free_object_descriptor(
IIIMCF_object_descriptor *pod,
iiimsf-unix-socket-size-160872.patch:
iwrap.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE iiimsf-unix-socket-size-160872.patch ---
diff -uprN im-sdk-r12_1-svn2002.orig/iiimsf/src/iwrap.c im-sdk-r12_1-svn2002/iiimsf/src/iwrap.c
--- im-sdk-r12_1-svn2002.orig/iiimsf/src/iwrap.c 2004-09-09 06:17:09.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimsf/src/iwrap.c 2005-04-28 20:24:52.364988936 +0900
@@ -185,7 +185,7 @@ authenticate_with_unix(
#elif defined(SO_PEERCRED)
/* Linux */
struct ucred peercred;
- size_t peer_len = sizeof(peercred);
+ socklen_t peer_len = sizeof(peercred);
if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, &peer_len) != 0) {
return 0;
xiiimp-xft-statusarea-147457.patch:
guiIMSts.c | 32 +++++++++++++++++---------------
guiIMStsArea.c | 2 +-
2 files changed, 18 insertions(+), 16 deletions(-)
--- NEW FILE xiiimp-xft-statusarea-147457.patch ---
diff -ur im-sdk-r12_1-svn2002.org/iiimxcf/xiiimp.so/iiimp/guiIMSts.c im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/guiIMSts.c
--- im-sdk-r12_1-svn2002.org/iiimxcf/xiiimp.so/iiimp/guiIMSts.c 2005-01-27 13:35:26.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/guiIMSts.c 2005-02-09 20:25:35.845650072 +0900
@@ -519,21 +519,23 @@
XIM_IIIMP (ic->core.im, default_font_name));
status->need_free_fontset = True;
}
- if (!status->xftdraw) {
- status->xftdraw = XftDrawCreate(ic->core.im->core.display,
- (Drawable) status->window,
- DefaultVisual(ic->core.im->core.display,
- DefaultScreen(ic->core.im->core.display)),
- DefaultColormap(ic->core.im->core.display,
- DefaultScreen(ic->core.im->core.display)));
- }
- if (!status->xftfont) {
- status->xftfont = XFactoryCreateDefaultXftFont(ic->core.im->core.display);
- }
- status->xftcolor.color.red = 0;
- status->xftcolor.color.blue = 0;
- status->xftcolor.color.green = 0;
- status->xftcolor.color.alpha = 0xffff;
+ if (!(ic->core.input_style & XIMStatusArea)) {
+ if (!status->xftdraw) {
+ status->xftdraw = XftDrawCreate(ic->core.im->core.display,
+ (Drawable) status->window,
+ DefaultVisual(ic->core.im->core.display,
+ DefaultScreen(ic->core.im->core.display)),
+ DefaultColormap(ic->core.im->core.display,
+ DefaultScreen(ic->core.im->core.display)));
+ }
+ if (!status->xftfont) {
+ status->xftfont = XFactoryCreateDefaultXftFont(ic->core.im->core.display);
+ }
+ status->xftcolor.color.red = 0;
+ status->xftcolor.color.blue = 0;
+ status->xftcolor.color.green = 0;
+ status->xftcolor.color.alpha = 0xffff;
+ }
return;
}
diff -ur im-sdk-r12_1-svn2002.org/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c
--- im-sdk-r12_1-svn2002.org/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c 2003-04-24 19:24:26.000000000 +0900
+++ im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimp/guiIMStsArea.c 2005-02-09 20:26:07.330863592 +0900
@@ -110,7 +110,7 @@
height_diff =
(ic->core.status_attr.area.height - fse->max_ink_extent.height);
height_diff += (height_diff & 1);
- status->y = ((-fse->max_ink_extent.y) + (height_diff / 2));
+ status->y = abs((-fse->max_ink_extent.y) + (height_diff / 2));
} else {
status->y = ic->core.status_attr.area.height;
}
im-sdk-r12_1-svn2002/iiimxcf/xiiimp.so/iiimpã ãã«çºè¦: guiIMStsArea.c~
Index: im-sdk.spec
===================================================================
RCS file: /cvs/dist/rpms/im-sdk/FC-3/im-sdk.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- im-sdk.spec 28 Jul 2005 06:02:15 -0000 1.102
+++ im-sdk.spec 28 Jul 2005 11:53:56 -0000 1.103
@@ -62,6 +62,7 @@
Patch45: iiimsf-disable-super-help-hotkey.patch
Patch46: iiimp-fix-missing-prototype-r2084-140818.patch
Patch47: iiimsf-fix-auth-with-unixdomain-r2088-141468.patch
+Patch48: iiimsf-unix-socket-size-160872.patch
## iiimgcf
Patch50: iiimgcf-fix-gcc-warnings-r2020.patch
@@ -86,12 +87,14 @@
Patch706: httx-status-focus-svn2500-146406.patch
Patch707: xiiimp-close-on-reset-svn2543-146407.patch
Patch708: httx-preedit-state-svn2544-146523.patch
-Patch709: xiiimp-preedit-area-svn2505-147458.patch
-Patch710: xiiimp-preedit-callback-svn2548-147459.patch
-Patch711: xiiimp-aux-segfault-svn2507-148765.patch
-Patch712: xiiimp-preedit-return-value-svn2549-149607.patch
-Patch713: xiiimp-xft-statusarea-141298.patch
-Patch714: xiiimp-pango.patch
+Patch709: xiiimp-xft-statusarea-147457.patch
+Patch710: xiiimp-preedit-area-svn2505-147458.patch
+Patch711: xiiimp-preedit-callback-svn2548-147459.patch
+Patch712: xiiimp-aux-segfault-svn2507-148765.patch
+Patch713: xiiimp-preedit-return-value-svn2549-149607.patch
+Patch714: httx-32bit-on-64bit-162738.patch
+Patch715: httx-s390x-fixes-160870.patch
+Patch716: xiiimp-pango.patch
Patch750: xiiimp-fix-default-le-r2435-139811.patch
## iiimcf
@@ -406,6 +409,7 @@
%patch45 -p1 -b .disable-superhelp
%patch46 -p0 -b .iiimp-proto
%patch47 -p0 -b .auth-unixdomain
+%patch48 -p1 -b .48-unix-socket
## iiimgcf
%patch50 -p0 -b .iiimgcf-warnings
@@ -413,7 +417,8 @@
%patch52 -p0 -b .gtk_im_context_reset
%patch53 -p0 -b .dont-always-emit-commit-signal
%patch54 -p0 -b .commit-after-reset-ic
-%patch55 -p0 -b .fix-crash
+%patch55 -p0 -b .crash
+%patch56 -p1 -b .56-deadkey
## iiimxcf
%patch700 -p1 -b .xiiimp-warnings
@@ -425,12 +430,16 @@
%patch706 -p1 -b .706-status-focus
%patch707 -p1 -b .707-close-lookup
%patch708 -p1 -b .708-preedit-state
-%patch709 -p1 -b .709-preedit-placement
-%patch710 -p1 -b .710-preedit-cb
-%patch711 -p1 -b .711-aux-segv
-%patch712 -p1 -b .712-preedit-return
-%patch713 -p1 -b .713-statusarea
-#%%patch714 -p1 -b .714-pango
+%patch709 -p1 -b .709-xft-status
+%patch710 -p1 -b .710-preedit-placement
+%patch711 -p1 -b .711-preedit-cb
+%patch712 -p1 -b .712-aux-segv
+%patch713 -p1 -b .713-preedit-return
+%patch714 -p1 -b .714-32compat
+%ifarch s390x
+%patch715 -p1 -b .715-s390x
+%endif
+#%%patch716 -p1 -b .716-pango
%patch750 -p1 -b .750-default-le
## iiimcf
@@ -1130,25 +1139,31 @@
* Wed Jul 27 2005 Akira TAGOH <tagoh at redhat.com>
- added series of iiimxcf patches courtesy of Kohji Sanpei of IBM
- httx-status-focus-svn2500-146406.patch to fix status focus (#146406)
- - add xiiimp-close-on-reset-svn2543-146407.patch to close lookup window on
- reset (#146407)
- - add httx-preedit-state-svn2544-146523.patch to correct pre-edit state value
+ - xiiimp-close-on-reset-svn2543-146407.patch to close lookup window on reset
+ (#146407)
+ - httx-preedit-state-svn2544-146523.patch to correct pre-edit state value
(#146523)
- - add xiiimp-preedit-area-svn2505-147458.patch to fix pre-edit area placement
+ - xiiimp-xft-statusarea-147457.patch to fix segfault with xft drawing
+ (#147457)
+ - xiiimp-preedit-area-svn2505-147458.patch to fix pre-edit area placement
(#147458)
- - add xiiimp-preedit-callback-svn2548-147459.patch to issue with preedit
- callbacks (#147459)
- - add xiiimp-aux-segfault-svn2507-148765.patch to aux window issue
- (#148765)
- - add xiiimp-preedit-return-value-svn2549-149607.patch to fix pre-edit return
+ - xiiimp-preedit-callback-svn2548-147459.patch to issue with preedit callbacks
+ (#147459)
+ - xiiimp-aux-segfault-svn2507-148765.patch to aux window issue (#148765)
+ - xiiimp-preedit-return-value-svn2549-149607.patch to fix pre-edit return
string (#149607)
+ - httx-32bit-on-64bit-162738.patch to fix 32bit apps on 64bit platform
+ (#162738)
+ - httx-s390x-fixes-160870.patch to fix httx on s390x (#160870)
+ - iiimsf-unix-socket-size-160872.patch to fix unix domain socket type
+ for s390x (#160872)
- add unitle-Punjabi-missing-keys-svn2604-151477.patch to fix missing keys
(Amanpreet Singh Alam, #151477)
- iiimgcf-fix-crash-r2421-153020.patch: applied to fix a crash issue. (#153020)
- iiimgcf-deadkey.patch: applied to get the deadkey working. (#130851)
- Use %%{_target_platform} instead of %%{_arch}-%%{host_vendor}-%%{_host_os}
to run update-gtk-immodule properly.
-- define iiim_user macro and use them instead of hardcoded user name.
+- define iiim_user macro and use it instead of hardcoded username.
- make sure htt_server owns unix domain socket after upgrade.
- leif-canna-close-csconv-r2306.patch: applied to close the csconv module
when the session is closed.
--- xiiimp-xft-statusarea-141298.patch DELETED ---
More information about the fedora-cvs-commits
mailing list