[arch-commits] Commit in libimobiledevice/trunk (PKGBUILD swig-version-check.patch)

[Jan Steffens]

    Date: Thursday, March 29, 2012 @ 17:06:35
  Author: heftig
Revision: 154534

partial revert

Added:
  libimobiledevice/trunk/swig-version-check.patch
Modified:
  libimobiledevice/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   21 ++++++++++-----------
 swig-version-check.patch |   14 ++++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-29 21:02:26 UTC (rev 154533)
+++ PKGBUILD	2012-03-29 21:06:35 UTC (rev 154534)
@@ -3,25 +3,24 @@
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=libimobiledevice
-pkgver=1.1.2
-pkgrel=1
+pkgver=1.1.1
+pkgrel=3
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'libplist')
-makedepends=('python2' 'cython2')
+depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt')
+makedepends=('python2' 'swig')
 options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-md5sums=('82851e4ca9794ee660ffca9f78c8e068')
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
+        swig-version-check.patch)
+md5sums=('cdc13037e822d9ac2e109536701d153a'
+         '8bb215e36fe0e08a72332c108c7842cc')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  mkdir "$srcdir/cython2-path"
-  ln -s /usr/bin/cython2 "$srcdir/cython2-path/cython"
-  export PATH="$srcdir/cython2-path:$PATH"
-
+  # SWIG version check is wrong (still not fixed upstream)
+  patch -p1 -i ../swig-version-check.patch
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }

Added: swig-version-check.patch
===================================================================
--- swig-version-check.patch	                        (rev 0)
+++ swig-version-check.patch	2012-03-29 21:06:35 UTC (rev 154534)
@@ -0,0 +1,14 @@
+diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
+--- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
++++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
+@@ -3477,9 +3477,7 @@
+                         if test -z "$available_patch" ; then
+                                 available_patch=0
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++                        if test $available_major -lt $required_major ; then
+                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
+ $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
+                                 SWIG=false