diff --git a/common/shlibs b/common/shlibs index 08ba9fbea27..dca19fc737e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1657,7 +1657,6 @@ libosmoctrl.so.0 libosmocore-0.7.0_1 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libXaw3d.so.8 libXaw3d-1.6.2_1 -libshiboken2.so.5.15 libshiboken2-5.15.0_1 libupsclient.so.6 libnetwork-ups-tools-2.8.0_1 libnutclient.so.2 libnetwork-ups-tools-2.8.0_1 libnutscan.so.2 libnetwork-ups-tools-2.8.0_1 diff --git a/srcpkgs/libshiboken2 b/srcpkgs/libshiboken2 deleted file mode 120000 index b1fbca61c21..00000000000 --- a/srcpkgs/libshiboken2 +++ /dev/null @@ -1 +0,0 @@ -shiboken2 \ No newline at end of file diff --git a/srcpkgs/libshiboken2-devel b/srcpkgs/libshiboken2-devel deleted file mode 120000 index b1fbca61c21..00000000000 --- a/srcpkgs/libshiboken2-devel +++ /dev/null @@ -1 +0,0 @@ -shiboken2 \ No newline at end of file diff --git a/srcpkgs/python3-shiboken2 b/srcpkgs/python3-shiboken2 deleted file mode 120000 index b1fbca61c21..00000000000 --- a/srcpkgs/python3-shiboken2 +++ /dev/null @@ -1 +0,0 @@ -shiboken2 \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 913f27e9599..9318da10ce1 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20241028 +version=0.1.20241122 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -429,6 +429,8 @@ replaces=" librpcsecgss-devel<=0.19_6 librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 + libshiboken2-devel<=5.15.10_2 + libshiboken2<=5.15.10_2 libspa-ffmpeg<=0.3.32_1 libspotify-devel<=12.1.51_2 libspotify<=12.1.51_2 @@ -721,6 +723,7 @@ replaces=" python3-pyspotify<=2.1.3_5 python3-sabyenc3<=5.4.4_2 python3-scikit-video<=1.1.11_6 + python3-shiboken2<=5.15.10_2 python3-shiboken<=5.15.0_3 python3-snakeoil-devel<=0.8.8_4 python3-sqlalchemy-migrate<=0.12.0_6 @@ -766,6 +769,7 @@ replaces=" seahorse-sharing<=3.8.0_4 searchfile<=0.0.0.20180623_2 seriespl<=2.3.5_2 + shiboken2<=5.15.10_2 simple-obfs<=0.0.5_2 sitecopy<=0.16.6_11 sk1<=2.0rc5_1 diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch deleted file mode 100644 index af4d03e5621..00000000000 --- a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add ability to pass additional options to clang via environnement variable. -With help from https://github.com/void-linux/void-packages/pull/26962 - ---- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -@@ -305,6 +305,15 @@ - QByteArrayList emulatedCompilerOptions() - { - QByteArrayList result; -+ -+ QByteArray shiboken_clang_options = qgetenv("SHIBOKEN_CLANG_OPTIONS"); -+ // split to avoid double quoting drived by space inside it -+ if (!shiboken_clang_options.isEmpty()) { -+ for (const QByteArray &item: shiboken_clang_options.split(' ')) { -+ result.append(item); -+ } -+ } -+ - #if defined(Q_CC_MSVC) - HeaderPaths headerPaths; - result.append(QByteArrayLiteral("-fms-compatibility-version=19")); diff --git a/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch b/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch deleted file mode 100644 index 708cebe3f9f..00000000000 --- a/srcpkgs/shiboken2/patches/fix-for-numpy-1.23.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -rework of commit 1422cf4a7f277fb13fd209f24a90d6c02641497d (shiboken6) - ---- a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -+++ b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp -@@ -116,8 +116,13 @@ - str << " NPY_ARRAY_NOTSWAPPED"; - if ((flags & NPY_ARRAY_WRITEABLE) != 0) - str << " NPY_ARRAY_WRITEABLE"; -+#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/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch deleted file mode 100644 index 31e9c55db6f..00000000000 --- a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Consistent file naming across architectures for so libs and cmake files: -remove python suffix like ".cpython-36m-x86_64-linux-gnu". -Avoid overwriting the "real" cmake file with the generic wrapper's one (same -name in such a case) - ---- a/sources/shiboken2/CMakeLists.txt -+++ b/sources/shiboken2/CMakeLists.txt -@@ -98,6 +98,11 @@ - "PYTHON_CONFIG_SUFFIX is empty. It should never be empty. Please file a bug report.") - endif() - -+# consistent file naming across architectures -+set(PYTHON_EXTENSION_SUFFIX "") -+set(PYTHON_CONFIG_SUFFIX "") -+set(PYTHON_SHARED_LIBRARY_SUFFIX "") -+ - message(STATUS "PYTHON_EXTENSION_SUFFIX: ${PYTHON_EXTENSION_SUFFIX}") - message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}") - message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}") ---- a/sources/shiboken2/data/CMakeLists.txt -+++ b/sources/shiboken2/data/CMakeLists.txt -@@ -37,16 +37,11 @@ - PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR - ) - --configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2Config.cmake.in" -- "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config.cmake" @ONLY) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken2ConfigVersion.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2ConfigVersion.cmake" @ONLY) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/shiboken2.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/shiboken2${shiboken2_SUFFIX}.pc" @ONLY) - --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken2Config.cmake" -- DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}") -- - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/Shiboken2Config${PYTHON_CONFIG_SUFFIX}.cmake" - DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken2-${shiboken2_VERSION}") - diff --git a/srcpkgs/shiboken2/patches/python3.11.patch b/srcpkgs/shiboken2/patches/python3.11.patch deleted file mode 120000 index 6861da6ece5..00000000000 --- a/srcpkgs/shiboken2/patches/python3.11.patch +++ /dev/null @@ -1 +0,0 @@ -../../python3-pyside2/patches/python3.11.patch \ No newline at end of file diff --git a/srcpkgs/shiboken2/patches/python3.12.patch b/srcpkgs/shiboken2/patches/python3.12.patch deleted file mode 120000 index 2ffbfeb449a..00000000000 --- a/srcpkgs/shiboken2/patches/python3.12.patch +++ /dev/null @@ -1 +0,0 @@ -../../python3-pyside2/patches/python3.12.patch \ No newline at end of file diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch deleted file mode 100644 index 9a434c1d9af..00000000000 --- a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch +++ /dev/null @@ -1,13 +0,0 @@ -tests need python modules that are not installed yet: so point the built ones. -Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429 - ---- a/sources/shiboken2/tests/CMakeLists.txt 2020-09-09 14:45:42.000000000 +0200 -+++ b/sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100 -@@ -53,6 +53,6 @@ - list(FIND test_blacklist ${test_name} expect_fail) - add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file}) -- set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR}") -+ set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "BUILD_DIR=${BUILD_DIR};PYTHONPATH=${shibokenmodule_BINARY_DIR}:${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${smart_BINARY_DIR}") - set_tests_properties(${test_name} PROPERTIES TIMEOUT ${CTEST_TESTING_TIMEOUT}) - if (${expect_fail} GREATER -1) - set_tests_properties(${test_name} PROPERTIES WILL_FAIL TRUE) diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template deleted file mode 100644 index d0a38c63d9e..00000000000 --- a/srcpkgs/shiboken2/template +++ /dev/null @@ -1,51 +0,0 @@ -# Template file for 'shiboken2' -pkgname=shiboken2 -version=5.15.10 -revision=2 -_pkgname="pyside-setup-opensource-src-${version}" -build_wrksrc="sources/shiboken2" -build_style=cmake -hostmakedepends="python3-devel python3-setuptools" -makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang17-devel libxml2-devel - libxslt-devel python3-numpy" -depends="clang" -short_desc="Python binding generator of Qt5 C++ API" -maintainer="yopito " -license="GPL-3.0-or-later" -homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" -distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" -checksum=2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a - -python_version=3 -export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr - -if [ ${CROSS_BUILD} ]; then - hostmakedepends+=" qt5-qmake qt5-host-tools shiboken2" -fi - -libshiboken2-devel_package() { - depends="${sourcepkg}-${version}_${revision} - libshiboken2-${version}_${revision} python3-shiboken2-${version}_${revision}" - short_desc+=" - common development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} - -libshiboken2_package() { - short_desc="Python3 shiboken2 bindings - shared library" - pkg_install() { - vmove "usr/lib/*.so.*" - } -} - -python3-shiboken2_package() { - short_desc="Python3 shiboken2 bindings" - depends="python3" - pkg_install() { - vmove ${py3_sitelib} - } -} diff --git a/srcpkgs/shiboken2/update b/srcpkgs/shiboken2/update deleted file mode 100644 index 1c0e6e5fef6..00000000000 --- a/srcpkgs/shiboken2/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=pyside-setup-opensource-src -vdprefix=PySide2- -vdsuffix=-src