From dd8c8322c76e6671f17c512de1ca9abb305f70f0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 7 Apr 2012 17:54:18 -0500
Subject: usbmuxd: fix version number detection

---
 abs/extra/usbmuxd/PKGBUILD               |  9 ++++++---
 abs/extra/usbmuxd/__changelog            |  1 +
 abs/extra/usbmuxd/usbmuxd-describe.patch | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 abs/extra/usbmuxd/__changelog
 create mode 100644 abs/extra/usbmuxd/usbmuxd-describe.patch

diff --git a/abs/extra/usbmuxd/PKGBUILD b/abs/extra/usbmuxd/PKGBUILD
index 74a7fb8..758cb66 100644
--- a/abs/extra/usbmuxd/PKGBUILD
+++ b/abs/extra/usbmuxd/PKGBUILD
@@ -13,13 +13,13 @@ depends=('libusb>=1.0.8')
 makedepends=('cmake')
 install=usbmuxd.install
 source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        usbmuxd-udevuser.patch)
-md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
-         '8526f24f4ad16cd6b2a7321c0b59592c')
+        usbmuxd-udevuser.patch
+        usbmuxd-describe.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
+  patch -Np1 -i "${srcdir}/usbmuxd-describe.patch"
   mkdir build
   cd build
   cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
@@ -30,3 +30,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
+         '8526f24f4ad16cd6b2a7321c0b59592c'
+         'bac157d6e01e1e0d56750f73850b96fb')
diff --git a/abs/extra/usbmuxd/__changelog b/abs/extra/usbmuxd/__changelog
new file mode 100644
index 0000000..7b30556
--- /dev/null
+++ b/abs/extra/usbmuxd/__changelog
@@ -0,0 +1 @@
+- added usbmuxd-describe.patch so version number is correctly detected
diff --git a/abs/extra/usbmuxd/usbmuxd-describe.patch b/abs/extra/usbmuxd/usbmuxd-describe.patch
new file mode 100644
index 0000000..3023235
--- /dev/null
+++ b/abs/extra/usbmuxd/usbmuxd-describe.patch
@@ -0,0 +1,20 @@
+--- usbmuxd-1.0.7/Modules/describe.sh.orig	2012-04-07 22:37:03.218203610 +0000
++++ usbmuxd-1.0.7/Modules/describe.sh	2012-04-07 22:37:22.979010437 +0000
+@@ -1,17 +1,8 @@
+ #!/bin/bash
+ 
+-# Check for git and a git repo.
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+-	/bin/echo -n `git describe`
+-
+-	# Are there uncommitted changes?
+-	git update-index --refresh --unmerged > /dev/null
+-	git diff-index --quiet HEAD || /bin/echo -n -dirty
+-else
+ # Check for version tag
+ 	if [ -e version.tag ]; then
+ 		/bin/echo -n `cat version.tag`
+ 	fi
+-fi
+ 
+ echo
-- 
cgit v0.12

