From 28ed4d5dc81e15c5821669749e070b2d2c8a913a Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 21 Jul 2016 10:41:45 +0300 Subject: [PATCH] pyqt5: Fix building --- mingw-w64-pyqt5/001-mingw-python.patch | 11 ----------- mingw-w64-pyqt5/PKGBUILD | 5 +++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/mingw-w64-pyqt5/001-mingw-python.patch b/mingw-w64-pyqt5/001-mingw-python.patch index f3ddb99a10..0e674fb4cc 100644 --- a/mingw-w64-pyqt5/001-mingw-python.patch +++ b/mingw-w64-pyqt5/001-mingw-python.patch @@ -99,14 +99,3 @@ # Handle any conflicts. if not self.qt_shared: if not self.static: -@@ -1950,7 +1976,9 @@ - # Guess the name of make and set the default target and platform specific - # name of the executable. - if target_config.py_platform == 'win32': -- if target_config.qmake_spec == 'win32-g++': -+ if _POSIX_BUILD: -+ make = 'make' -+ elif target_config.qmake_spec == 'win32-g++': - make = 'mingw32-make' - else: - make = 'nmake' diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD index 5686eed0b0..72d8756ab5 100644 --- a/mingw-w64-pyqt5/PKGBUILD +++ b/mingw-w64-pyqt5/PKGBUILD @@ -11,12 +11,13 @@ license=('GPL') url="http://www.riverbankcomputing.co.uk/software/pyqt" makedepends=("${MINGW_PACKAGE_PREFIX}-python2-sip" "${MINGW_PACKAGE_PREFIX}-python3-sip" - "${MINGW_PACKAGE_PREFIX}-qt5") + "${MINGW_PACKAGE_PREFIX}-qt5" + "${MINGW_PACKAGE_PREFIX}-make") options=('strip' 'staticlibs') source=("https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt5_gpl-${pkgver}.tar.gz" 001-mingw-python.patch) sha256sums=('2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1' - '17c8f7fd63bcf2dc1f4edb8473ab0f0dcdf24d6c695071139d6bd1d1b158aada') + 'be96cb5401a88e6f9a4545ec5b241689656d54ee1460b453cf514e100542a5f0') prepare() { cd "${srcdir}"/PyQt5_gpl-${pkgver}