From 3ecb7364b5d8913db0a82ec76eef9b8613d1ff72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 30 Jul 2014 10:46:16 +0200 Subject: [PATCH] sip, pyqt5: use PYD extension for Python modules --- mingw-w64-pyqt5/001-mingw-python.patch | 17 +++-------------- mingw-w64-pyqt5/PKGBUILD | 4 ++-- mingw-w64-sip/0001-mingw-python.patch | 26 ++++++++++---------------- mingw-w64-sip/PKGBUILD | 4 ++-- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/mingw-w64-pyqt5/001-mingw-python.patch b/mingw-w64-pyqt5/001-mingw-python.patch index c307801550..8affbc1637 100644 --- a/mingw-w64-pyqt5/001-mingw-python.patch +++ b/mingw-w64-pyqt5/001-mingw-python.patch @@ -1,6 +1,6 @@ -diff -Naur PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py ---- PyQt-gpl-5.3.1-orig/configure.py 2014-07-04 13:09:11.000000000 +0400 -+++ PyQt-gpl-5.3.1/configure.py 2014-07-28 18:04:45.072600000 +0400 +diff -uNr PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py +--- PyQt-gpl-5.3.1-orig/configure.py 2014-07-30 10:44:24.722615580 +0200 ++++ PyQt-gpl-5.3.1/configure.py 2014-07-30 10:44:53.386614318 +0200 @@ -24,6 +24,7 @@ import shutil import stat @@ -109,14 +109,3 @@ diff -Naur PyQt-gpl-5.3.1-orig/configure.py PyQt-gpl-5.3.1/configure.py g.add_option("--qmake", "-q", dest='qmake', type='string', default=None, action='callback', callback=store_abspath_exe, metavar="FILE", -@@ -2309,8 +2335,8 @@ - - shared = ''' - win32 { -- PY_MODULE = %s%s.pyd -- target.files = %s%s.pyd -+ PY_MODULE = %s%s.dll -+ target.files = %s%s.dll - LIBS += %s - } else { - PY_MODULE = %s.so diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD index 214fd4c5d6..d15797f924 100644 --- a/mingw-w64-pyqt5/PKGBUILD +++ b/mingw-w64-pyqt5/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyqt5 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=5.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Qt5 bindings for Python (mingw-w64)" arch=('any') license=('GPL') @@ -16,7 +16,7 @@ options=('strip' 'staticlibs') source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$pkgver/PyQt-gpl-$pkgver.tar.gz" 001-mingw-python.patch) md5sums=('c24b1a4040292fcfdbf128a9a5a38e66' - '5ef830fe971afb85696594110322b2fe') + '3b11ff26e229e256ee13f484422047d9') prepare() { cd "${srcdir}"/PyQt-gpl-$pkgver diff --git a/mingw-w64-sip/0001-mingw-python.patch b/mingw-w64-sip/0001-mingw-python.patch index 8f832e40c5..ab52d2c99d 100644 --- a/mingw-w64-sip/0001-mingw-python.patch +++ b/mingw-w64-sip/0001-mingw-python.patch @@ -1,6 +1,6 @@ -diff -Naur sip-4.16.2/configure.py sip-4.16.2-mingw/configure.py ---- sip-4.16.2/configure.py 2014-07-03 14:08:46.000000000 +0400 -+++ sip-4.16.2-mingw/configure.py 2014-07-28 14:40:41.708000000 +0400 +diff -uNr sip-4.16.2/configure.py sip-4.16.2-mingw/configure.py +--- sip-4.16.2/configure.py 2014-07-03 12:08:46.000000000 +0200 ++++ sip-4.16.2-mingw/configure.py 2014-07-30 10:41:38.510622892 +0200 @@ -20,6 +20,7 @@ import glob import optparse @@ -53,7 +53,7 @@ diff -Naur sip-4.16.2/configure.py sip-4.16.2-mingw/configure.py def patch_files(): -@@ -398,12 +413,15 @@ +@@ -398,7 +413,10 @@ if not opts.static: # These only need to be correct for Windows. debug_suffix = "_d" if opts.debug else "" @@ -65,15 +65,9 @@ diff -Naur sip-4.16.2/configure.py sip-4.16.2-mingw/configure.py pro.write(""" win32 { - PY_MODULE = %s%s.pyd -- target.files = %s%s.pyd -+ target.files = %s%s.dll - LIBS += %s -lpython%d.%d - QMAKE_POST_LINK = $(COPY_FILE) $(DESTDIR_TARGET) $$PY_MODULE - } else { -diff -Naur sip-4.16.2/siputils.py sip-4.16.2-mingw/siputils.py ---- sip-4.16.2/siputils.py 2014-05-10 19:00:48.000000000 +0400 -+++ sip-4.16.2-mingw/siputils.py 2014-07-28 14:33:49.217000000 +0400 +diff -uNr sip-4.16.2/siputils.py sip-4.16.2-mingw/siputils.py +--- sip-4.16.2/siputils.py 2014-05-10 17:00:48.000000000 +0200 ++++ sip-4.16.2-mingw/siputils.py 2014-07-30 10:41:24.250623520 +0200 @@ -22,7 +22,8 @@ import stat import string @@ -131,9 +125,9 @@ diff -Naur sip-4.16.2/siputils.py sip-4.16.2-mingw/siputils.py s = s.replace("/", "\\") if s.find(" ") >= 0: -diff -Naur sip-4.16.2/specs/win32-g++ sip-4.16.2-mingw/specs/win32-g++ ---- sip-4.16.2/specs/win32-g++ 2011-05-11 22:39:21.000000000 +0400 -+++ sip-4.16.2-mingw/specs/win32-g++ 2014-07-28 14:41:45.615800000 +0400 +diff -uNr sip-4.16.2/specs/win32-g++ sip-4.16.2-mingw/specs/win32-g++ +--- sip-4.16.2/specs/win32-g++ 2011-05-11 20:39:21.000000000 +0200 ++++ sip-4.16.2-mingw/specs/win32-g++ 2014-07-30 10:41:24.250623520 +0200 @@ -69,23 +69,16 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index 3aeb6c9064..6197f04efa 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -5,7 +5,7 @@ _realname=sip pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.16.2 -pkgrel=3 +pkgrel=4 pkgdesc="Tool to create Python bindings for C and C++ libraries" arch=('any') license=('GPL') @@ -17,7 +17,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' - 'bac0cdd9aac20ad55bf6bb8aee134b99') + 'd028909352d241b3432c0d119cbee9ab') prepare() { cd "${srcdir}"/${_realname}-${pkgver}