mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 23:53:51 +02:00
shiboken2: update to 5.14.2.1, unbreak nocross
This commit is contained in:
parent
182e849e17
commit
c29f3b6415
3 changed files with 41 additions and 31 deletions
29
srcpkgs/shiboken2/patches/cmake-fix-path-for-crossuild.patch
Normal file
29
srcpkgs/shiboken2/patches/cmake-fix-path-for-crossuild.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
|
||||||
|
* 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")
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
Fixes build with Qt 5.13.
|
|
||||||
|
|
||||||
--- sources/shiboken2/ApiExtractor/clangparser/clangutils.h
|
|
||||||
+++ sources/shiboken2/ApiExtractor/clangparser/clangutils.h
|
|
||||||
@@ -33,6 +33,7 @@
|
|
||||||
#include <QtCore/QPair>
|
|
||||||
#include <QtCore/QString>
|
|
||||||
#include <QtCore/QVector>
|
|
||||||
+#include <QtCore/QStringList>
|
|
||||||
|
|
||||||
QT_FORWARD_DECLARE_CLASS(QDebug)
|
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
# Template file for 'shiboken2'
|
# Template file for 'shiboken2'
|
||||||
pkgname=shiboken2
|
pkgname=shiboken2
|
||||||
version=5.14.1
|
version=5.14.2.1
|
||||||
revision=2
|
revision=1
|
||||||
_pkgname="pyside-setup-opensource-src-${version}"
|
_pkgname="pyside-setup-opensource-src-${version}"
|
||||||
wrksrc="$_pkgname"
|
wrksrc="${_pkgname/%5.14.2.1/5.14.2}"
|
||||||
configure_args="-DUSE_PYTHON_VERSION=3 -DCMAKE_INSTALL_PREFIX=/usr
|
build_wrksrc="sources/shiboken2"
|
||||||
-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF"
|
build_style=cmake
|
||||||
|
configure_args="-DBUILD_TESTS=OFF"
|
||||||
hostmakedepends="cmake python3-devel"
|
hostmakedepends="cmake python3-devel"
|
||||||
makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
|
makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
|
||||||
libxslt-devel python3-numpy"
|
libxslt-devel python3-numpy"
|
||||||
|
@ -14,22 +15,14 @@ maintainer="yopito <pierre.bourgin@free.fr>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
|
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
|
||||||
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
|
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
|
||||||
checksum=41ce931695567639c92acb68a9d66ed5609f067011af9a94b53fc0d697ad1d1c
|
checksum=11f48956208a487dabf6f531e60fb88ad0e48f2979cfc9e79c1c986387c491fa
|
||||||
|
|
||||||
python_version=3
|
python_version=3
|
||||||
nocross="clang installed on target but checks being broken etc."
|
export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
|
||||||
|
|
||||||
do_build() {
|
if [ ${CROSS_BUILD} ]; then
|
||||||
[ ! -d build ] && mkdir build
|
hostmakedepends+=" qt5-qmake qt5-host-tools shiboken2"
|
||||||
pushd build
|
fi
|
||||||
export CLANG_INSTALL_DIR=/usr
|
|
||||||
cmake ../sources/shiboken2 ${configure_args}
|
|
||||||
make ${makejobs}
|
|
||||||
popd
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install() {
|
|
||||||
make -C build DESTDIR=${DESTDIR} install
|
|
||||||
}
|
|
||||||
|
|
||||||
libshiboken2-devel_package() {
|
libshiboken2-devel_package() {
|
||||||
depends="${sourcepkg}-${version}_${revision}
|
depends="${sourcepkg}-${version}_${revision}
|
||||||
|
|
Loading…
Add table
Reference in a new issue