Array of fixes

hugin-tools/PKGBUILD

@@ -42,7 +42,7 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # Remove frontend files
-  rm -f "${pkgdir}"/usr/share/applications/pto_gen.desktop 
+  rm -rf "${pkgdir}"/usr/share/applications
   rm -rf "${pkgdir}"/usr/share/man
   rm -rf "${pkgdir}"/usr/share/locale
 }

libgpod/PKGBUILD

@@ -6,8 +6,8 @@ pkgrel=3
 pkgdesc="libgpod is a shared library to access the contents of an iPod"
 arch=('x86_64')
 license=('LGPL')
-depends=('mutagen' 'sg3_utils>=1.27' 'libimobiledevice' 'gdk-pixbuf2')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject')
+depends=('mutagen' 'sg3_utils' 'libplist' 'libimobiledevice' 'gdk-pixbuf2')
+makedepends=('intltool' 'swig' 'docbook-xsl' 'python2-gobject')
 url="http://www.gtkpod.org/libgpod.html"
 source=("http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2")
 options=(!libtool)

libimobiledevice/PKGBUILD

@@ -8,7 +8,7 @@ url="http://libimobiledevice.org/"
 arch=('x86_64')
 license=('GPL2' 'LGPL2.1')
 depends=('gnutls'  'glib2' 'libplist' 'usbmuxd' 'libgcrypt')
-makedepends=('swig' 'python2')
+makedepends=('python2')
 options=('!libtool')
 source=("http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d9debdcf71508dee2c85b60b28ccddd4')

usbmuxd/PKGBUILD

@@ -1,28 +1,34 @@
 #
 # Platform Packages for Chakra, part of chakra-project.org
 #
-# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=usbmuxd
 pkgver=1.0.8
-pkgrel=2
+pkgrel=6
 pkgdesc="USB Multiplex Daemon"
 url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('x86_64')
+arch=('i686' 'x86_64')
 license=('GPL2' 'GPL3' 'LGPL2.1')
 depends=('libusb' 'libplist')
 makedepends=('cmake')
 install=usbmuxd.install
 source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
-        'usbmuxd.service'
-	'85-usbmuxd.rules')
+	'usbmuxd.service'
+	'85-usbmuxd.rules'
+        'describe.sh')
 md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
-         '099ab951e94be0803f5706f90dc63054'
-         'dc4b2893651149eccbf7b2c8467cd288')
+         'dae0660f972510a6483992b5b81e1b5a'
+         'dc4b2893651149eccbf7b2c8467cd288'
+         'cee8939dde34ab17ba0832bc53611541')
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  echo "${pkgver}" > version.tag
+
+  echo "${pkgver}" > version.tag  
+  rm "${srcdir}/${pkgname}-${pkgver}/Modules/describe.sh"
+  cp "${srcdir}/describe.sh" "${srcdir}/${pkgname}-${pkgver}/Modules/describe.sh"
+
   mkdir build
   cd build
   cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
@@ -33,23 +39,11 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 
- # Fix dirty versioning
-  if [ -e ${pkgdir}/usr/lib/libusbmuxd.so.-dirty ] ; then
-  sed -i -e "s~-dirty~${pkgver}~g" ${pkgdir}/usr/lib/pkgconfig/libusbmuxd.pc
-  mv ${pkgdir}/usr/lib/libusbmuxd.so.-dirty ${pkgdir}/usr/lib/libusbmuxd.so.${pkgver}
-  elif [ -e ${pkgdir}/usr/lib/libusbmuxd.so.UNKNOWN ] ; then
-  sed -i -e "s~-UNKNOWN~${pkgver}~g" ${pkgdir}/usr/lib/pkgconfig/libusbmuxd.pc
-  mv ${pkgdir}/usr/lib/libusbmuxd.so.UNKNOWN ${pkgdir}/usr/lib/libusbmuxd.so.${pkgver}
-  fi
-
- # install systemd service file
-  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
-
-  # udev moved to /usr/lib
+  # fix udev dir being hardcoded
   mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
   rmdir "${pkgdir}/lib"
-
+  # install systemd service file
+  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
   # use udev rule that works with systemd
   install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
 }
-

usbmuxd/describe.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ -e version.tag ]; then
+  /bin/echo -n `cat version.tag`
+fi

usbmuxd/usbmuxd.service

@@ -2,4 +2,4 @@
 Description=iOS USB Muxer
 
 [Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux
+ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux