diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index a022ffd87a64..11c55db1d726 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -1,56 +1,58 @@ # Created by: Piotr Kubaj PORTNAME= scribus PORTVERSION= 1.5.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ PKGNAMESUFFIX= -devel MAINTAINER= pkubaj@FreeBSD.org COMMENT= Comprehensive desktop publishing program (development version) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libboost_thread.so:devel/boost-libs \ libhunspell-1.7.so:textproc/hunspell \ libcairo.so:graphics/cairo \ librevenge-0.0.so:textproc/librevenge \ libcups.so:print/cups \ libwpg-0.3.so:graphics/libwpg03 \ libcdr-0.1.so:graphics/libcdr01 \ libfreehand-0.1.so:graphics/libfreehand \ libpagemaker-0.0.so:print/libpagemaker \ libmspub-0.1.so:print/libmspub01 \ libvisio-0.1.so:textproc/libvisio01 \ libfreetype.so:print/freetype2 \ libtiff.so:graphics/tiff \ libpoppler.so:graphics/poppler \ libharfbuzz-icu.so:print/harfbuzz-icu \ libfontconfig.so:x11-fonts/fontconfig \ libpodofo.so:graphics/podofo \ libharfbuzz.so:print/harfbuzz \ libpng.so:graphics/png \ libicuuc.so:devel/icu \ libqxp-0.0.so:textproc/libqxp \ libzmf-0.0.so:graphics/libzmf -USES= cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix gnome \ +USES= cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \ jpeg pkgconfig python:3.6+ qt:5 shared-mime-info tar:xz USE_QT= buildtools_build core declarative gui linguisttools_build \ network opengl printsupport qmake_build widgets xml DOS2UNIX_REGEX= .*\.(cpp|h|txt) USE_GNOME= libxml2 -CMAKE_ARGS+= -DWANT_HUNSPELL=YES -DCMAKE_COLOR_MAKEFILE:BOOL=ON +CMAKE_ARGS+= -DWANT_HUNSPELL=YES \ + -DWANT_CPP17=YES \ + -DCMAKE_COLOR_MAKEFILE:BOOL=ON OPTIONS_DEFINE= DOCS post-install: ${LN} -sf ../share/icons/1_5_1/scribus.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .include diff --git a/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff b/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff new file mode 100644 index 000000000000..040f90b85bb6 --- /dev/null +++ b/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff @@ -0,0 +1,38 @@ +From 34dee8142844a7ee70ddff95253d0299896bcc16 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Wed, 4 Aug 2021 21:18:11 +0000 +Subject: [PATCH] #16605: Compilation error in lib2geom/path.h + +git-svn-id: svn://scribus.net/trunk/Scribus@24687 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/third_party/lib2geom/path.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/scribus/third_party/lib2geom/path.h b/scribus/third_party/lib2geom/path.h +index fab674ed3b..e923b5de8b 100644 +--- scribus/third_party/lib2geom/path.h ++++ scribus/third_party/lib2geom/path.h +@@ -251,14 +251,15 @@ class BezierCurve : public Curve { + + D2 toSBasis() const {return inner.toSBasis(); } + +-protected: +- BezierCurve(Point c[]) { +- Coord x[order+1], y[order+1]; +- for(unsigned i = 0; i <= order; i++) { +- x[i] = c[i][X]; y[i] = c[i][Y]; +- } +- inner = Bezier(x, y); +- } ++// #16605: does not seem used at triggers build error with clang 12.0.1 ++//protected: ++// BezierCurve(Point c[]) { ++// Coord x[order+1], y[order+1]; ++// for(unsigned i = 0; i <= order; i++) { ++// x[i] = c[i][X]; y[i] = c[i][Y]; ++// } ++// inner = Bezier(x, y); ++// } + }; + + // BezierCurve<0> is meaningless; specialize it out