svn commit: r501963 - in head/devel/pyside2: . files
Christoph Moench-Tegeder
cmt at FreeBSD.org
Sat May 18 14:43:36 UTC 2019
Author: cmt
Date: Sat May 18 14:43:34 2019
New Revision: 501963
URL: https://svnweb.freebsd.org/changeset/ports/501963
Log:
another stab at fixing the build of devel/pyside2
the QtWebEngineWidgets submodule depends on the QtWebEngineCore submodule,
but that internal dependency wasn't reflected in the CMakeLists.
Modified:
head/devel/pyside2/Makefile
head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt
Modified: head/devel/pyside2/Makefile
==============================================================================
--- head/devel/pyside2/Makefile Sat May 18 12:59:16 2019 (r501962)
+++ head/devel/pyside2/Makefile Sat May 18 14:43:34 2019 (r501963)
@@ -29,8 +29,6 @@ USE_QT= 3d buildtools_build charts core datavis3d dec
CMAKE_ARGS+= "-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
"-DPYTHON_EXECUTABLE=${PYTHON_CMD}"
-MAKE_JOBS_UNSAFE= yes
-
.include <bsd.port.pre.mk>
.if ${PYTHON_MAJOR_VER} >= 3
Modified: head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt
==============================================================================
--- head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt Sat May 18 12:59:16 2019 (r501962)
+++ head/devel/pyside2/files/patch-PySide2_QtWebEngineWidgets_CMakeLists.txt Sat May 18 14:43:34 2019 (r501963)
@@ -1,7 +1,7 @@
# 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.orig 2019-03-21 14:37:54 UTC
+++ PySide2/QtWebEngineWidgets/CMakeLists.txt
@@ -25,6 +25,7 @@ set(QtWebEngineWidgets_include_dirs
${Qt5Widgets_INCLUDE_DIRS}
@@ -11,3 +11,12 @@
${Qt5WebEngineWidgets_INCLUDE_DIRS}
${libpyside_SOURCE_DIR}
${QtCore_GEN_DIR}
+@@ -45,7 +46,7 @@ set(QtWebEngineWidgets_libraries pyside2
+ ${Qt5Core_LIBRARIES}
+ ${Qt5PrintSupport_LIBRARIES}
+ )
+-set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel QtPrintSupport)
++set(QtWebEngineWidgets_deps QtGui QtWidgets QtNetwork QtWebChannel QtPrintSupport QtWebEngineCore)
+ create_pyside_module(NAME QtWebEngineWidgets
+ INCLUDE_DIRS QtWebEngineWidgets_include_dirs
+ LIBRARIES QtWebEngineWidgets_libraries
More information about the svn-ports-all
mailing list