From d315478d4702a71b65b5360ec394cb804b24122f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 01:01:29 +0000 Subject: [PATCH] build: sync with upstream 2024-08-01 https://github.com/void-linux/void-packages/commit/7244797e --- common/build-helper/numpy.sh | 6 +++--- common/shlibs | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/build-helper/numpy.sh b/common/build-helper/numpy.sh index e0856db..0adce85 100644 --- a/common/build-helper/numpy.sh +++ b/common/build-helper/numpy.sh @@ -19,8 +19,8 @@ fi # python3-setuptools finds numpy libs and headers on the host first; # adding search paths up front allows the target to take priority -CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include" -LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/lib" +CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/_core/include" +LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/_core/lib" LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/random/lib" # distutils from python3-numpy looks to environment variables F77 and @@ -45,7 +45,7 @@ if [[ "${build_helper}" = *meson* ]]; then mkdir -p "${XBPS_WRAPPERDIR}/meson" cat > "${_npy_meson_cross}" <<-EOF [properties] - numpy-include-dir = '${_cross_py_site}/numpy/core/include' + numpy-include-dir = '${_cross_py_site}/numpy/_core/include' pythran-include-dir = '${_cross_py_site}/pythran' EOF fi diff --git a/common/shlibs b/common/shlibs index 5cfafa2..6f37812 100644 --- a/common/shlibs +++ b/common/shlibs @@ -992,8 +992,6 @@ libclang.so.18.1 libclang18-18.1.8_1 libclang.so.17 libclang17-17.0.6_1 libclang-cpp.so.18.1 libclang-cpp18-18.1.8_1 libclang-cpp.so.17 libclang-cpp17-17.0.6_1 -libLLVM-11.so libllvm11-11.0.0_1 -libLLVM-12.so libllvm12-12.0.0_1 libLLVM-17.so libllvm17-17.0.6_1 libLLVM.so.18.1 libllvm18-18.1.8_1 libLLVMSPIRVLib.so.18.1 SPIRV-LLVM-Translator-18.1.2_1 @@ -3032,6 +3030,7 @@ libCGAL.so.13 cgal-4.10_1 libCGAL_Core.so.13 cgal-4.10_1 libCGAL_ImageIO.so.14 cgal-4.14_1 libqscintilla2_qt5.so.15 qscintilla-qt5-2.11_1 +libqscintilla2_qt6.so.15 qscintilla-qt6-2.14.1_1 liblxpanel.so.0 lxpanel-0.9.3_1 libuim.so.8 uim-1.8.6_1 libuim-scm.so.0 uim-1.8.6_1 @@ -3274,7 +3273,7 @@ libKF6TextEmoticonsCore.so.1 ktextaddons-1.5.3_2 libKF6TextGrammarCheck.so.1 ktextaddons-1.5.3_2 libKF6TextTranslator.so.1 ktextaddons-1.5.3_2 libKF6TextUtils.so.1 ktextaddons-1.5.3_2 -libz3.so z3-4.6.0_2 +libz3.so libz3-4.13.0_2 libngspice.so.0 ngspice-35_1 libvulkan.so.1 vulkan-loader-1.0.57.0_1 libembb_mtapi_cpp.so embb-1.0.0_3