sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-31 02:16:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

blind-fix build of devel/pyside2

Browse source 
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).
This commit is contained in:
Christoph Moench-Tegeder 2019-04-12 19:43:05 +00:00
parent c14280e4dd
commit 4e6fff19cd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=498739
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt Normal file
View file

@ -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}

4
devel/pyside2/files/patch-cmake_Macros_PySideModules.cmake
View file

@ -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"