version 1:r79-1 (cxx11 ABI)

2 files changed, 28 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c826bf6cb0f6..33f8b267e177 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue Dec 15 21:15:42 UTC 2015
+# Tue Dec 15 21:28:53 UTC 2015
 pkgbase = xsettingsd
 	pkgdesc = xsettingsd is a daemon that implements the XSETTINGS specification.
-	pkgver = 20120522
+	pkgver = r79
 	pkgrel = 1
+	epoch = 1
 	url = http://code.google.com/p/xsettingsd/
 	arch = i686
 	arch = x86_64
@@ -11,6 +12,8 @@ pkgbase = xsettingsd
 	makedepends = git
 	makedepends = scons
 	depends = libx11
+	source = git+https://github.com/derat/xsettingsd.git
+	md5sums = SKIP
 
 pkgname = xsettingsd
 
diff --git a/PKGBUILD b/PKGBUILD
index 1c5ebf19aef4..132b7bc24879 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,37 @@
+# Maintainer: Brian Bidulock <bidulock@openss7.org>
+
+# This package is not named -git because there are no releases for xsettingsd.
 pkgname=xsettingsd
-pkgver=20120522
+pkgver=r79
 pkgrel=1
+epoch=1
 pkgdesc="xsettingsd is a daemon that implements the XSETTINGS specification."
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/xsettingsd/"
 license=('custom:BSD')
 depends=('libx11')
 makedepends=('git' 'scons')
-source=()
-_gitroot="git://github.com/derat/xsettingsd.git"
-_gitname="xsettingsd"
+source=("git+https://github.com/derat/xsettingsd.git")
+md5sums=('SKIP')
 
-# trick re-determining the build revision and, or entertain the hidden
-# makepkg option --forcever, huh
-if [ -z "$FORCE_VER" ]; then
-	msg "Determining latest build revision..."
-	FORCE_VER=$(wget -q -O- http://github.com/derat/xsettingsd/commits/master  \
-	               | grep '<abbr class="relatize" title='                      \
-	               | head -n1                                                  \
-	               | awk '{print $3;}'                                         \
-	               | sed -e 's/.*"//' -e "s/-//g")
-fi
+pkgver() {
+  cd ${pkgname}
+  printf "r%s" "$(git rev-list --count HEAD)"
+}
 
 build() {
-	cd "$srcdir"
-	msg "Connecting to GIT server...."
-
-	if [ -d $_gitname ] ; then
-		cd $_gitname && git pull origin
-		msg "The local files are updated."
-	else
-		git clone $_gitroot
-		cd $_gitname
-	fi
-
-	msg "GIT checkout done or server timeout"
-	msg "Starting make..."
-
-	env CPPFLAGS="$CXXFLAGS" scons xsettingsd dump_xsettings
+  cd ${pkgname}
+  env CPPFLAGS="$CXXFLAGS" scons xsettingsd dump_xsettings
 }
+
 package() {
-	cd "$srcdir/$_gitname"
-	install -d ${pkgdir}/usr/bin || return 1
-	install -d ${pkgdir}/usr/share/licenses/${pkgname} || return 1
-	install -d ${pkgdir}/usr/share/man/man1 || return 1
-	install -m 755 ${pkgname} ${pkgdir}/usr/bin/ || return 1
-	install -m 755 dump_xsettings ${pkgdir}/usr/bin/ || return 1
-	install -m 644 xsettingsd.1 ${pkgdir}/usr/share/man/man1/ || return 1
-	install -m 644 dump_xsettings.1 ${pkgdir}/usr/share/man/man1/ || return 1
-	install -m 644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  cd ${pkgname}
+  install -d ${pkgdir}/usr/bin
+  install -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -d ${pkgdir}/usr/share/man/man1
+  install -m 755 ${pkgname} ${pkgdir}/usr/bin/
+  install -m 755 dump_xsettings ${pkgdir}/usr/bin/
+  install -m 644 xsettingsd.1 ${pkgdir}/usr/share/man/man1/
+  install -m 644 dump_xsettings.1 ${pkgdir}/usr/share/man/man1/
+  install -m 644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
 }