mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-01 18:32:58 +02:00
Merge 0974e61965 into 9f47aebee5
This commit is contained in:
Andrew J. Hesford
GitHub
commit
400fa13f05
26 changed files with 155 additions and 179 deletions
22
srcpkgs/libplist/patches/cython-3.1.patch
Normal file
22
srcpkgs/libplist/patches/cython-3.1.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
From d7fe479707af57aeedf7e41c08e7fb698cd2e2a3 Mon Sep 17 00:00:00 2001
|
||||
From: Nikias Bassen <nikias@gmx.li>
|
||||
Date: Tue, 13 May 2025 18:32:50 +0200
|
||||
Subject: [PATCH] cython: Fix build with cython 3.1+
|
||||
|
||||
---
|
||||
cython/plist.pyx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cython/plist.pyx b/cython/plist.pyx
|
||||
index b5f4ef67..4d1f8aae 100644
|
||||
--- a/cython/plist.pyx
|
||||
+++ b/cython/plist.pyx
|
||||
@@ -851,7 +851,7 @@ cdef plist_t native_to_plist_t(object native):
|
||||
return plist_new_string(native)
|
||||
if isinstance(native, bool):
|
||||
return plist_new_bool(<bint>native)
|
||||
- if isinstance(native, int) or isinstance(native, long):
|
||||
+ if isinstance(native, int):
|
||||
return plist_new_uint(native)
|
||||
if isinstance(native, float):
|
||||
return plist_new_real(native)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'libplist'
|
||||
pkgname=libplist
|
||||
version=2.2.0
|
||||
revision=5
|
||||
revision=6
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static"
|
||||
hostmakedepends="automake libtool pkgconf python3 python3-Cython"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'python3-Cython'
|
||||
pkgname=python3-Cython
|
||||
version=3.0.12
|
||||
version=3.1.2
|
||||
revision=1
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-setuptools"
|
||||
|
|
@ -12,7 +12,7 @@ license="Apache-2.0"
|
|||
homepage="https://cython.org/"
|
||||
changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
|
||||
distfiles="${PYPI_SITE}/c/cython/cython-${version}.tar.gz"
|
||||
checksum=b988bb297ce76c671e28c97d017b95411010f7c77fa6623dd0bb47eed1aee1bc
|
||||
checksum=6bbf7a953fa6762dfecdec015e3b054ba51c0121a45ad851fa130f63f5331381
|
||||
# Tests are flaky
|
||||
make_check=no
|
||||
conflicts="python3-Cython0.29>=0"
|
||||
|
|
|
|||
20
srcpkgs/python3-PyOpenGL-accelerate/patches/cython-3.1.patch
Normal file
20
srcpkgs/python3-PyOpenGL-accelerate/patches/cython-3.1.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
--- a/src/vbo.pyx
|
||||
+++ b/src/vbo.pyx
|
||||
@@ -188,7 +188,7 @@
|
||||
assert not self.created, """Already created the buffer"""
|
||||
buffers = self.get_implementation().glGenBuffers(1)
|
||||
try:
|
||||
- self.buffer = long( buffers )
|
||||
+ self.buffer = int( buffers )
|
||||
except (TypeError,ValueError) as err:
|
||||
self.buffer = buffers[0]
|
||||
self.target = self.c_resolve( self.target_spec )
|
||||
@@ -242,7 +242,7 @@
|
||||
"""Add an integer to this VBO (offset)"""
|
||||
if hasattr( other, 'offset' ):
|
||||
other = other.offset
|
||||
- assert isinstance( other, (int,long) ), """Only know how to add integer/long offsets"""
|
||||
+ assert isinstance( other, (int) ), """Only know how to add integer offsets"""
|
||||
return VBOOffset( self, other )
|
||||
cdef int check_live( self ):
|
||||
if self.data is _NULL:
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'python3-PyOpenGL-accelerate'
|
||||
pkgname=python3-PyOpenGL-accelerate
|
||||
version=3.1.9
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-setuptools python3-Cython"
|
||||
makedepends="python3-devel"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
# Template file for 'python3-SQLAlchemy2'
|
||||
pkgname=python3-SQLAlchemy2
|
||||
version=2.0.36
|
||||
version=2.0.41
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
make_install_target="dist/SQLAlchemy-${version}-*-*-*.whl"
|
||||
hostmakedepends="python3-setuptools python3-Cython python3-wheel"
|
||||
makedepends="python3-devel"
|
||||
depends="python3-greenlet python3-typing_extensions"
|
||||
|
|
@ -14,7 +13,7 @@ license="MIT"
|
|||
homepage="https://www.sqlalchemy.org"
|
||||
changelog="https://docs.sqlalchemy.org/en/20/changelog/"
|
||||
distfiles="${PYPI_SITE}/s/sqlaLchemy/sqlalchemy-${version}.tar.gz"
|
||||
checksum=7f2767680b6d2398aea7082e45a774b2b0767b5c8d8ffb9c8b683088ea9b29c5
|
||||
checksum=edba70118c4be3c2b1f90754d308d0b79c6fe2c0fdc52d8ddf603916f83f4db9
|
||||
|
||||
conflicts="python3-SQLAlchemy"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'python3-cypari2'
|
||||
pkgname=python3-cypari2
|
||||
version=2.2.1
|
||||
version=2.2.2
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
hostmakedepends="python3-setuptools python3-wheel python3-Cython
|
||||
|
|
@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://github.com/sagemath/cypari2"
|
||||
changelog="https://github.com/sagemath/cypari2/releases"
|
||||
distfiles="https://github.com/sagemath/cypari2/archive/refs/tags/${version}.tar.gz"
|
||||
checksum=3bcadf6d3e49db7438eeae581db57ec465dcff90fc5177812716f1bfc86895d3
|
||||
checksum=d23c96e1e160e1c23a282d33c70e8facf352c437b6632e3eafcbc3c1d6d30a5d
|
||||
|
||||
do_check() {
|
||||
# Please do not disable this custom check;
|
||||
|
|
|
|||
11
srcpkgs/python3-dbus-fast/patches/cython-3.1.patch
Normal file
11
srcpkgs/python3-dbus-fast/patches/cython-3.1.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -104,7 +104,7 @@
|
||||
ignore_errors = true
|
||||
|
||||
[build-system]
|
||||
-requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3,<3.1.0', "poetry-core>=1.0.0"]
|
||||
+requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3,<3.2.0', "poetry-core>=1.0.0"]
|
||||
build-backend = "poetry.core.masonry.api"
|
||||
|
||||
[tool.ruff]
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
# Template file for 'python3-dbus-fast'
|
||||
pkgname=python3-dbus-fast
|
||||
version=2.39.3
|
||||
revision=3
|
||||
version=2.44.2
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
hostmakedepends="python3-setuptools python3-wheel python3-poetry-core python3-Cython"
|
||||
makedepends="python3-devel"
|
||||
depends="python3"
|
||||
short_desc="Faster version of dbus-next"
|
||||
maintainer="Kai Stian Olstad <void@olstad.com>"
|
||||
|
|
@ -11,7 +12,7 @@ license="MIT"
|
|||
homepage="https://github.com/bluetooth-devices/dbus-fast"
|
||||
changelog="https://github.com/bluetooth-devices/dbus-fast/raw/main/CHANGELOG.md"
|
||||
distfiles="${PYPI_SITE}/d/dbus-fast/dbus_fast-${version}.tar.gz"
|
||||
checksum=84b4ff23bcadfa794842e8d3eccb521907f7c6cb8d6534c895995840306512aa
|
||||
checksum=752f355c32e28468ba9f57b509e2694c4ba0d3d55ae6eb0035511c226438eb35
|
||||
make_check=no # no tests included
|
||||
|
||||
post_install() {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
# Template file for 'python3-fpylll'
|
||||
pkgname=python3-fpylll
|
||||
version=0.6.3
|
||||
version=0.6.4
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
hostmakedepends="python3-setuptools python3-wheel python3-Cython
|
||||
python3-cysignals"
|
||||
makedepends="python3-devel gmp-devel mpfr-devel fplll-devel pari-devel"
|
||||
python3-cysignals python3-numpy"
|
||||
makedepends="python3-devel gmp-devel mpfr-devel fplll-devel pari-devel
|
||||
python3-numpy"
|
||||
depends="python3"
|
||||
checkdepends="python3-pytest python3-numpy"
|
||||
short_desc="Python wrapper to fplll (floating point lattice algorithms)"
|
||||
|
|
@ -14,4 +15,4 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://github.com/fplll/fpylll"
|
||||
changelog="https://github.com/fplll/fpylll/releases"
|
||||
distfiles="https://github.com/fplll/fpylll/releases/download/${version}/fpylll-${version}.tar.gz"
|
||||
checksum=a3f4049e1c27b52136f71f722312c4265e3a2dcb5722536ec8247d708dd4248a
|
||||
checksum=711d60d8ada46a410932cc45587728b4c7f4ea38a9b8d0be061f5ce098632ecd
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'python3-lxml'
|
||||
pkgname=python3-lxml
|
||||
version=5.4.0
|
||||
version=6.0.0
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
make_build_args="-C--build-option=--with-cython"
|
||||
|
|
@ -14,7 +14,7 @@ license="BSD-3-Clause, custom:ElementTree"
|
|||
homepage="https://lxml.de/"
|
||||
changelog="https://raw.githubusercontent.com/lxml/lxml/master/CHANGES.txt"
|
||||
distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
|
||||
checksum=12ed971a99bd07977e236bf59314cfd53fbf5d59f39d4a13caad901c7fceb0a2
|
||||
checksum=5560ee7bd3bcea0e64221bbb23f4ee1d222296ef25ba217e327a5f1d963005d9
|
||||
|
||||
do_check() {
|
||||
make test
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
--- ./versioneer.py.orig 2023-09-29 10:02:24.403985079 -0400
|
||||
+++ ./versioneer.py 2023-09-29 10:02:36.679060444 -0400
|
||||
@@ -339,9 +339,9 @@
|
||||
# configparser.NoOptionError (if it lacks "VCS="). See the docstring at
|
||||
# the top of versioneer.py for instructions on writing your setup.cfg .
|
||||
setup_cfg = os.path.join(root, "setup.cfg")
|
||||
- parser = configparser.SafeConfigParser()
|
||||
+ parser = configparser.ConfigParser()
|
||||
with open(setup_cfg, "r") as f:
|
||||
- parser.readfp(f)
|
||||
+ parser.read_file(f)
|
||||
VCS = parser.get("versioneer", "VCS") # mandatory
|
||||
|
||||
def get(parser, name):
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
# Template file for 'python3-pandas-msgpack'
|
||||
pkgname=python3-pandas-msgpack
|
||||
version=0.1.5
|
||||
revision=7
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-setuptools python3-Cython"
|
||||
makedepends="python3-devel"
|
||||
depends="python3-pandas"
|
||||
short_desc="Providing an interface to msgpack from pandas"
|
||||
maintainer="Pulux <pulux@pf4sh.de>"
|
||||
license="BSD-3-Clause"
|
||||
homepage="https://www.pf4sh.eu/git/pulux/pandas-msgpack/"
|
||||
distfiles="https://www.pf4sh.eu/git/pulux/pandas-msgpack/archive/${version}.tar.gz"
|
||||
checksum=25288bc498cc0f9579c227cf33e20fc41d6d47ef58cc9fde27ede9796a647822
|
||||
make_check=no # Tests rely on obsolete pandas features
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE.md
|
||||
}
|
||||
13
srcpkgs/python3-rencode/patches/no-cflags.patch
Normal file
13
srcpkgs/python3-rencode/patches/no-cflags.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
Cf. https://github.com/aresch/rencode/commit/e7ec8ea718e73a8fee7dbc007c262e1584f7f94b
|
||||
|
||||
--- a/build.py
|
||||
+++ b/build.py
|
||||
@@ -11,7 +11,7 @@
|
||||
from setuptools.command.build_ext import build_ext
|
||||
|
||||
|
||||
-COMPILE_ARGS = ["-march=native", "-O3", "-msse", "-msse2", "-mfma", "-mfpmath=sse"]
|
||||
+COMPILE_ARGS = []
|
||||
LINK_ARGS: list[str] = []
|
||||
INCLUDE_DIRS: list[str] = []
|
||||
LIBRARIES: list[str] = []
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
# Template file for 'python3-rencode'
|
||||
pkgname=python3-rencode
|
||||
version=1.0.6
|
||||
revision=11
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-setuptools python3-Cython python3-wheel"
|
||||
version=1.0.8
|
||||
revision=1
|
||||
build_style=python3-pep517
|
||||
hostmakedepends="python3-poetry-core python3-setuptools python3-Cython"
|
||||
makedepends="python3-devel"
|
||||
depends="python3"
|
||||
short_desc="Python3 module for fast (basic) object serialization"
|
||||
|
|
@ -11,4 +11,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="GPL-3.0-or-later"
|
||||
homepage="https://github.com/aresch/rencode"
|
||||
distfiles="${homepage}/archive/v${version}.tar.gz"
|
||||
checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
|
||||
checksum=480aab74948a7f339b749b5c39bdb4caf15429f4b49a998c770d5f371098d351
|
||||
|
||||
do_build() {
|
||||
pyproject-build --no-isolation --wheel .
|
||||
}
|
||||
|
||||
do_check() {
|
||||
local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
|
||||
python3 -m installer --destdir "${testdir}" dist/*.whl
|
||||
|
||||
PATH="${testdir}/usr/bin:${PATH}" PYTHONPATH="${testdir}/${py3_sitelib}" \
|
||||
python3 tests/test_rencode.py
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
# Template file for 'python3-shapely'
|
||||
pkgname=python3-shapely
|
||||
version=2.0.6
|
||||
version=2.1.1
|
||||
revision=1
|
||||
build_style=python3-module
|
||||
build_helper=numpy
|
||||
hostmakedepends="python3-setuptools python3-Cython geos"
|
||||
makedepends="python3-devel python3-numpy geos-devel"
|
||||
depends="python3"
|
||||
depends="python3-numpy"
|
||||
checkdepends="python3-pytest-xdist"
|
||||
short_desc="Library for manipulation and analysis of geometric objects for Python3"
|
||||
maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
|
||||
license="BSD-3-Clause"
|
||||
homepage="https://github.com/shapely/shapely"
|
||||
distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
|
||||
checksum=71f1830bd1aa42d0493c8beb48c2e80712450af43376af4ba3bf40f0d9064120
|
||||
checksum=72875ca3b490eff704d91e2aba31f21228ea1fe361d540bd455c6523255992c2
|
||||
|
||||
pre_configure() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
|
|
|
|||
|
|
@ -767,6 +767,7 @@ replaces="
|
|||
python3-nose-random<=1.0.0_6
|
||||
python3-nose<=1.3.7_10
|
||||
python3-pafy<=0.5.5_7
|
||||
python3-pandas-msgpack<=0.1.5_7
|
||||
python3-pgpdump<=1.5_10
|
||||
python3-pyPEG2<=2.15.2_7
|
||||
python3-pyenet<=5.15.0_2
|
||||
|
|
|
|||
20
srcpkgs/urh/patches/cython-3.1.patch
Normal file
20
srcpkgs/urh/patches/cython-3.1.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
--- a/src/urh/dev/native/lib/chackrf.pxd
|
||||
+++ b/src/urh/dev/native/lib/chackrf.pxd
|
||||
@@ -54,7 +54,7 @@
|
||||
uint32_t part_id[2]
|
||||
uint32_t serial_no[4]
|
||||
|
||||
- ctypedef struct hackrf_device_list:
|
||||
+ ctypedef struct c_hackrf_device_list "hackrf_device_list":
|
||||
char ** serial_numbers
|
||||
hackrf_usb_board_id * usb_board_ids
|
||||
int *usb_device_index
|
||||
@@ -63,7 +63,7 @@
|
||||
void ** usb_devices
|
||||
int usb_devicecount
|
||||
|
||||
- ctypedef hackrf_device_list hackrf_device_list_t;
|
||||
+ ctypedef c_hackrf_device_list hackrf_device_list_t;
|
||||
|
||||
ctypedef int (*hackrf_sample_block_cb_fn)(hackrf_transfer* transfer)
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'urh'
|
||||
pkgname=urh
|
||||
version=2.9.8
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-setuptools python3-Cython python3-numpy"
|
||||
makedepends="python3-devel python3-PyQt5 libairspy-devel librtlsdr-devel
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ https://git.alpinelinux.org/aports/plain/community/py3-wxpython/no-stacktrace.pa
|
|||
PyErr_Clear();
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
- sipRes = new ::wxString((sipSelfWasArg ? sipCpp-> ::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
|
||||
+ sipRes = new ::wxString("");
|
||||
- sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
|
||||
+ sipRes = new ::wxString("");
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (PyErr_Occurred())
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c
|
|||
index d4003e9f..a52da595 100644
|
||||
--- a/sip/siplib/siplib.c
|
||||
+++ b/sip/siplib/siplib.c
|
||||
@@ -12597,7 +12597,11 @@ static void *sip_api_get_type_user_data(const sipWrapperType *wt)
|
||||
*/
|
||||
static PyObject *sip_api_py_type_dict(const PyTypeObject *py_type)
|
||||
{
|
||||
@@ -12592,7 +12592,11 @@
|
||||
"sipPyTypeDictRef() instead",
|
||||
1);
|
||||
|
||||
+#if PY_VERSION_HEX >= 0x030c0000
|
||||
+ return PyType_GetDict(py_type);
|
||||
+#else
|
||||
|
|
@ -25,6 +25,3 @@ index d4003e9f..a52da595 100644
|
|||
}
|
||||
|
||||
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
https://src.fedoraproject.org/rpms/python-wxpython4/c/46eb04f8ac5674968bfa3def439a67a39301024e
|
||||
|
||||
From 9540ec1682a0f12e9634a0f087af8b85af45e547 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Thompson <phil@riverbankcomputing.com>
|
||||
Date: Mon, 26 Jun 2023 15:04:53 +0200
|
||||
Subject: [PATCH] sipMalloc() and sipFree() are now implemented using
|
||||
PyMem_RawMalloc() and PyMem_RawFree() so that they should be safe to call
|
||||
from functions registered with Py_AtExit().
|
||||
|
||||
---
|
||||
sip/siplib/siplib.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c
|
||||
index 95563e5c..d4003e9f 100644
|
||||
--- a/sip/siplib/siplib.c
|
||||
+++ b/sip/siplib/siplib.c
|
||||
@@ -2147,7 +2147,7 @@ void *sip_api_malloc(size_t nbytes)
|
||||
{
|
||||
void *mem;
|
||||
|
||||
- if ((mem = PyMem_Malloc(nbytes)) == NULL)
|
||||
+ if ((mem = PyMem_RawMalloc(nbytes)) == NULL)
|
||||
PyErr_NoMemory();
|
||||
|
||||
return mem;
|
||||
@@ -2159,7 +2159,7 @@ void *sip_api_malloc(size_t nbytes)
|
||||
*/
|
||||
void sip_api_free(void *mem)
|
||||
{
|
||||
- PyMem_Free(mem);
|
||||
+ PyMem_RawFree(mem);
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
--- a/wx/lib/docview.py
|
||||
+++ b/wx/lib/docview.py
|
||||
@@ -1034,7 +1034,7 @@ class DocTemplate(wx.Object):
|
||||
string will be displayed in the file filter list of Windows file
|
||||
selectors.
|
||||
|
||||
- filter is an appropriate file filter such as \*.txt.
|
||||
+ filter is an appropriate file filter such as *.txt.
|
||||
|
||||
dir is the default directory to use for file selectors.
|
||||
|
||||
--- a/wx/lib/layoutf.py
|
||||
+++ b/wx/lib/layoutf.py
|
||||
@@ -132,8 +132,8 @@ class Layoutf(wx.LayoutConstraints):
|
||||
'r': 'wx.Right', 'h': 'wx.Height', 'w': 'wx.Width',
|
||||
'x': 'wx.CentreX', 'y': 'wx.CentreY' }
|
||||
|
||||
- rexp1 = re.compile('^\s*([tlrbhwxy])\s*([!\?\*])\s*(\d*)\s*$')
|
||||
- rexp2 = re.compile('^\s*([tlrbhwxy])\s*([=%<>^_])\s*([tlrbhwxy]?)\s*(\d*)\s*#(\d+)\s*$')
|
||||
+ rexp1 = re.compile(r'^\s*([tlrbhwxy])\s*([!\?\*])\s*(\d*)\s*$')
|
||||
+ rexp2 = re.compile(r'^\s*([tlrbhwxy])\s*([=%<>^_])\s*([tlrbhwxy]?)\s*(\d*)\s*#(\d+)\s*$')
|
||||
|
||||
def __init__(self,pstr=None,winlist=None):
|
||||
wx.LayoutConstraints.__init__(self)
|
||||
--- a/wx/lib/wxpTag.py
|
||||
+++ b/wx/lib/wxpTag.py
|
||||
@@ -45,7 +45,7 @@ The name-value pairs in all the nested P
|
||||
strings into a python dictionary and passed to the __init__ method of
|
||||
the class as keyword arguments. This means that they are all
|
||||
accessible from the __init__ method as regular parameters, or you use
|
||||
-the special Python \*\*kw syntax in your __init__ method to get the
|
||||
+the special Python **kw syntax in your __init__ method to get the
|
||||
dictionary directly.
|
||||
|
||||
Some parameter values are special and if they are present then they will
|
||||
--- a/wx/tools/pywxrc.py
|
||||
+++ b/wx/tools/pywxrc.py
|
||||
@@ -521,7 +521,7 @@ class XmlResourceCompiler:
|
||||
# Generate subclasses
|
||||
for subclass in subclasses:
|
||||
windowClass = bases[subclass]
|
||||
- subclass = re.sub("^\S+\.", "", subclass)
|
||||
+ subclass = re.sub(r"^\S+\.", "", subclass)
|
||||
windowClass = re.sub("^wx", "", windowClass)
|
||||
outputList.append(self.templates.SUBCLASS_HEADER % locals())
|
||||
outputList.append('\n')
|
||||
@@ -766,8 +766,8 @@ class XmlResourceCompiler:
|
||||
\n => \\n
|
||||
\r => \\r
|
||||
\t => \\t
|
||||
- \ => \\
|
||||
- " => \"
|
||||
+ \\ => \\\\
|
||||
+ " => \\"
|
||||
|
||||
Returns result as string, which is bytes in py2 or unicode in py3.
|
||||
"""
|
||||
19
srcpkgs/wxPython/patches/no-downloads.patch
Normal file
19
srcpkgs/wxPython/patches/no-downloads.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
Disable attempts by the build script to fetch missing tools.
|
||||
|
||||
--- a/build.py
|
||||
+++ b/build.py
|
||||
@@ -21,8 +21,12 @@
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
-import requests
|
||||
-from requests.exceptions import HTTPError
|
||||
+
|
||||
+#import requests
|
||||
+#from requests.exceptions import HTTPError
|
||||
+requests = None
|
||||
+HTTPError = None
|
||||
+
|
||||
import traceback
|
||||
from io import BytesIO
|
||||
import bz2
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
The only thing preventing use of Cython 3 is an unused, invalid import.
|
||||
|
||||
--- a/wx/svg/_nanosvg.pyx
|
||||
+++ b/wx/svg/_nanosvg.pyx
|
||||
@@ -42,7 +42,6 @@
|
||||
|
||||
import sys
|
||||
|
||||
-cimport cython.object
|
||||
from cpython.buffer cimport (
|
||||
Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE,
|
||||
PyBuffer_Release)
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'wxPython'
|
||||
pkgname=wxPython
|
||||
version=4.2.1
|
||||
revision=6
|
||||
version=4.2.3
|
||||
revision=1
|
||||
build_style=python3-module
|
||||
make_build_args="--skip-build"
|
||||
make_install_args="--skip-build"
|
||||
|
|
@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
|||
license="custom:wxWindows"
|
||||
homepage="http://www.wxpython.org/"
|
||||
distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
|
||||
checksum=e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c
|
||||
checksum=20d6e0c927e27ced85643719bd63e9f7fd501df6e9a8aab1489b039897fd7c01
|
||||
|
||||
export WXPYTHON_RELEASE=yes
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue