shiboken2: update to 5.15.0

- remove merged patches upstream
- need clang at runtime
This commit is contained in:
yopito 2020-06-23 22:08:28 +02:00 committed by Piraty
parent f9d29fbe1e
commit 2f1963adfb
4 changed files with 5 additions and 65 deletions

View File

@ -1701,7 +1701,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.14 libshiboken2-5.14.0_1
libshiboken2.so.5.15 libshiboken2-5.15.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.14 libpyside2-python3-5.14.0_1

View File

@ -1,29 +0,0 @@
* LIB_INSTALL_DIR must be set as a relative path.
If not, side-effect on shiboken2/CMakeList.txt: LIB_INSTALL_DIR is redefined,
so generated Shiboken2Targets.cmake contains absolute paths that are wrong for crossbuild.
* bin/shiboken2 localization must be absolute for crossbuild.
--- sources/shiboken2/ApiExtractor/CMakeLists.txt.ORIG
+++ sources/shiboken2/ApiExtractor/CMakeLists.txt
@@ -84,7 +84,7 @@
target_compile_definitions(apiextractor PRIVATE CMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}")
-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
if (BUILD_TESTS)
find_package(Qt5Test 5.12 REQUIRED)
--- sources/shiboken2/generator/CMakeLists.txt.ORIG
+++ sources/shiboken2/generator/CMakeLists.txt
@@ -30,7 +30,7 @@
install(TARGETS shiboken2
EXPORT Shiboken2Targets
- DESTINATION bin)
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
set(shiboken_generator_package_name "shiboken2_generator")

View File

@ -1,32 +0,0 @@
--- sources/shiboken2/libshiboken/signature.cpp.ORIG
+++ sources/shiboken2/libshiboken/signature.cpp
@@ -473,12 +473,15 @@
////////////////////////////////////////////////////////////////////////////
// a stack trace for linux-like platforms
#include <stdio.h>
+#if defined(__GLIBC__)
#include <execinfo.h>
+#endif
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
void handler(int sig) {
+#if defined(__GLIBC__)
void *array[30];
size_t size;
@@ -486,8 +489,13 @@
size = backtrace(array, 30);
// print out all the frames to stderr
+#endif
fprintf(stderr, "Error: signal %d:\n", sig);
+#if defined(__GLIBC__)
backtrace_symbols_fd(array, size, STDERR_FILENO);
+#else
+ fprintf(stderr, "sorry, no backtrace on musl libc\n");
+#endif
exit(1);
}

View File

@ -1,7 +1,7 @@
# Template file for 'shiboken2'
pkgname=shiboken2
version=5.14.2.1
revision=2
version=5.15.0
revision=1
_pkgname="pyside-setup-opensource-src-${version}"
wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
build_wrksrc="sources/shiboken2"
@ -10,12 +10,13 @@ configure_args="-DBUILD_TESTS=OFF"
hostmakedepends="cmake python3-devel"
makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
libxslt-devel python3-numpy"
depends="clang"
short_desc="Python binding generator of Qt5 C++ API"
maintainer="yopito <pierre.bourgin@free.fr>"
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=11f48956208a487dabf6f531e60fb88ad0e48f2979cfc9e79c1c986387c491fa
checksum=f1cdee53de3b76e22c1117a014a91ed95ac16e4760776f4f12dc38cd5a7b6b68
python_version=3
export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr