Merge pull request #3543 from lazka/update-lndir

Update lndir,xproto

lndir/0001-msysize.msys.patch

@@ -1,33 +0,0 @@
---- lndir-1.0.3/config.guess.orig	2013-06-15 15:28:50.269926300 +0000
-+++ lndir-1.0.3/config.guess	2013-06-15 15:30:52.725976200 +0000
-@@ -801,6 +801,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-@@ -841,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
---- lndir-1.0.3/config.sub.orig	2013-06-15 15:28:50.269926300 +0000
-+++ lndir-1.0.3/config.sub	2013-06-15 15:32:21.027189000 +0000
-@@ -1315,7 +1315,7 @@
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-android* \
- 	      | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \

lndir/PKGBUILD

@@ -1,28 +1,26 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=lndir
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Create a shadow directory of symbolic links to another directory tree"
 arch=('i686' 'x86_64')
 url="https://xorg.freedesktop.org/"
 license=('custom')
 makedepends=('xproto' 'autotools' 'gcc')
-source=(https://xorg.freedesktop.org/archive/individual/util/$pkgname-$pkgver.tar.bz2
-        0001-msysize.msys.patch)
-sha256sums=('49f4fab0de8d418db4ce80dad34e9b879a4199f3e554253a8e1ab68f7c7cb65d'
-            'fe924531fd201526eb9446d7aba4c7b084c2ee5ece5d56f884b3008a459c5499')
+source=(https://xorg.freedesktop.org/archive/individual/util/$pkgname-$pkgver.tar.xz)
+sha256sums=('3e3437a9d3bb377755dd04a2c90d4c014d9fe90987ff73450bf5b8d161795e87')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p1 -i ${srcdir}/0001-msysize.msys.patch
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --build=${CHOST} \
+  export MSYSTEM=CYGWIN
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+  ./configure --build=${CYGWIN_CHOST} \
               --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var

xproto/0001-msysize.msys.patch

@@ -1,12 +0,0 @@
---- xproto-7.0.24/config.guess.orig	2013-06-15 15:28:50.269926300 +0000
-+++ xproto-7.0.24/config.guess	2013-06-15 15:30:52.725976200 +0000
-@@ -841,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;

xproto/PKGBUILD

@@ -1,29 +1,28 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
 pkgname=xproto
-pkgver=7.0.26
+pkgver=7.0.31
 pkgrel=1
 pkgdesc="X11 core wire protocol and auxiliary headers"
 arch=(any)
 license=('custom')
 groups=('development')
 url="https://xorg.freedesktop.org/"
-makedepends=('util-macros' 'autotools')
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2
-        0001-msysize.msys.patch)
-sha256sums=('636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f'
-            '7c617a5012733c5290f74e14f73521688345e8b5ccb5747e0466834ebbad4028')
+makedepends=('util-macros' 'autotools' 'gcc')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 -i ${srcdir}/0001-msysize.msys.patch
   autoreconf -ivf
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --build=${CHOST} --prefix=/usr
+  export MSYSTEM=CYGWIN
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+  ./configure --build=${CYGWIN_CHOST} --prefix=/usr
   make
 }