From owner-svn-ports-head@freebsd.org Fri Apr 12 19:43:06 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4064B1584A25; Fri, 12 Apr 2019 19:43:06 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D866789D7A; Fri, 12 Apr 2019 19:43:05 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3AE326044; Fri, 12 Apr 2019 19:43:05 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3CJh5Yo054723; Fri, 12 Apr 2019 19:43:05 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3CJh5sm054721; Fri, 12 Apr 2019 19:43:05 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201904121943.x3CJh5sm054721@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Fri, 12 Apr 2019 19:43:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498739 - head/devel/pyside2/files X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: head/devel/pyside2/files X-SVN-Commit-Revision: 498739 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D866789D7A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Apr 2019 19:43:06 -0000 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"