diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-python/shiboken2/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-python/shiboken2/files')
| -rw-r--r-- | dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch b/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch new file mode 100644 index 000000000000..6cd9feab800b --- /dev/null +++ b/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch @@ -0,0 +1,28 @@ +Backport of https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=1422cf4a7f277fb13fd209f24a90d6c02641497d. + +From 1422cf4a7f277fb13fd209f24a90d6c02641497d Mon Sep 17 00:00:00 2001 +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Thu, 23 Jun 2022 10:44:01 +0200 +Subject: libshiboken: Fix build with numpy 1.23.0 + +Pick-to: 6.3 6.2 5.15 +Change-Id: I885c332d6c948820140946c73ae1926e88834143 +Reviewed-by: Christian Tismer <tismer@stackless.com> +--- a/libshiboken/sbknumpyarrayconverter.cpp ++++ b/libshiboken/sbknumpyarrayconverter.cpp +@@ -116,8 +116,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o) + str << " NPY_ARRAY_NOTSWAPPED"; + if ((flags & NPY_ARRAY_WRITEABLE) != 0) + str << " NPY_ARRAY_WRITEABLE"; +- if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) +- str << " NPY_ARRAY_UPDATEIFCOPY"; ++#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION ++ if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) ++ str << " NPY_ARRAY_WRITEBACKIFCOPY"; ++#else ++ if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) ++ str << " NPY_ARRAY_UPDATEIFCOPY"; ++#endif + } else { + str << '0'; + } |