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

[Jan de Groot]

    Date: Thursday, May 22, 2008 @ 13:44:17
  Author: jgc
Revision: 1882

Merged revisions 2-1881 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/libx11/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r573 | alexander | 2008-04-21 09:48:43 +0000 (Mon, 21 Apr 2008) | 2 lines
  
  upgpkg: libx11 1.1.4
........
  r1663 | jgc | 2008-05-14 17:38:32 +0000 (Wed, 14 May 2008) | 2 lines
  
  upgpkg: libx11 1.1.4-2
      Rebuild with latest proto and xtrans
........
  r1881 | jgc | 2008-05-22 17:44:01 +0000 (Thu, 22 May 2008) | 2 lines
  
  upgpkg: libx11 1.1.4-2
      Fix autoreconf call, add some checks to detect failures
........

Modified:
  libx11/repos/extra-i686/	(properties)
  libx11/repos/extra-i686/PKGBUILD
Deleted:
  libx11/repos/extra-i686/libX11-1.1.2-fix-XGetMotionEvents.patch

-----------------------------------------+
 PKGBUILD                                |   26 ++++++++++++++------------
 libX11-1.1.2-fix-XGetMotionEvents.patch |   15 ---------------
 2 files changed, 14 insertions(+), 27 deletions(-)


Property changes on: libx11/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libx11/trunk:1
   + /libx11/trunk:1-1881

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-22 17:44:01 UTC (rev 1881)
+++ extra-i686/PKGBUILD	2008-05-22 17:44:17 UTC (rev 1882)
@@ -2,8 +2,8 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor Jan de Groot <jgc at archlinux.org>
 pkgname=libx11
-pkgver=1.1.3
-pkgrel=6
+pkgver=1.1.4
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,28 +15,30 @@
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
 	012_ru_RU_UTF-8_XLC_LOCALE.diff
 	xorg.sh)
+md5sums=('1469a5a8aa8d288dce6f4c45d2f68dc3'
+         'c7e38a68b932ed557bc71979eed2a8a1'
+         'ea3f14c529072c8be061493763479800')
 
 build() {
   cd ${startdir}/src/libX11-${pkgver}
   patch -Np1 -i ${startdir}/src/012_ru_RU_UTF-8_XLC_LOCALE.diff || return 1
 
-  aclocal
-  autoconf
-  automake
 
+  libtoolize --force --copy || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake --add-missing || return 1
+
   ./configure --prefix=/usr \
-              --build=${CHOST} --host=${CHOST} \
-              --with-xcb
+              --with-xcb || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
-  mkdir -p ${startdir}/pkg/etc/profile.d 
+  install -d -m755 ${startdir}/pkg/etc/profile.d 
   install -m755 ${startdir}/src/xorg.sh \
                 ${startdir}/pkg/etc/profile.d/ || return 1
 
+  install -d -m755 ${startdir}/pkg/usr/share/licenses/${pkgname}
   install -m644 -D ${startdir}/src/libX11-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+                   ${startdir}/pkg/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums=('4d43d3e472c552d2f191ecdd4e75112c'
-         'c7e38a68b932ed557bc71979eed2a8a1'
-         'ea3f14c529072c8be061493763479800')

Deleted: extra-i686/libX11-1.1.2-fix-XGetMotionEvents.patch
===================================================================
--- extra-i686/libX11-1.1.2-fix-XGetMotionEvents.patch	2008-05-22 17:44:01 UTC (rev 1881)
+++ extra-i686/libX11-1.1.2-fix-XGetMotionEvents.patch	2008-05-22 17:44:17 UTC (rev 1882)
@@ -1,15 +0,0 @@
-diff --git a/src/GetMoEv.c b/src/GetMoEv.c
-index 2aa6c1a..dac1bfc 100644
---- a/src/GetMoEv.c
-+++ b/src/GetMoEv.c
-@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open Group.
- 
- XTimeCoord *XGetMotionEvents(
-     register Display *dpy,
-+    Window w,
-     Time start, 
-     Time stop,
--    Window w,
-     int *nEvents)  /* RETURN */
- {       
-     xGetMotionEventsReply rep;