diff --git a/common/shlibs b/common/shlibs index 9597430acef..7fdca711b8f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1620,7 +1620,7 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4 libXaw3d.so.8 libXaw3d-1.6.2_1 libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2 libshiboken-python3.6.so.1.2 libshiboken-python3-1.2.2_4 -libshiboken2.so.5.11 libshiboken2-5.11.2_1 +libshiboken2.so.5.14 libshiboken2-5.14.0_1 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2 libpyside-python3.6.so.1.2 libpyside-python3-1.2.2_6 libpyside2.so.5.11 libpyside2-python3-5.11.2_1 diff --git a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch new file mode 100644 index 00000000000..1346a921302 --- /dev/null +++ b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch @@ -0,0 +1,38 @@ +Consistent file naming across architectures for so libs and cmake files: +remove intermediate 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) + +--- sources/shiboken2/CMakeLists.txt.ORIG ++++ 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}") +--- sources/shiboken2/data/CMakeLists.txt.ORIG ++++ 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/template b/srcpkgs/shiboken2/template index bea32ddab46..027fc32222c 100644 --- a/srcpkgs/shiboken2/template +++ b/srcpkgs/shiboken2/template @@ -1,12 +1,12 @@ # Template file for 'shiboken2' pkgname=shiboken2 -version=5.11.2 -revision=4 -_pkgname="pyside-setup-everywhere-src-${version}" +version=5.14.0 +revision=1 +_pkgname="pyside-setup-opensource-src-${version}" wrksrc="$_pkgname" configure_args="-DUSE_PYTHON_VERSION=3 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF" -hostmakedepends="cmake" +hostmakedepends="cmake python3-devel" makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel libxslt-devel python3-numpy" short_desc="Python binding generator of Qt5 C++ API" @@ -14,12 +14,8 @@ 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=18f572f1f832e476083d30fccabab167450f2a8cbe5cd9c6e6e4fa078ccb86c2 - -pre_build() { - # Fix inconsistent naming of .so and .cmake files - sed -i "/get_python_extension_suffix()/d" sources/shiboken2/CMakeLists.txt -} +checksum=8c2ad1901a99165ed7bac8f522ee351ae3ebadd580024248f5a1db52e4a94b30 +python_version=3 do_build() { [ ! -d build ] && mkdir build @@ -36,7 +32,7 @@ do_install() { libshiboken2-devel_package() { depends="${sourcepkg}-${version}_${revision} - libshiboken2-${version}_${revision}" + libshiboken2-${version}_${revision} python3-shiboken2-${version}_${revision}" short_desc+=" - common development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/shiboken2/update b/srcpkgs/shiboken2/update new file mode 100644 index 00000000000..1c0e6e5fef6 --- /dev/null +++ b/srcpkgs/shiboken2/update @@ -0,0 +1,3 @@ +pkgname=pyside-setup-opensource-src +vdprefix=PySide2- +vdsuffix=-src