Date: Sat, 17 Jun 2017 08:39:16 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r443736 - head/editors/calligra Message-ID: <201706170839.v5H8dGEW046199@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706170839.v5H8dGEW046199>