Page MenuHomeFreeBSD
Files F163218880

D11243.id29742.diff
No OneTemporary
Actions

D11243.id29742.diff
View Options

Index: head/editors/calligra/Makefile
===================================================================
--- head/editors/calligra/Makefile
+++ head/editors/calligra/Makefile
@@ -94,5 +94,17 @@
${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>

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 4:10 AM (6 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35346679
Default Alt Text
D11243.id29742.diff (1 KB)

Event Timeline