[arch-commits] Commit in libx11/repos (3 files)

[Jan de Groot]

    Date: Wednesday, February 11, 2009 @ 13:44:47
  Author: jgc
Revision: 26734

Merged revisions 26733 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libx11/trunk

........
  r26733 | jgc | 2009-02-11 18:44:31 +0000 (Wed, 11 Feb 2009) | 2 lines
  
  upgpkg: libx11 1.1.99.2-2
      Fix hang in applications like ekiga, openoffice, etc (FS#13199)
........

Added:
  libx11/repos/extra-x86_64/libX11-1.1.99.2.hang.patch
    (from rev 26733, libx11/trunk/libX11-1.1.99.2.hang.patch)
Modified:
  libx11/repos/extra-x86_64/	(properties)
  libx11/repos/extra-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |    5 ++++-
 libX11-1.1.99.2.hang.patch |   13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)


Property changes on: libx11/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libx11/trunk:1-26587
   + /libx11/trunk:1-26733

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-11 18:44:31 UTC (rev 26733)
+++ extra-x86_64/PKGBUILD	2009-02-11 18:44:47 UTC (rev 26734)
@@ -3,7 +3,7 @@
 # Contributor Jan de Groot <jgc at archlinux.org>
 pkgname=libx11
 pkgver=1.1.99.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,14 +13,17 @@
 license=('custom:XFREE86')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
 	012_ru_RU_UTF-8_XLC_LOCALE.diff
+	libX11-1.1.99.2.hang.patch
 	xorg.sh)
 md5sums=('2450f861d39939e46f8a4ced1abc3504'
          'c7e38a68b932ed557bc71979eed2a8a1'
+	 '570d5722c911a92d951010b192b7afa5'
          '942ff006e69e041f0307c1316e0dec5d')
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
   patch -Np1 -i "${srcdir}/012_ru_RU_UTF-8_XLC_LOCALE.diff" || return 1
+  patch -Np1 -i "${srcdir}/libX11-1.1.99.2.hang.patch" || return 1
 
   libtoolize --force --copy || return 1
   aclocal || return 1

Copied: libx11/repos/extra-x86_64/libX11-1.1.99.2.hang.patch (from rev 26733, libx11/trunk/libX11-1.1.99.2.hang.patch)
===================================================================
--- extra-x86_64/libX11-1.1.99.2.hang.patch	                        (rev 0)
+++ extra-x86_64/libX11-1.1.99.2.hang.patch	2009-02-11 18:44:47 UTC (rev 26734)
@@ -0,0 +1,13 @@
+diff -ru libX11-1.1.99.2.orig/src/xcb_disp.c libX11-1.1.99.2/src/xcb_disp.c
+--- libX11-1.1.99.2.orig/src/xcb_disp.c	2009-02-02 11:53:49.000000000 +0000
++++ libX11-1.1.99.2/src/xcb_disp.c	2009-02-02 11:57:55.000000000 +0000
+@@ -94,6 +94,9 @@
+ 	dpy->xcb->next_xid = xcb_generate_id(dpy->xcb->connection);
+ 
+ 	dpy->xcb->event_notify = xcondition_malloc();
++	if (!dpy->xcb->event_notify)
++		return 0;
++	xcondition_init(dpy->xcb->event_notify);
+ 	return !xcb_connection_has_error(c);
+ }
+