commit xorg-x11-libX11 for openSUSE:Factory

2 Mar 2009

Hello community,

here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory
checked in at Mon Mar 2 01:17:06 CET 2009.


--------

--- xorg-x11-libX11/xorg-x11-libX11.changes	2009-02-24 14:14:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes	2009-03-01 20:42:55.041163707 +0100
@@ -1,0 +2,9 @@
+Sun Mar  1 20:40:21 CET 2009 - sndirsch@suse.de
+
+- libX11 1.2 
+- obsoletes bug356556-bad_array_index.diff, 
+  p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2, p_xlc-locale.diff,
+  p_xlib-threadsafe.diff, xkb-rangefix.diff
+- adjusted p_sr_CS-compose.diff, p_xauth.diff, scim_swallow1.diff
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  bug356556-bad_array_index.diff
  libX11-1.1.5.tar.bz2
  p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2
  p_xlc-locale.diff
  p_xlib-threadsafe.diff
  xkb-rangefix.diff

New:
----
  libX11-1.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-libX11.spec ++++++
--- /var/tmp/diff_new_pack.W14181/_old	2009-03-02 01:16:49.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new	2009-03-02 01:16:49.000000000 +0100
@@ -20,7 +20,7 @@
 
 Name:           xorg-x11-libX11
 %define xcb 1
-%define dirsuffix 1.1.5
+%define dirsuffix 1.2
 BuildRequires:  fdupes pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel zlib-devel
 %if %xcb
 BuildRequires:  xorg-x11-libxcb-devel
@@ -28,7 +28,7 @@
 PreReq:         coreutils
 Url:            http://xorg.freedesktop.org/
 Version:        7.4
-Release:        6
+Release:        7
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -40,9 +40,6 @@
 Source2:        xorg-x11-libX11.csh
 %endif
 Patch:          bug153744.diff
-Patch1:         p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2
-Patch2:         p_xlc-locale.diff
-Patch3:         p_xlib-threadsafe.diff
 Patch4:         p_new-locales.diff
 Patch5:         p_xauth.diff
 Patch6:         p_sr_CS-compose.diff
@@ -51,9 +48,7 @@
 Patch9:         p_xlib_skip_ext_env.diff
 Patch10:        bug-239698_libx11.diff
 Patch13:        bug-221326-xim-sync.patch
-Patch14:        bug356556-bad_array_index.diff
 Patch15:        en-locales.diff
-Patch16:        xkb-rangefix.diff
 Patch17:        Xcms.diff
 Patch18:        compose-zh_CN.UTF-8.diff
 Patch19:        scim_swallow1.diff
@@ -125,9 +120,6 @@
 test -f nls/ja.U90/XLC_LOCALE.pre && exit 1
 test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
 %patch
-%patch1
-%patch2
-%patch3
 %patch4
 %patch5
 %patch6
@@ -136,9 +128,7 @@
 %patch9
 %patch10 -p1
 %patch13 -p1
-%patch14 -p0
 %patch15 -p0
-%patch16 -p0
 %patch17 -p0
 %patch18 -p0
 %patch19 -p1
@@ -214,6 +204,12 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Mar 01 2009 sndirsch@suse.de
+- libX11 1.2
+- obsoletes bug356556-bad_array_index.diff,
+  p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2, p_xlc-locale.diff,
+  p_xlib-threadsafe.diff, xkb-rangefix.diff
+- adjusted p_sr_CS-compose.diff, p_xauth.diff, scim_swallow1.diff
 * Tue Feb 24 2009 sndirsch@suse.de
 - scim_swallow1.diff/scim_swallow2.diff:
   * fix for bnc #434865

++++++ libX11-1.1.5.tar.bz2 -> libX11-1.2.tar.bz2 ++++++
++++ 42302 lines of diff (skipped)

++++++ p_sr_CS-compose.diff ++++++
--- /var/tmp/diff_new_pack.W14181/_old	2009-03-02 01:16:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new	2009-03-02 01:16:54.000000000 +0100
@@ -1,9 +1,9 @@
 --- nls/en_US.UTF-8/Compose.pre.orig	2006-11-03 01:32:26.000000000 +0100
 +++ nls/en_US.UTF-8/Compose.pre	2006-12-03 16:56:28.000000000 +0100
-@@ -6176,3 +6176,129 @@
- ##<Multi_key> <U1D1B9> <U1D165> <U1D16F> 	: "𝆹𝅥𝅯"   U1D1BF # MUSICAL SYMBOL FUSA WHITE
- <Multi_key> <U1D1BC> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK
- ##<Multi_key> <U1D1BA> <U1D165> <U1D16F> 	: "𝆺𝅥𝅯"   U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+@@ -6693,3 +6693,129 @@
+ <dead_ogonek> <dead_macron> <o>       : "ǭ"   U01ED               # LATIN SMALL LETTER O WITH OGONEK AND MACRON
+ <dead_tilde> <dead_macron> <O> 	      : "Ȭ"   U022C               # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+ <dead_tilde> <dead_macron> <o> 	      : "ȭ"   U022D               # LATIN SMALL LETTER O WITH TILDE AND MACRON
 +# Serbian accented Cyrillic
 +# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
 +# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E

++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.W14181/_old	2009-03-02 01:16:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new	2009-03-02 01:16:54.000000000 +0100
@@ -7,8 +7,8 @@
 -    if (phostname) Xfree (phostname);
      if (pdpynum) Xfree (pdpynum);
      if (pscrnum) Xfree (pscrnum);
- #ifdef TCPCONN
-     if (tcphostname) Xfree (tcphostname);
+ #if defined(LOCALCONN) || defined(UNIXCONN) || defined(TCPCONN)
+     if (original_hostname) Xfree (original_hostname);
  #endif
 -
      GetAuthorization(trans_conn, family, (char *) saddr, saddrlen, idisplay,

++++++ scim_swallow1.diff ++++++
--- /var/tmp/diff_new_pack.W14181/_old	2009-03-02 01:16:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new	2009-03-02 01:16:54.000000000 +0100
@@ -1,7 +1,6 @@
-diff -u -r libX11-1.1.4/modules/im/ximcp/imDefIc.c libX11-1.1.4.xim-fix/modules/im/ximcp/imDefIc.c
---- libX11-1.1.4/modules/im/ximcp/imDefIc.c	2008-10-30 16:48:31.000000000 +0100
-+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imDefIc.c	2008-10-30 16:41:13.000000000 +0100
-@@ -974,8 +974,6 @@
+--- 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(
      (void)_XimWrite(im, len, (XPointer)buf);
      _XimFlush(im);
  
@@ -10,19 +9,18 @@
      _XimRegisterFilter(ic);
      return;
  }
-@@ -1023,8 +1021,6 @@
+@@ -1023,8 +1021,6 @@ _XimProtoUnsetFocus(
      (void)_XimWrite(im, len, (XPointer)buf);
      _XimFlush(im);
  
 -    UNMARK_FOCUSED(ic);
--    
+-
      _XimUnregisterFilter(ic);
      return;
  }
-diff -u -r libX11-1.1.4/modules/im/ximcp/imDefLkup.c libX11-1.1.4.xim-fix/modules/im/ximcp/imDefLkup.c
---- libX11-1.1.4/modules/im/ximcp/imDefLkup.c	2008-10-30 16:48:31.000000000 +0100
-+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imDefLkup.c	2008-10-30 16:46:18.000000000 +0100
-@@ -216,13 +216,8 @@
+--- 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)
  {
@@ -30,15 +28,15 @@
 -	if (IS_FOCUSED(ic))
 -	    MARK_NEED_SYNC_REPLY(ic);
 -	else
--	    _XimProcSyncReply(ic->core.im, ic);
+-	    _XimProcSyncReply((Xim)ic->core.im, ic);
 -    }
--    
+-
 +    if (mode & XimSYNCHRONUS) /* SYNC Request */
 +	MARK_NEED_SYNC_REPLY(ic->core.im);
      return True;
  }
  
-@@ -359,7 +354,7 @@
+@@ -359,7 +354,7 @@ _XimProcEvent(
      ev->xany.serial |= serial << 16;
      ev->xany.send_event = False;
      ev->xany.display = d;
@@ -47,7 +45,7 @@
      return;
  }
  
-@@ -712,7 +707,7 @@
+@@ -712,7 +707,7 @@ _XimCommitRecv(
  
      if (ic->private.proto.registed_filter_event
  	 & (KEYPRESS_MASK | KEYRELEASE_MASK))
@@ -56,7 +54,6 @@
  
      ev.type = KeyPress;
      ev.send_event = False;
-diff -u -r libX11-1.1.4/modules/im/ximcp/imExten.c libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c
 --- 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 @@
@@ -68,7 +65,6 @@
  
      return True;
  }
-diff -u -r libX11-1.1.4/src/xlibi18n/XimintP.h libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h
 --- 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 @@


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)