diff options
| author | tcberner <tcberner@FreeBSD.org> | 2017-06-17 08:39:16 +0000 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2017-06-17 08:39:16 +0000 |
| commit | 4d26c6629ace6a134b4bf04364f896e126d58e8c (patch) | |
| tree | 74165dc23507821f4984adaf8cd6d6120dd03456 | |
| parent | 2fa463fc4ef613de65b36581926a88f83dc8c819 (diff) | |
| download | FreeBSD-ports-4d26c6629ace6a134b4bf04364f896e126d58e8c.zip FreeBSD-ports-4d26c6629ace6a134b4bf04364f896e126d58e8c.tar.gz | |
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
| -rw-r--r-- | editors/calligra/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index af9ac51..c440c57 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -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> |
