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 | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-python/shiboken2')
| -rw-r--r-- | dev-python/shiboken2/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch | 28 | ||||
| -rw-r--r-- | dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild | 10 |
3 files changed, 37 insertions, 4 deletions
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index a85a40437aaf..63139d30ff52 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -1,4 +1,5 @@ +AUX shiboken2-5.15.2-numpy-1.23.patch 1180 BLAKE2B 744f36a26e934c31e5f499cb07b5c4384932392e4d55303dac0aeb932533a548ce3ac385b23f16f87f7d7705bed38fb863b92acb74ad49185831f60976bcbfdb SHA512 f775c5ac6a9a7a692645f33d8bb017bafacd297777f04f4bc581bd0810b1f7ec083ceb6eb495ffc0a9a9851f72658da7bad2ed3d1604a56e9fda042cc969cac8 AUX shiboken2-5.15.2-python310.patch 4408 BLAKE2B cd1a5c3f8c473a6667f8c942c248285babb468339283a8cc97064bd119194b72bcdb47c758044774a415cec08562b7875fd7298dea50e23d7fc3830e8291a8c1 SHA512 10245617f1aea656d3ba2e8736d51fd119e4d01c4fff129f557203bd1d5eb40ca10b40eaf55a8bd98b56f8e2e7503028818e333fee8ec86cb7b050e48a5e0387 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62 -EBUILD shiboken2-5.15.2-r1.ebuild 6510 BLAKE2B 5f402eb4fe6a2b4b620a1a3f715081cd0da78472ba1bde69a888fa1cdc37a00d3ca9feb661b0aa595f828094ee9a99a4fba4b3f85fdb4b479a6151a119a655c1 SHA512 141aff3720c7a8704f0e1b0a92ff87d3356b921b6f3535bce2d21be16758cd1745369e10568cb2339192e1d3d89a010f23648b4fa66b0fe738bd8591737a45c9 +EBUILD shiboken2-5.15.2-r1.ebuild 6551 BLAKE2B ba5cd749b4641a87c5d4edcf9c8e10d5c199dcd1f9888cd620b801f0d1e5c87d8988131011ecb5b4ea4077543f5a3c91bb5241ec21de091957b7e2cfe0b754bb SHA512 5a14af1ec01cd89b54652e6a1dfed547fcdccff6500ba221ab27796103605c5c9c16d812655478daa14be2fdc1e5a613223c44b9df67d47ef04a30882826e6b0 MISC metadata.xml 576 BLAKE2B 567c84dbf819c5944e5b35146e3dff7b1581aa0275a732e8f2cb6df4b32001e2020eca2469ee422bd6fdd53b34c1453db4ecbdec6e85fe5ee3e4eea4a2283336 SHA512 f1c5964cb99b61c1913b7c031b994b71948e7b26f18d4119b7b3a536bbf7e659cecf539ec54992e157170159186ede2af3b31dfa03fbc1170bc7e12c25814a31 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'; + } diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild index a8732bcfc06c..c8e150bc7ed5 100644 --- a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild +++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild @@ -60,7 +60,11 @@ DEPEND="${RDEPEND} " DOCS=( AUTHORS ) -PATCHES=( "${FILESDIR}/${P}-python310.patch" ) + +PATCHES=( + "${FILESDIR}/${P}-python310.patch" + "${FILESDIR}/${P}-numpy-1.23.patch" +) # Ensure the path returned by get_llvm_prefix() contains clang as well. llvm_check_deps() { @@ -77,7 +81,7 @@ src_prepare() { # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". if use vulkan; then - sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \ + sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ ApiExtractor/clangparser/compilersupport.cpp || die fi @@ -96,7 +100,7 @@ src_prepare() { # PySide2 does *NOT* care whether the end user has done so or not, as # PySide2 unconditionally requires Clang in either case. See also: # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ ApiExtractor/clangparser/compilersupport.cpp || die cmake_src_prepare |