From owner-svn-ports-head@freebsd.org Sat Jun 17 08:39:17 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABE41BF5109; Sat, 17 Jun 2017 08:39:17 +0000 (UTC) (envelope-from tcberner@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 mx1.freebsd.org (Postfix) with ESMTPS id 6F55584C95; Sat, 17 Jun 2017 08:39:17 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5H8dGDE046200; Sat, 17 Jun 2017 08:39:16 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5H8dGEW046199; Sat, 17 Jun 2017 08:39:16 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201706170839.v5H8dGEW046199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 17 Jun 2017 08:39:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443736 - head/editors/calligra X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 17 Jun 2017 08:39:17 -0000 Author: tcberner Date: Sat Jun 17 08:39:16 2017 New Revision: 443736 URL: https://svnweb.freebsd.org/changeset/ports/443736 Log: Ent-eigen editors/calligra. The recent update of math/eigen3 broke editors/calligra, as opencv and eigen-3.2+ contain same named parts. Remove the using namespace Eigen from the files, and import the qualified class names instead. This is a simplified backport of https://phabricator.kde.org/R37:2db4438671e17002c7b02e3ad3a5208930765e4f . Reviewed by: rakuco Differential Revision: https://reviews.freebsd.org/D11243 Modified: head/editors/calligra/Makefile Modified: head/editors/calligra/Makefile ============================================================================== --- head/editors/calligra/Makefile Sat Jun 17 08:34:19 2017 (r443735) +++ head/editors/calligra/Makefile Sat Jun 17 08:39:16 2017 (r443736) @@ -94,5 +94,17 @@ post-patch: ${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt \ ${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt \ ${PATCH_WRKSRC}/plugins/vectorshape/CMakeLists.txt +# Enteigen krita: Do not use the complete 'Eigen' namespace, as it conflicts +# with opencv now, but only include the qualified class names. +# This is a simplified version of upstreams: +# https://phabricator.kde.org/R37:2db4438671e17002c7b02e3ad3a5208930765e4f + @${REINPLACE_CMD} -e 's|using namespace Eigen;|using Eigen::Matrix;using Eigen::Dynamic;using Eigen::Vector2i;|' \ + ${PATCH_WRKSRC}/krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ring.cpp \ + ${PATCH_WRKSRC}/krita/plugins/filters/blur/kis_gaussian_blur_filter.h \ + ${PATCH_WRKSRC}/krita/plugins/filters/blur/kis_motion_blur_filter.h \ + ${PATCH_WRKSRC}/krita/plugins/filters/blur/kis_lens_blur_filter.h \ + ${PATCH_WRKSRC}/krita/plugins/filters/convolutionfilters/convolutionfilters.cpp \ + ${PATCH_WRKSRC}/krita/image/kis_convolution_kernel.h \ + ${PATCH_WRKSRC}/krita/image/kis_gaussian_kernel.h .include