Hello community, here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory checked in at Tue Mar 3 18:17:06 CET 2009. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-01 20:42:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-03 12:20:05.819882559 +0100 @@ -1,0 +2,7 @@ +Tue Mar 3 12:08:56 CET 2009 - sndirsch@suse.de + +- redone scim_swallow.diff (replaces scim_swallow1.diff/ + scim_swallow2.diff); disabled for now since it breaks scim + completely + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- scim_swallow1.diff scim_swallow2.diff New: ---- scim_swallow.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.sx9659/_old 2009-03-03 18:16:57.000000000 +0100 +++ /var/tmp/diff_new_pack.sx9659/_new 2009-03-03 18:16:57.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: coreutils Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 7 +Release: 8 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -51,8 +51,7 @@ Patch15: en-locales.diff Patch17: Xcms.diff Patch18: compose-zh_CN.UTF-8.diff -Patch19: scim_swallow1.diff -Patch20: scim_swallow2.diff +Patch19: scim_swallow.diff %description This package contains the X.Org X11 library. @@ -131,8 +130,7 @@ %patch15 -p0 %patch17 -p0 %patch18 -p0 -%patch19 -p1 -%patch20 -p1 +#%patch19 -p1 %build autoreconf -fi @@ -204,6 +202,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 03 2009 sndirsch@suse.de +- redone scim_swallow.diff (replaces scim_swallow1.diff/ + scim_swallow2.diff); disabled for now since it breaks scim + completely * Sun Mar 01 2009 sndirsch@suse.de - libX11 1.2 - obsoletes bug356556-bad_array_index.diff, ++++++ scim_swallow1.diff -> scim_swallow.diff ++++++ --- xorg-x11-libX11/scim_swallow1.diff 2009-03-01 20:29:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11/scim_swallow.diff 2009-03-03 12:06:01.730292351 +0100 @@ -1,6 +1,44 @@ ---- a/modules/im/ximcp/imDefIc.c.orig 2009-03-01 20:20:31.000000000 +0100 -+++ a/modules/im/ximcp/imDefIc.c 2009-03-01 20:22:09.000000000 +0100 -@@ -974,8 +974,6 @@ _XimProtoSetFocus( +diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c +index 685d515..fb12869 100644 +--- a/modules/im/ximcp/imDefFlt.c ++++ b/modules/im/ximcp/imDefFlt.c +@@ -143,13 +143,11 @@ _XimProtoKeypressFilter( + Xic ic, + XKeyEvent *ev) + { +-#ifdef XIM_CONNECTABLE + Xim im = (Xim)ic->core.im; +-#endif + +- if (IS_FABLICATED(ic)) { ++ if (IS_FABRICATED(im)) { + _XimPendingFilter(ic); +- UNMARK_FABLICATED(ic); ++ UNMARK_FABRICATED(im); + return NOTFILTERD; + } + +@@ -206,13 +204,11 @@ _XimProtoKeyreleaseFilter( + Xic ic, + XKeyEvent *ev) + { +-#ifdef XIM_CONNECTABLE + Xim im = (Xim)ic->core.im; +-#endif + +- if (IS_FABLICATED(ic)) { ++ if (IS_FABRICATED(im)) { + _XimPendingFilter(ic); +- UNMARK_FABLICATED(ic); ++ UNMARK_FABRICATED(im); + return NOTFILTERD; + } + +diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c +index 36ab101..dc1277f 100644 +--- a/modules/im/ximcp/imDefIc.c ++++ b/modules/im/ximcp/imDefIc.c +@@ -949,8 +949,6 @@ _XimProtoSetFocus( (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -9,7 +47,7 @@ _XimRegisterFilter(ic); return; } -@@ -1023,8 +1021,6 @@ _XimProtoUnsetFocus( +@@ -996,8 +994,6 @@ _XimProtoUnsetFocus( (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -18,45 +56,13 @@ _XimUnregisterFilter(ic); return; } ---- a/modules/im/ximcp/imDefLkup.c.orig 2009-03-01 20:20:31.000000000 +0100 -+++ a/modules/im/ximcp/imDefLkup.c 2009-03-01 20:24:45.000000000 +0100 -@@ -216,13 +216,8 @@ _XimRespSyncReply( - Xic ic, - BITMASK16 mode) - { -- if (mode & XimSYNCHRONUS) /* SYNC Request */ { -- if (IS_FOCUSED(ic)) -- MARK_NEED_SYNC_REPLY(ic); -- else -- _XimProcSyncReply((Xim)ic->core.im, ic); -- } -- -+ if (mode & XimSYNCHRONUS) /* SYNC Request */ -+ MARK_NEED_SYNC_REPLY(ic->core.im); - return True; - } - -@@ -359,7 +354,7 @@ _XimProcEvent( - ev->xany.serial |= serial << 16; - ev->xany.send_event = False; - ev->xany.display = d; -- MARK_FABLICATED(ic); -+ MARK_FABRICATED(ic->core.im); - return; - } - -@@ -712,7 +707,7 @@ _XimCommitRecv( - - if (ic->private.proto.registed_filter_event - & (KEYPRESS_MASK | KEYRELEASE_MASK)) -- MARK_FABLICATED(ic); -+ MARK_FABRICATED(im); - - ev.type = KeyPress; - ev.send_event = False; ---- libX11-1.1.4/modules/im/ximcp/imExten.c 2008-03-06 21:45:06.000000000 +0100 -+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c 2008-10-30 16:41:19.000000000 +0100 -@@ -162,7 +162,7 @@ +diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c +index 7909e93..05be238 100644 +diff --git a/modules/im/ximcp/imExten.c b/modules/im/ximcp/imExten.c +index ea598e3..7eff6eb 100644 +--- a/modules/im/ximcp/imExten.c ++++ b/modules/im/ximcp/imExten.c +@@ -162,7 +162,7 @@ _XimProcExtForwardKeyEvent( XPutBackEvent(im->core.display, &ev); _XimRespSyncReply(ic, buf_s[0]); @@ -65,9 +71,11 @@ return True; } ---- libX11-1.1.4/src/xlibi18n/XimintP.h 2008-03-06 21:45:06.000000000 +0100 -+++ libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h 2008-10-30 16:41:19.000000000 +0100 -@@ -144,6 +144,8 @@ +diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h +index bb99313..d51b85b 100644 +--- a/src/xlibi18n/XimintP.h ++++ b/src/xlibi18n/XimintP.h +@@ -144,6 +144,8 @@ typedef struct _XimProtoPrivateRec { #define DELAYBINDABLE (1L << 3) #define RECONNECTABLE (1L << 4) #endif /* XIM_CONNECTABLE */ @@ -76,7 +84,7 @@ /* * macro for the flag of XIMPrivateRec -@@ -182,6 +184,20 @@ +@@ -182,6 +184,20 @@ typedef struct _XimProtoPrivateRec { (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE)) #endif /* XIM_CONNECTABLE */ @@ -97,7 +105,7 @@ /* * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec */ -@@ -242,9 +258,6 @@ +@@ -242,9 +258,6 @@ typedef struct _XicProtoPrivateRec { * bit mask for the flag of XICPrivateRec */ #define IC_CONNECTED (1L) @@ -107,7 +115,7 @@ /* * macro for the flag of XICPrivateRec -@@ -256,27 +269,6 @@ +@@ -256,27 +269,6 @@ typedef struct _XicProtoPrivateRec { #define UNMARK_IC_CONNECTED(ic) \ (((Xic)ic)->private.proto.flag &= ~IC_CONNECTED) @@ -135,3 +143,38 @@ /* * macro for the filter_event_mask of XICPrivateRec */ +--- libX11-1.2/modules/im/ximcp/imDefLkup.c.orig 2009-03-03 11:59:48.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefLkup.c 2009-03-03 12:04:07.000000000 +0100 +@@ -216,12 +216,8 @@ _XimRespSyncReply( + Xic ic, + BITMASK16 mode) + { +- if (mode & XimSYNCHRONUS) /* SYNC Request */ { +- if (IS_FOCUSED(ic)) +- MARK_NEED_SYNC_REPLY(ic); +- else +- _XimProcSyncReply((Xim)ic->core.im, ic); +- } ++ if (mode & XimSYNCHRONUS) /* SYNC Request */ ++ MARK_NEED_SYNC_REPLY(ic->core.im); + + return True; + } +@@ -359,7 +355,7 @@ _XimProcEvent( + ev->xany.serial |= serial << 16; + ev->xany.send_event = False; + ev->xany.display = d; +- MARK_FABLICATED(ic); ++ MARK_FABRICATED(ic->core.im); + return; + } + +@@ -712,7 +708,7 @@ _XimCommitRecv( + + if (ic->private.proto.registed_filter_event + & (KEYPRESS_MASK | KEYRELEASE_MASK)) +- MARK_FABLICATED(ic); ++ MARK_FABRICATED(im); + + ev.type = KeyPress; + ev.send_event = False; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org