updated deps

4 files changed, 24 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a9956036b65..b524b5e77493 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = libxcb-git
 	pkgdesc = X11 client-side library - git version
-	pkgver = 1.11.r58.gb15c96f
+	pkgver = 1.12.r7.gf830eb9
 	pkgrel = 1
-	url = http://xcb.freedesktop.org/
+	url = http://xcb.freedesktop.org
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = git
-	makedepends = libxslt
 	makedepends = python
+	makedepends = xorg-util-macros
+	makedepends = libxslt
+	makedepends = libpthread-stubs
 	depends = xcb-proto-git
 	depends = libxdmcp
 	depends = libxau
-	provides = libxcb=1.11.r58.gb15c96f
+	provides = libxcb=1.12.r7.gf830eb9
 	conflicts = libxcb
 	source = git+http://anongit.freedesktop.org/git/xcb/libxcb.git
-	source = libxcb-1.1-no-pthread-stubs.patch
 	sha256sums = SKIP
-	sha256sums = 3923bcb1930b851012968435909597d8d5251c72153511cb2982636c97100cc3
 
 pkgname = libxcb-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..783f7f246d75
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg/
+/src/
+/libxcb/
+/*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 9a917c794ce4..5b90ab7dde52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,29 @@
+# Maintainer: 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.11.r58.gb15c96f
+pkgver=1.12.r7.gf830eb9
 pkgrel=1
-pkgdesc="X11 client-side library - git version"
-arch=('i686' 'x86_64')
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto-git' 'libxdmcp' 'libxau')
-makedepends=('git' 'libxslt' 'python')
-conflicts=('libxcb')
+pkgdesc='X11 client-side library - git version'
+arch=(i686 x86_64)
+url='http://xcb.freedesktop.org'
+depends=(xcb-proto-git libxdmcp libxau)
+makedepends=(git python xorg-util-macros libxslt libpthread-stubs)
+conflicts=(libxcb)
 provides=("libxcb=$pkgver")
-license=('custom')
-source=("git+http://anongit.freedesktop.org/git/xcb/libxcb.git"
-        'libxcb-1.1-no-pthread-stubs.patch')
-sha256sums=('SKIP'
-            '3923bcb1930b851012968435909597d8d5251c72153511cb2982636c97100cc3')
+license=(custom)
+source=('git+http://anongit.freedesktop.org/git/xcb/libxcb.git')
+sha256sums=(SKIP)
 
 pkgver() {
-  cd $srcdir/${pkgname%-*}
+  cd "$srcdir/${pkgname%-*}"
   git describe --tags | sed 's/-/.r/;s/-/./g'
 }
 
-prepare() {
-  cd $srcdir/${pkgname%-*}
-
-  patch -Np1 < ../libxcb-1.1-no-pthread-stubs.patch
-}
-
 build() {
-  cd $srcdir/${pkgname%-*}
+  cd "$srcdir/${pkgname%-*}"
 
   ./autogen.sh \
     --prefix=/usr \
@@ -42,10 +35,9 @@ build() {
 }
 
 package() {
-  cd $srcdir/${pkgname%-*}
+  cd "$srcdir/${pkgname%-*}"
 
   make DESTDIR="$pkgdir" install
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
-# vim:set ts=2 sw=2 bs=2:
diff --git a/libxcb-1.1-no-pthread-stubs.patch b/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 84c7f8e2fb67..000000000000
--- a/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -43,7 +43,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.11)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"