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

[Jan de Groot]

    Date: Saturday, February 21, 2009 @ 08:09:59
  Author: jgc
Revision: 27430

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

........
  r27429 | jgc | 2009-02-21 13:09:47 +0000 (Sat, 21 Feb 2009) | 1 line
  
  upgpkg: libx11 1.2-1
........

Modified:
  libx11/repos/extra-x86_64/	(properties)
  libx11/repos/extra-x86_64/PKGBUILD
Deleted:
  libx11/repos/extra-x86_64/libX11-1.1.99.2.hang.patch

----------------------------+
 PKGBUILD                   |   11 ++++-------
 libX11-1.1.99.2.hang.patch |   13 -------------
 2 files changed, 4 insertions(+), 20 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-21 13:09:47 UTC (rev 27429)
+++ extra-x86_64/PKGBUILD	2009-02-21 13:09:59 UTC (rev 27430)
@@ -2,28 +2,25 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor Jan de Groot <jgc at archlinux.org>
 pkgname=libx11
-pkgver=1.1.99.2
-pkgrel=2
+pkgver=1.2
+pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libxcb>=1.1.93' 'kbproto>=1.0.3')
+depends=('libxcb>=1.2' '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=('2450f861d39939e46f8a4ced1abc3504'
+md5sums=('c6265b59ea2b594fd68e33f9125b4d20'
          '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

Deleted: extra-x86_64/libX11-1.1.99.2.hang.patch
===================================================================
--- extra-x86_64/libX11-1.1.99.2.hang.patch	2009-02-21 13:09:47 UTC (rev 27429)
+++ extra-x86_64/libX11-1.1.99.2.hang.patch	2009-02-21 13:09:59 UTC (rev 27430)
@@ -1,13 +0,0 @@
-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);
- }
-