Hello community, here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory checked in at Tue Mar 3 22:47:58 CET 2009. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-03 12:20:05.000000000 +0100 +++ xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-03 18:09:46.133789461 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 18:09:23 CET 2009 - sndirsch@suse.de + +- fixed and reenabled scim_swallow.diff (bnc #434865) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.yX3394/_old 2009-03-03 22:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.yX3394/_new 2009-03-03 22:46:23.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: coreutils Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 8 +Release: 9 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -130,7 +130,7 @@ %patch15 -p0 %patch17 -p0 %patch18 -p0 -#%patch19 -p1 +%patch19 -p1 %build autoreconf -fi @@ -203,6 +203,8 @@ %changelog * Tue Mar 03 2009 sndirsch@suse.de +- fixed and reenabled scim_swallow.diff (bnc #434865) +* 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 ++++++ scim_swallow.diff ++++++ --- /var/tmp/diff_new_pack.yX3394/_old 2009-03-03 22:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.yX3394/_new 2009-03-03 22:46:23.000000000 +0100 @@ -1,8 +1,19 @@ -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( +diff -r -u libX11-1.2.orig/modules/im/ximcp/imDefFlt.c libX11-1.2/modules/im/ximcp/imDefFlt.c +--- libX11-1.2.orig/modules/im/ximcp/imDefFlt.c 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefFlt.c 2009-03-03 17:38:16.000000000 +0100 +@@ -131,9 +131,9 @@ + { + Xim im = (Xim)ic->core.im; + +- if (IS_NEED_SYNC_REPLY(ic)) { ++ if (IS_NEED_SYNC_REPLY(im)) { + (void)_XimProcSyncReply(im, ic); +- UNMARK_NEED_SYNC_REPLY(ic); ++ UNMARK_NEED_SYNC_REPLY(im); + } + return; + } +@@ -143,13 +143,11 @@ Xic ic, XKeyEvent *ev) { @@ -18,7 +29,7 @@ return NOTFILTERD; } -@@ -206,13 +204,11 @@ _XimProtoKeyreleaseFilter( +@@ -206,13 +204,11 @@ Xic ic, XKeyEvent *ev) { @@ -34,11 +45,10 @@ 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( +diff -r -u libX11-1.2.orig/modules/im/ximcp/imDefIc.c libX11-1.2/modules/im/ximcp/imDefIc.c +--- libX11-1.2.orig/modules/im/ximcp/imDefIc.c 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefIc.c 2009-03-03 15:32:40.000000000 +0100 +@@ -949,8 +949,6 @@ (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -47,7 +57,7 @@ _XimRegisterFilter(ic); return; } -@@ -996,8 +994,6 @@ _XimProtoUnsetFocus( +@@ -996,8 +994,6 @@ (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -56,13 +66,11 @@ _XimUnregisterFilter(ic); return; } -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( +diff -r -u libX11-1.2.orig/modules/im/ximcp/imDefLkup.c libX11-1.2/modules/im/ximcp/imDefLkup.c +diff -r -u libX11-1.2.orig/modules/im/ximcp/imExten.c libX11-1.2/modules/im/ximcp/imExten.c +--- libX11-1.2.orig/modules/im/ximcp/imExten.c 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imExten.c 2009-03-03 15:32:40.000000000 +0100 +@@ -162,7 +162,7 @@ XPutBackEvent(im->core.display, &ev); _XimRespSyncReply(ic, buf_s[0]); @@ -71,11 +79,10 @@ return True; } -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 { +diff -r -u libX11-1.2.orig/src/xlibi18n/XimintP.h libX11-1.2/src/xlibi18n/XimintP.h +--- libX11-1.2.orig/src/xlibi18n/XimintP.h 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/src/xlibi18n/XimintP.h 2009-03-03 15:32:40.000000000 +0100 +@@ -144,6 +144,8 @@ #define DELAYBINDABLE (1L << 3) #define RECONNECTABLE (1L << 4) #endif /* XIM_CONNECTABLE */ @@ -84,7 +91,7 @@ /* * macro for the flag of XIMPrivateRec -@@ -182,6 +184,20 @@ typedef struct _XimProtoPrivateRec { +@@ -182,6 +184,20 @@ (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE)) #endif /* XIM_CONNECTABLE */ @@ -105,7 +112,7 @@ /* * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec */ -@@ -242,9 +258,6 @@ typedef struct _XicProtoPrivateRec { +@@ -242,9 +258,6 @@ * bit mask for the flag of XICPrivateRec */ #define IC_CONNECTED (1L) @@ -115,7 +122,7 @@ /* * macro for the flag of XICPrivateRec -@@ -256,27 +269,6 @@ typedef struct _XicProtoPrivateRec { +@@ -256,27 +269,6 @@ #define UNMARK_IC_CONNECTED(ic) \ (((Xic)ic)->private.proto.flag &= ~IC_CONNECTED) @@ -143,8 +150,8 @@ /* * 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 +--- libX11-1.2/modules/im/ximcp/imDefLkup.c.orig 2009-03-03 18:11:06.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefLkup.c 2009-03-03 18:14:59.000000000 +0100 @@ -216,12 +216,8 @@ _XimRespSyncReply( Xic ic, BITMASK16 mode) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org