From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SVesE-0001OO-0o for garchives@archives.gentoo.org; Sat, 19 May 2012 08:18:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C357E07A8; Sat, 19 May 2012 08:18:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 501F9E07A8 for ; Sat, 19 May 2012 08:18:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D25F1B401E for ; Sat, 19 May 2012 08:18:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id 325942004C; Sat, 19 May 2012 08:18:40 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-pda/libimobiledevice/files: libimobiledevice-1.1.4-cython.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: libimobiledevice-1.1.4-cython.patch X-VCS-Directories: app-pda/libimobiledevice/files X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20120519081840.325942004C@flycatcher.gentoo.org> Date: Sat, 19 May 2012 08:18:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e9d5a5bc-9ea0-4a1e-a597-80795d590877 X-Archives-Hash: b0e32a6b3b9287bc75a07cfc9c654358 ssuominen 12/05/19 08:18:40 Added: libimobiledevice-1.1.4-cython.patch Log: Fix compability with dev-python/cython >=3D 0.16 wrt #414063 =20 (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) Revision Changes Path 1.1 app-pda/libimobiledevice/files/libimobiledevice-1.1.= 4-cython.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobile= device/files/libimobiledevice-1.1.4-cython.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/libimobile= device/files/libimobiledevice-1.1.4-cython.patch?rev=3D1.1&content-type=3D= text/plain Index: libimobiledevice-1.1.4-cython.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D http://bugs.gentoo.org/414063 http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=3D70dfe8ad176= 6990386f1db04bbe5a4826bcde4e5 http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=3D84235e0834e= 57551028329723f4510e1dbe7bc11 http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=3D849ea066426= b8f5f6e6d1aea9804e095edca3b49 --- configure.ac +++ configure.ac @@ -83,10 +83,20 @@ CYTHON=3Dfalse fi if [test "x$CYTHON" !=3D "xfalse"]; then - CYTHON_SUB=3Dcython + AC_MSG_CHECKING([for libplist Cython bindings]) CYTHON_PLIST_INCLUDE_DIR=3D$($PKG_CONFIG --variable=3Dinclud= edir libplist)/plist/cython - AC_SUBST([CYTHON_PLIST_INCLUDE_DIR]) - cython_python_bindings=3Dyes + if [test ! -d "$CYTHON_PLIST_INCLUDE_DIR"]; then + CYTHON=3Dfalse + CYTHON_SUB=3D + cython_python_bindings=3Dno + AC_MSG_RESULT([no]) + AC_MSG_WARN([cannot find libplist Cython bindings. You s= hould install your distribution specific libplist Cython bindings package= .]) + else + AC_SUBST([CYTHON_PLIST_INCLUDE_DIR]) + AC_MSG_RESULT([$CYTHON_PLIST_INCLUDE_DIR]) + CYTHON_SUB=3Dcython + cython_python_bindings=3Dyes + fi else CYTHON_SUB=3D cython_python_bindings=3Dno --- cython/afc.pxi +++ cython/afc.pxi @@ -162,7 +162,7 @@ err =3D afc_client_free(self._c_client) self.handle_error(err) =20 - cdef inline BaseError _error(self, int16_t ret): + cdef BaseError _error(self, int16_t ret): return AfcError(ret) =20 cpdef list get_device_info(self): --- cython/imobiledevice.pxd +++ cython/imobiledevice.pxd @@ -51,8 +51,8 @@ cdef class PropertyListService(BaseService): cpdef send(self, plist.Node node) cpdef object receive(self) - cdef inline int16_t _send(self, plist.plist_t node) - cdef inline int16_t _receive(self, plist.plist_t* c_node) + cdef int16_t _send(self, plist.plist_t node) + cdef int16_t _receive(self, plist.plist_t* c_node) =20 cdef extern from "libimobiledevice/lockdown.h": cdef struct lockdownd_client_private: --- cython/imobiledevice.pyx +++ cython/imobiledevice.pyx @@ -25,9 +25,8 @@ return 0 cdef BaseError err =3D self._error(ret) raise err - return -1 =20 - cdef inline BaseError _error(self, int16_t ret): pass + cdef BaseError _error(self, int16_t ret): pass =20 cdef extern from "libimobiledevice/libimobiledevice.h": ctypedef enum idevice_error_t: @@ -211,10 +210,10 @@ plist.plist_free(c_node) raise =20 - cdef inline int16_t _send(self, plist.plist_t node): + cdef int16_t _send(self, plist.plist_t node): raise NotImplementedError("send is not implemented") =20 - cdef inline int16_t _receive(self, plist.plist_t* c_node): + cdef int16_t _receive(self, plist.plist_t* c_node): raise NotImplementedError("receive is not implemented") =20 cdef class DeviceLinkService(PropertyListService): --- cython/mobilesync.pxi +++ cython/mobilesync.pxi @@ -149,10 +149,10 @@ plist.plist_free(remapping) raise =20 - cdef inline int16_t _send(self, plist.plist_t node): + cdef int16_t _send(self, plist.plist_t node): return mobilesync_send(self._c_client, node) =20 - cdef inline int16_t _receive(self, plist.plist_t* node): + cdef int16_t _receive(self, plist.plist_t* node): return mobilesync_receive(self._c_client, node) =20 cdef inline BaseError _error(self, int16_t ret): --- m4/ac_pkg_cython.m4 +++ m4/ac_pkg_cython.m4 @@ -6,8 +6,11 @@ CYTHON=3Dfalse elif test -n "$1" ; then AC_MSG_CHECKING([for Cython version]) - [cython_version=3D`$CYTHON --version 2>&1 | grep 'Cython= version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] + [cython_version=3D`$CYTHON --version 2>&1 | sed 's/Cytho= n version \(.*\)$/\1/g'`] AC_MSG_RESULT([$cython_version]) + + # Setup extra version string for parsing + [cython_version_stripped=3D`echo $cython_version | sed '= s/\([0-9]\+\)\.\([0-9]\+\)[^\.]*\(\.\([0-9]\+\)\)\?.*/0\1.0\2.0\4/g'`] if test -n "$cython_version" ; then # Calculate the required version number componen= ts [required=3D$1] @@ -25,8 +28,9 @@ if test -z "$required_patch" ; then [required_patch=3D0] fi + # Calculate the available version number compone= nts - [available=3D$cython_version] + [available=3D$cython_version_stripped] [available_major=3D`echo $available | sed 's/[^0= -9].*//'`] if test -z "$available_major" ; then [available_major=3D0] @@ -41,6 +45,7 @@ if test -z "$available_patch" ; then [available_patch=3D0] fi + if test $available_major -gt $required_major || = \ ( test $available_major -eq $required_ma= jor && \ test $available_minor -gt $require= d_minor ) || \