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

[andyrtr at archlinux.org]

    Date: Friday, February 13, 2009 @ 10:44:37
  Author: andyrtr
Revision: 26851

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

........
  r26587 | jgc | 2009-02-09 21:17:36 +0000 (Mo, 09 Feb 2009) | 1 line
  
  upgpkg: libx11 1.1.99.2-1
........
  r26733 | jgc | 2009-02-11 18:44:31 +0000 (Mi, 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-i686/libX11-1.1.99.2.hang.patch
    (from rev 26733, libx11/trunk/libX11-1.1.99.2.hang.patch)
Modified:
  libx11/repos/extra-i686/	(properties)
  libx11/repos/extra-i686/PKGBUILD

----------------------------+
 PKGBUILD                   |   27 +++++++++++++++------------
 libX11-1.1.99.2.hang.patch |   13 +++++++++++++
 2 files changed, 28 insertions(+), 12 deletions(-)


Property changes on: libx11/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libx11/trunk:1-20481
   + /libx11/trunk:1-26850

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-13 15:37:38 UTC (rev 26850)
+++ extra-i686/PKGBUILD	2009-02-13 15:44:37 UTC (rev 26851)
@@ -2,25 +2,28 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor Jan de Groot <jgc at archlinux.org>
 pkgname=libx11
-pkgver=1.1.5
+pkgver=1.1.99.2
 pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libxcb>=1.1.90.1' 'kbproto>=1.0.3')
-makedepends=('xproto>=7.0.13' 'xextproto>=7.0.3' 'xf86bigfontproto>=1.1.2' 'xtrans>=1.2.1' 'kbproto>=1.0.3' 'inputproto>=1.4.4' 'xorg-util-macros')
+depends=('libxcb>=1.1.93' 'kbproto>=1.0.3')
+makedepends=('xproto>=7.0.14' 'xextproto>=7.0.5' 'xf86bigfontproto>=1.1.2' 'xtrans>=1.2.3' 'kbproto>=1.0.3' 'inputproto>=1.5.0' 'xorg-util-macros>=1.2.1')
 options=('!libtool')
 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=('d1512d65dadd4f48c779d4749e7753a8'
+md5sums=('2450f861d39939e46f8a4ced1abc3504'
          'c7e38a68b932ed557bc71979eed2a8a1'
+	 '570d5722c911a92d951010b192b7afa5'
          '942ff006e69e041f0307c1316e0dec5d')
 
 build() {
-  cd ${srcdir}/libX11-${pkgver}
-  patch -Np1 -i ${srcdir}/012_ru_RU_UTF-8_XLC_LOCALE.diff || return 1
+  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
@@ -30,12 +33,12 @@
   ./configure --prefix=/usr \
               --with-xcb || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d ${pkgdir}/etc/profile.d 
-  install -m755 ${srcdir}/xorg.sh \
-                ${pkgdir}/etc/profile.d/ || return 1
+  install -m755 -d "${pkgdir}/etc/profile.d"
+  install -m755 "${srcdir}/xorg.sh" \
+                "${pkgdir}/etc/profile.d/" || return 1
 
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }

Copied: libx11/repos/extra-i686/libX11-1.1.99.2.hang.patch (from rev 26733, libx11/trunk/libX11-1.1.99.2.hang.patch)
===================================================================
--- extra-i686/libX11-1.1.99.2.hang.patch	                        (rev 0)
+++ extra-i686/libX11-1.1.99.2.hang.patch	2009-02-13 15:44:37 UTC (rev 26851)
@@ -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);
+ }
+