diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-06 11:57:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-06 11:57:11 +0100 |
| commit | 2b03b0d9c5ca3890c219ebd24721133e766e9bb9 (patch) | |
| tree | 5d30f335ce7ca22011789e938f980ff88db62a2c /dev-python/shiboken2 | |
| parent | ee3e7766db93c66376cf52eaac72b16fa156d223 (diff) | |
gentoo auto-resync : 06:10:2023 - 11:57:10
Diffstat (limited to 'dev-python/shiboken2')
| -rw-r--r-- | dev-python/shiboken2/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild (renamed from dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild) | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index 3616ea5e3d1d..9cf2fe4867c5 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -3,5 +3,5 @@ AUX shiboken2-5.15.5-python311-1.patch 3124 BLAKE2B 97e51ae8cc6866da7ac9cced4f19 AUX shiboken2-5.15.5-python311-2.patch 2056 BLAKE2B c93be29e31b0fa6ce28a29de0dc4dba9635e86ba0103d77334e324a0d26f4c81c9ee6583bef146eb908fe290426eb462dd0a0f68e917ca5f3c4505742d673a0f SHA512 df6f185546180b3d27d8ed1ec1ccf90cdf3813f8928894717ad02e97f0c404b8dc00aed330e8b51aa7e04d5b3e621a15981fc911b2371542f9266c147fdf3828 AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e235d0d976c3219f7ecf50f28938a7cce6952ec41795c2c86d0f71ccd94210661dc22a471adb2f879a133e11a3148923fd708 SHA512 540ff5afbfebcc00f20c43993f67458013f4655c06505fdf23bc26085bd2c621863dd9c28be1a20dca299113aee828974f853b145818fdb11d59fc12d0bb8c14 DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 -EBUILD shiboken2-5.15.10-r1.ebuild 6639 BLAKE2B 1ac931d3282c9343a77af12b222d35d60c8ad0b97093a1feb251428de074ffb573a286c21a7f3d554d121d8638ba0e3ecfc8d642da5cba9c6d759f5c1c792f39 SHA512 a6f50ccce960181a5829802099c061edd9f6ae431b683fdfe945fbcb21ab3f74b3c04abe752e90c9f5a67f46339f20ecfcfb1583d80c90c44bed4bc116c58e3c +EBUILD shiboken2-5.15.10-r2.ebuild 6823 BLAKE2B 851f820ab41b907e5cafc39e1d96a3e4d5cba3aa2e5a3fb4b09c9f5010d50852e370e28c763bb2e3a3de64c2682127f77175422d699e2df4843ecf509c188c83 SHA512 542e53832c82d16f84170fe185b7a1a6f418a0b3c46c7b1643c7d89dfb3c82a528a6fe79d931d0d410fd59568f96675bed2684610b03d73bbf7cebc37ed5a451 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24 diff --git a/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild index b47b73c5ae04..f83d6000ad45 100644 --- a/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild +++ b/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild @@ -86,6 +86,13 @@ src_prepare() { ApiExtractor/clangparser/compilersupport.cpp || die fi + local clangver="$(CPP=clang clang-major-version)" + + # Clang 15 and older used the full version as a directory name. + if [[ ${clangver} -lt 16 ]]; then + clangver="$(CPP=clang clang-fullversion)" + fi + # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is @@ -101,7 +108,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/'"${clangver}"'/include"))~' \ ApiExtractor/clangparser/compilersupport.cpp || die cmake_src_prepare |