Updated PKGBUILD

3 files changed, 35 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a437840305fd..82e38a4ab7ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Feb 10 13:55:16 UTC 2016
 pkgbase = dcompmgr-git
 	pkgdesc = Dana's composite manager (not for production use)
-	pkgver = 20160210
+	pkgver = r95.0eddc6e
 	pkgrel = 1
 	url = http://git.openbox.org/?p=dana/dcompmgr.git;a=summary
 	arch = i686
@@ -10,6 +8,10 @@ pkgbase = dcompmgr-git
 	license = GPL
 	depends = libgl
 	depends = glproto
+	source = dcompmgr-git::git://git.openbox.org/dana/dcompmgr
+	source = 0001-xcb-libs.patch
+	md5sums = SKIP
+	md5sums = 11d81b16ff87085d64c6e84628c936a3
 
 pkgname = dcompmgr-git
 
diff --git a/0001-xcb-libs.patch b/0001-xcb-libs.patch
new file mode 100644
index 000000000000..cbc36125f002
--- /dev/null
+++ b/0001-xcb-libs.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2016-06-25 20:43:42.590739102 +0200
++++ b/Makefile	2016-06-25 20:52:37.994050977 +0200
+@@ -14,7 +14,7 @@
+ 
+ CFLAGS=$(shell pkg-config --cflags xcb-glx xcb-composite xcb-damage glib-2.0) -W -Wall $(PFLAGS) $(DFLAGS)
+ LDFLAGS=$(PFLAGS)
+-LIBS=$(shell pkg-config --libs xcb-glx xcb-composite xcb-damage glib-2.0) -lGL $(PLIBS) -lX11 -lX11-xcb
++LIBS=$(shell pkg-config --libs xcb xcb-xfixes xcb-render xcb-shape xcb-damage xcb-glx xcb-composite glib-2.0) -lGL $(PLIBS) -lX11 -lX11-xcb
+ 
+ dcompmgr: $(objs)
+ 	$(CC) -o $@ $^ $(LIBS) $(LDFLAGS)
diff --git a/PKGBUILD b/PKGBUILD
index ba2c73cfdaaf..6d9e289618e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,38 +2,39 @@
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=dcompmgr-git
-pkgver=20160210
+pkgver=r95.0eddc6e
 pkgrel=1
 pkgdesc="Dana's composite manager (not for production use)"
 arch=(i686 x86_64)
 url="http://git.openbox.org/?p=dana/dcompmgr.git;a=summary"
 license=('GPL')
 depends=('libgl' 'glproto')
-_gitroot="git://git.openbox.org/dana/dcompmgr"
-_gitname="dcompmgr"
+source=("${pkgname}::git://git.openbox.org/dana/dcompmgr"
+        '0001-xcb-libs.patch')
+md5sums=('SKIP'
+         '11d81b16ff87085d64c6e84628c936a3')
 
-package() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
+pkgver() {
+  cd "${pkgname}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
-  if [ -d $_gitname ] ; then
-    cd $_gitname
-    make clean
-    git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-    cd "$_gitname"
-  fi
+prepare() {
+  cd "${srcdir}/${pkgname}"
+  patch -p1 < "../0001-xcb-libs.patch"
 
   # There is no option to disable shadows
   _X_SHADOWOFFSET=0
   _Y_SHADOWOFFSET=0
   sed -i -e "s#d->xshadowoff = 2;#d->xshadowoff = ${_X_SHADOWOFFSET};#" -e "s#d->yshadowoff = 2;#d->yshadowoff = ${_Y_SHADOWOFFSET};#" *.c
+}
 
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
+build() {
+  cd "${srcdir}/${pkgname}"
   make
-  install -D -m 0755 dcompmgr ${pkgdir}/usr/bin/dcompmgr
 }
 
+package() {
+  cd "${srcdir}/${pkgname}"
+  install -D -m 0755 dcompmgr "${pkgdir}/usr/bin/dcompmgr"
+}