From fc488cf98bf40a0deebd70ada533701f31d595e6 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Tue, 2 Sep 2014 00:07:03 +0400 Subject: [PATCH] sip: Do not change python modules extension --- mingw-w64-sip/0001-mingw-python.patch | 13 +------------ mingw-w64-sip/PKGBUILD | 5 ++--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mingw-w64-sip/0001-mingw-python.patch b/mingw-w64-sip/0001-mingw-python.patch index ab52d2c99d..76a1c4a7eb 100644 --- a/mingw-w64-sip/0001-mingw-python.patch +++ b/mingw-w64-sip/0001-mingw-python.patch @@ -96,7 +96,7 @@ diff -uNr sip-4.16.2/siputils.py sip-4.16.2-mingw/siputils.py libdir.append(self.config.py_lib_dir) py_lib = "python%u.%u" % ((self.config.py_version >> 16), ((self.config.py_version >> 8) & 0xff)) -@@ -1625,13 +1626,17 @@ +@@ -1625,7 +1626,7 @@ mfile is the file object. """ if self.static: @@ -105,17 +105,6 @@ diff -uNr sip-4.16.2/siputils.py sip-4.16.2-mingw/siputils.py ext = "lib" else: ext = "a" - else: - if sys.platform == "win32": -- ext = "pyd" -+ py_version = sys.hexversion >> 8 -+ if py_version >= 0x030300: -+ ext = "dll" -+ else: -+ ext = "pyd" - elif sys.platform == "darwin": - ext = "so" - elif sys.platform == "cygwin": @@ -2021,7 +2026,7 @@ s is the string. """ diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index 6197f04efa..335969b656 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -2,10 +2,9 @@ # Contributor: Alexey Pavlov _realname=sip - pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.16.2 -pkgrel=4 +pkgrel=5 pkgdesc="Tool to create Python bindings for C and C++ libraries" arch=('any') license=('GPL') @@ -17,7 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" source=("http://downloads.sourceforge.net/project/pyqt/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz" "0001-mingw-python.patch") md5sums=('1ca96f90a7496a3c9664fdaa76205719' - 'd028909352d241b3432c0d119cbee9ab') + 'a01b87229009bacfeb440366dd932648') prepare() { cd "${srcdir}"/${_realname}-${pkgver}