Date: Fri, 12 Apr 2019 19:43:05 +0000 (UTC) From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498739 - head/devel/pyside2/files Message-ID: <201904121943.x3CJh5sm054721@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cmt Date: Fri Apr 12 19:43:05 2019 New Revision: 498739 URL: https://svnweb.freebsd.org/changeset/ports/498739 Log: 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). Added: head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt (contents, props changed) Modified: head/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake Added: head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt Fri Apr 12 19:43:05 2019 (r498739) @@ -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} Modified: head/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake ============================================================================== --- head/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake Fri Apr 12 18:47:37 2019 (r498738) +++ head/devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake Fri Apr 12 19:43:05 2019 (r498739) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904121943.x3CJh5sm054721>