From 4e6fff19cdb22bafc74cd72d6a63f8a62f24b327 Mon Sep 17 00:00:00 2001 From: Christoph Moench-Tegeder Date: Fri, 12 Apr 2019 19:43:05 +0000 Subject: [PATCH] blind-fix build of devel/pyside2 pyside2 fails to build on the package cluster, e.g. http://beefy5.nyi.freebsd.org/data/120i386-default/498628/logs/py27-pyside2-5.12.2.log I cannot reproduce that failure locally, but I sincerly hope that the additional patch fixes it. Add a comment, else I'll forget that patch is required. While here, update the pre-existing patch file to reduce confusion when looking at patch and code (patch was fine with the file, which did surprise me). --- .../patch-PySide2_QtWebEngineWidgets_CMakeLists.txt | 13 +++++++++++++ .../files/patch-cmake_Macros_PySideModules.cmake | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt diff --git a/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt b/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt new file mode 100644 index 000000000000..7cad06c70561 --- /dev/null +++ b/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt @@ -0,0 +1,13 @@ +# keep this - else the build fails on the package cluster +# see http://beefy5.nyi.freebsd.org/data/120i386-default/498628/logs/py27-pyside2-5.12.2.log +# I cannot reproduce the failure locally -- cmt +--- PySide2/QtWebEngineWidgets/CMakeLists.txt.orig 2019-04-12 15:25:16 UTC ++++ PySide2/QtWebEngineWidgets/CMakeLists.txt +@@ -25,6 +25,7 @@ set(QtWebEngineWidgets_include_dirs + ${Qt5Widgets_INCLUDE_DIRS} + ${Qt5Network_INCLUDE_DIRS} + ${Qt5WebChannel_INCLUDE_DIRS} ++ ${Qt5WebEngineCore_INCLUDE_DIRS} + ${Qt5WebEngineWidgets_INCLUDE_DIRS} + ${libpyside_SOURCE_DIR} + ${QtCore_GEN_DIR} diff --git a/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake b/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake index 58dd3967a26c..14e26147af7d 100644 --- a/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake +++ b/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake @@ -1,7 +1,7 @@ ---- cmake/Macros/PySideModules.cmake.orig 2018-12-17 07:28:47 UTC +--- cmake/Macros/PySideModules.cmake.orig 2019-03-21 14:37:54 UTC +++ cmake/Macros/PySideModules.cmake @@ -124,6 +124,7 @@ macro(create_pyside_module) - COMMAND "${SHIBOKEN_BINARY}" ${GENERATOR_EXTRA_FLAGS} + COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS} "${pyside2_BINARY_DIR}/${module_NAME}_global.h" --include-paths=${shiboken_include_dirs} + --include-paths="${CMAKE_INSTALL_PREFIX}/include"