From ee60f2fc104c7c08bb0c9a24563be2889a465069 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 23 Jul 2015 00:20:20 +0100
Subject: [PATCH] libimobiledevice: PyString_AsString -> PyBytes_AsString

---
 ...String_AsString-now-PyBytes_AsString.patch | 19 +++++++++++++++++++
 mingw-w64-libimobiledevice/PKGBUILD           |  7 +++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 mingw-w64-libimobiledevice/0002-PyString_AsString-now-PyBytes_AsString.patch

diff --git a/mingw-w64-libimobiledevice/0002-PyString_AsString-now-PyBytes_AsString.patch b/mingw-w64-libimobiledevice/0002-PyString_AsString-now-PyBytes_AsString.patch
new file mode 100644
index 0000000000..a307296c61
--- /dev/null
+++ b/mingw-w64-libimobiledevice/0002-PyString_AsString-now-PyBytes_AsString.patch
@@ -0,0 +1,19 @@
+diff -urN libimobiledevice-1.2.0.orig/cython/debugserver.pxi libimobiledevice-1.2.0/cython/debugserver.pxi
+--- libimobiledevice-1.2.0.orig/cython/debugserver.pxi	2015-07-22 22:43:52.357279900 +0100
++++ libimobiledevice-1.2.0/cython/debugserver.pxi	2015-07-22 22:44:40.303768000 +0100
+@@ -44,13 +44,13 @@
+ 
+ 
+ # from http://stackoverflow.com/a/17511714
+-from cpython.string cimport PyString_AsString
++from cpython.bytes cimport PyBytes_AsString
+ cdef char ** to_cstring_array(list_str):
+     if not list_str:
+         return NULL
+     cdef char **ret = <char **>malloc(len(list_str) * sizeof(char *))
+     for i in xrange(len(list_str)):
+-        ret[i] = PyString_AsString(list_str[i])
++        ret[i] = PyBytes_AsString(list_str[i])
+     return ret
+ 
+ 
diff --git a/mingw-w64-libimobiledevice/PKGBUILD b/mingw-w64-libimobiledevice/PKGBUILD
index 9fc1429af1..73c0043782 100644
--- a/mingw-w64-libimobiledevice/PKGBUILD
+++ b/mingw-w64-libimobiledevice/PKGBUILD
@@ -10,16 +10,19 @@ url='http://www.libimobiledevice.org/'
 license=('GPL2+')
 options=('staticlibs')
 source=("http://www.libimobiledevice.org/downloads/${_realname}-${pkgver}.tar.bz2"
-        001-cython-includes.patch)
+        001-cython-includes.patch
+        0002-PyString_AsString-now-PyBytes_AsString.patch)
 depends=("${MINGW_PACKAGE_PREFIX}-libusbmuxd"
          "${MINGW_PACKAGE_PREFIX}-libplist"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 sha1sums=('a8e3f21180b1d6df754d04a4080a29cf6891e701'
-          '9d091cf73ce1477db7b78fc8e47572e2e3031e79')
+          '9d091cf73ce1477db7b78fc8e47572e2e3031e79'
+          'e54edd0b3b061ac8531c03b13a6b9336b5927a20')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/001-cython-includes.patch
+  patch -p1 -i ${srcdir}/0002-PyString_AsString-now-PyBytes_AsString.patch
 
   autoreconf -fiv
 }