1.16.r4

3 files changed, 77 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7cd028a4ec63..908e17d0ef21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = libxcb-git
-	pkgdesc = X11 client-side library - git version
-	pkgver = 1.14.r1.g704e0a9
+	pkgdesc = X11 client-side library
+	pkgver = 1.16.r4.g02a7bbe
 	pkgrel = 1
 	url = http://xcb.freedesktop.org
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = git
 	makedepends = libxslt
 	makedepends = python
 	makedepends = xorg-util-macros
 	makedepends = xorgproto
-	depends = xcb-proto-git
-	depends = libxdmcp
+	makedepends = git
+	depends = glibc
 	depends = libxau
-	provides = libxcb=1.14.r1.g704e0a9
+	depends = libxdmcp
+	depends = xcb-proto-git
+	provides = libxcb=1.16
 	conflicts = libxcb
-	source = git+http://anongit.freedesktop.org/git/xcb/libxcb.git
+	source = libxcb::git+http://anongit.freedesktop.org/git/xcb/libxcb.git
 	sha256sums = SKIP
 
 pkgname = libxcb-git
-
diff --git a/.gitignore b/.gitignore
index 783f7f246d75..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/pkg/
-/src/
-/libxcb/
-/*.pkg.tar.xz
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 952bcbc3a98c..19422da0308f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,83 @@
-# Maintainer: Philipp A. <flying-sheep@web.de>
+# Maintainer:
+# Contributor: Philipp A. <flying-sheep@web.de>
 # Contributor: Doug Newgard <scimmia22 at outlook dot com>
 # Contributor: NeoRaider <neoraider@universe-factory.net>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
-pkgname=libxcb-git
-pkgver=1.14.r1.g704e0a9
+
+_pkgname="libxcb"
+pkgname="$_pkgname-git"
+pkgver=1.16.r4.g02a7bbe
 pkgrel=1
-pkgdesc='X11 client-side library - git version'
+pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url='http://xcb.freedesktop.org'
-depends=(xcb-proto-git libxdmcp libxau)
-makedepends=(git libxslt python xorg-util-macros xorgproto)
-conflicts=(libxcb)
-provides=("libxcb=$pkgver")
-license=(custom)
-source=('git+http://anongit.freedesktop.org/git/xcb/libxcb.git')
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/${pkgname%-*}"
-  git describe --tags | sed 's/libxcb-//;s/-/.r/;s/-/./g'
-}
+license=('custom')
 
-build() {
-  cd "$srcdir/${pkgname%-*}"
+depends=(
+  # extra/libxcb
+  'glibc'
+  'libxau'
+  'libxdmcp'
+)
+makedepends=(
+  # extra/libxcb
+  'libxslt'
+  'python'
+  'xorg-util-macros'
+  'xorgproto'
+)
+
+if [ x"$pkgname" == x"$_pkgname" ] ; then
+  # extra/libxcb
+  depends+=('xcb-proto')
+else
+  # aur/libxcb-git
+  depends+=('xcb-proto-git')
+  makedepends+=('git')
+
+  provides=("$_pkgname=${pkgver//.r*}")
+  conflicts=("$_pkgname")
+
+  _pkgsrc="$_pkgname"
+  source=(
+    "$_pkgname"::"git+http://anongit.freedesktop.org/git/xcb/libxcb.git"
+  )
+  sha256sums=(
+    'SKIP'
+  )
+
+  pkgver() {
+    cd "$srcdir/$_pkgsrc"
+    git describe --tags | sed 's/libxcb-//;s/-/.r/;s/-/./g'
+  }
+fi
 
-  ./autogen.sh \
-    --prefix=/usr \
-    --enable-xinput \
-    --enable-xkb \
-    --with-doxygen=no \
+build() {
+  cd "$srcdir/$_pkgsrc"
+  local _config_options=(
+    --prefix='/usr'
+    --enable-xinput
+    --enable-xkb
     --disable-static
 
+    --with-doxygen=no
+  )
+
+  ./autogen.sh "${_config_options[@]}"
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
-package() {
-  cd "$srcdir/${pkgname%-*}"
+check() {
+  cd "$srcdir/$_pkgsrc"
+  make -k check
+}
 
+package() {
+  cd "$srcdir/$_pkgsrc"
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/$pkgname/"
 }