pyqt-builder: update to 1.11.0

This commit is contained in:
Mehdi Chinoune
2021-10-03 21:50:03 +01:00
parent c529d10826
commit 0de831d6a6
2 changed files with 19 additions and 21 deletions

View File

@@ -1,7 +1,6 @@
diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/builder.py PyQt-builder-1.4.0/pyqtbuild/builder.py
--- PyQt-builder-1.4.0-orig/pyqtbuild/builder.py 2020-05-31 14:52:54.000000000 +0300
+++ PyQt-builder-1.4.0/pyqtbuild/builder.py 2020-06-07 21:33:19.550266500 +0300
@@ -26,6 +26,7 @@
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -24,6 +24,7 @@
import os
import sys
@@ -9,7 +8,7 @@ diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/builder.py PyQt-builder-1.4.0/pyqtb
from sipbuild import (Buildable, BuildableModule, Builder, Option, Project,
PyProjectOptionException, UserException)
@@ -58,7 +59,7 @@
@@ -56,7 +57,7 @@
# be on PATH).
if tool != 'pep517':
self._sip_distinfo = os.path.join(
@@ -18,7 +17,7 @@ diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/builder.py PyQt-builder-1.4.0/pyqtb
self._sip_distinfo)
# Check we have a qmake.
@@ -175,8 +175,12 @@
@@ -241,8 +242,12 @@
['install_' + installable.name
for installable in project.installables])))
pro_lines.append('distinfo.extra = {}'.format(' '.join(args)))
@@ -32,16 +31,16 @@ diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/builder.py PyQt-builder-1.4.0/pyqtb
pro_lines.append('INSTALLS += distinfo')
pro_name = os.path.join(project.build_dir, project.name + '.pro')
@@ -266,7 +267,7 @@
@@ -337,7 +342,7 @@
def _find_make(self):
""" Return the name of a valid make program. """
- if self.project.py_platform == 'win32':
+ if self.project.py_platform == 'win32' and not "MSYSTEM" in os.environ:
if self.spec == 'win32-g++':
make = 'mingw32-make'
if 'g++' in self.spec:
make = 'make'
else:
@@ -388,8 +389,8 @@
@@ -469,8 +474,8 @@
# TODO: is this still necessary for Python v3.8?
if not buildable.static:
pro_lines.extend(['win32 {',
@@ -52,7 +51,7 @@ diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/builder.py PyQt-builder-1.4.0/pyqtb
'}'])
# Add any installables from the buildable.
@@ -419,7 +420,11 @@
@@ -500,7 +505,11 @@
raise UserException(
"Unexpected output from qmake: '{0}'".format(line))
@@ -65,18 +64,17 @@ diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/builder.py PyQt-builder-1.4.0/pyqtb
else:
name = tokens
value = None
diff -Naur PyQt-builder-1.4.0-orig/pyqtbuild/project.py PyQt-builder-1.4.0/pyqtbuild/project.py
--- PyQt-builder-1.4.0-orig/pyqtbuild/project.py 2020-05-31 14:52:54.000000000 +0300
+++ PyQt-builder-1.4.0/pyqtbuild/project.py 2020-06-07 21:31:10.233125300 +0300
@@ -26,6 +26,7 @@
--- a/pyqtbuild/project.py
+++ b/pyqtbuild/project.py
@@ -24,6 +24,7 @@
import os
import sys
+from sysconfig import _POSIX_BUILD
from sipbuild import Option, Project
from sipbuild import Option, Project, UserException
@@ -88,7 +89,7 @@
@@ -72,7 +73,7 @@
# Get the details of the default Python interpreter library. Note that
# these are actually non-user options but we need the 'link_full_dll'
# user option in order to set them.

View File

@@ -4,8 +4,8 @@
_realname=pyqt-builder
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.10.1
pkgrel=2
pkgver=1.11.0
pkgrel=1
pkgdesc="The PEP 517 compliant PyQt build system (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -17,8 +17,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-sip")
source=("https://pypi.io/packages/source/P/PyQt-builder/PyQt-builder-${pkgver}.tar.gz"
001-mingw-python.patch)
sha256sums=('967b0c7bac0331597e9f8c5b336660f173a9896830b721d6d025e14bde647e17'
'39c21631dff9ada9bb5e7ba9c86bae9df461de2397d2cfdf53de20d04fbae548')
sha256sums=('40f6df88c00e6aa9ac9a8bc5688f9fe2a4bd56c06cdb0a0b00ce8955ec34ffe5'
'462d9b52ecaeabf7c25c67a93faa7913261169c08ea7c714e53efb6a48019e5a')
prepare() {
cd ${_realname}-${pkgver}