From owner-svn-ports-all@freebsd.org Sun Jun 16 20:09:15 2019 Return-Path: Delivered-To: svn-ports-all@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 CD79D15C8039; Sun, 16 Jun 2019 20:09:14 +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 70A0C8DA7C; Sun, 16 Jun 2019 20:09:14 +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 2A8341B4A4; Sun, 16 Jun 2019 20:09:14 +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 x5GK9D62086091; Sun, 16 Jun 2019 20:09:13 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5GK9D6Y086090; Sun, 16 Jun 2019 20:09:13 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201906162009.x5GK9D6Y086090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Sun, 16 Jun 2019 20:09:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504361 - in head/cad/freecad: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in head/cad/freecad: . files X-SVN-Commit-Revision: 504361 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 70A0C8DA7C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jun 2019 20:09:15 -0000 Author: cmt Date: Sun Jun 16 20:09:13 2019 New Revision: 504361 URL: https://svnweb.freebsd.org/changeset/ports/504361 Log: cad/freecad: improve pyside2 detection pyside2 changed the way it reported it's variables (they're cmake target properties now, not variables) sometime over the last releases. FreeCAD did not support pyside2's new way of doing thing, resulting in certain dialogs not working. PR: 237987 Reported by: denverh at comcast dot net Added: head/cad/freecad/files/patch-CMakeLists.txt (contents, props changed) Modified: head/cad/freecad/Makefile Modified: head/cad/freecad/Makefile ============================================================================== --- head/cad/freecad/Makefile Sun Jun 16 18:42:05 2019 (r504360) +++ head/cad/freecad/Makefile Sun Jun 16 20:09:13 2019 (r504361) @@ -2,6 +2,7 @@ PORTNAME= FreeCAD DISTVERSION= 0.18.2 +PORTREVISION= 1 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e Added: head/cad/freecad/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/freecad/files/patch-CMakeLists.txt Sun Jun 16 20:09:13 2019 (r504361) @@ -0,0 +1,31 @@ +--- CMakeLists.txt.orig 2019-06-16 18:08:47 UTC ++++ CMakeLists.txt +@@ -989,6 +989,13 @@ endif() + endif() + endif() + ++ # pyside2 changed it's cmake files, this is the dance we have ++ # to dance to be compatible with the old and the new versions ++ if(SHIBOKEN_PYTHON_INCLUDE_DIRS AND NOT SHIBOKEN_INCLUDE_DIR) ++ get_property(SHIBOKEN_INCLUDE_DIR TARGET Shiboken2::libshiboken PROPERTY INTERFACE_INCLUDE_DIRECTORIES) ++ get_property(SHIBOKEN_LIBRARY TARGET Shiboken2::libshiboken PROPERTY IMPORTED_LOCATION_RELEASE) ++ endif(SHIBOKEN_PYTHON_INCLUDE_DIRS AND NOT SHIBOKEN_INCLUDE_DIR) ++ + if(NOT SHIBOKEN_INCLUDE_DIR) + MESSAGE("====================\n" + "shiboken2 not found.\n" +@@ -996,6 +1003,14 @@ endif() + endif(NOT SHIBOKEN_INCLUDE_DIR) + + find_package(PySide2 QUIET)# REQUIRED ++ ++ # pyside2 changed it's cmake files, this is the dance we have ++ # to dance to be compatible with the old and the new versions ++ if(NOT PYSIDE_INCLUDE_DIR) ++ get_property(PYSIDE_INCLUDE_DIR TARGET PySide2::pyside2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) ++ get_property(PYSIDE_LIBRARY TARGET PySide2::pyside2 PROPERTY IMPORTED_LOCATION_RELEASE) ++ endif(NOT PYSIDE_INCLUDE_DIR) ++ + if(NOT PYSIDE_INCLUDE_DIR) + MESSAGE("==================\n" + "PySide2 not found.\n"