diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 5a8fc572d682..72bc51dcdb42 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,128 +1,128 @@ PORTNAME= inkscape DISTVERSION= 1.3 CATEGORIES= graphics gnome MASTER_SITES= https://media.inkscape.org/dl/resources/file/ PATCH_SITES= https://gitlab.com/${PORTNAME}/${PORTNAME}/-/commit/ PATCHFILES+= 3db96bfbac475022a32b70473b767b21a8d70c7f.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/issues/4427 -PATCHFILES+= 00851fede7f9162cbcacf81258d1dda823b88a5c.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/5650 +PATCHFILES+= 5183d14d331e4f2022b9ab0f83d45e4e17951013.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/5650 MAINTAINER= gnome@FreeBSD.org COMMENT= Full featured open source SVG editor WWW= https://inkscape.org LICENSE= GPLv2 GPLv2+ GPLv3 GPLv3+ LGPL21 LGPL3 LGPL3+ MPL11 LICENSE_COMB= multi LICENSE_FILE_GPLv2 = ${WRKSRC}/LICENSES/GPL-2.0.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt LICENSE_FILE_GPLv3 = ${WRKSRC}/LICENSES/GPL-3.0.txt LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt LICENSE_FILE_LGPL21 = ${WRKSRC}/LICENSES/LGPL-2.1.txt LICENSE_FILE_LGPL3 = ${WRKSRC}/LICENSES/LGPL-3.0.txt LICENSE_FILE_LGPL3+ = ${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt LICENSE_FILE_MPL11 = ${WRKSRC}/LICENSES/MPL-1.1.txt BUILD_DEPENDS= ragel:devel/ragel LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libpopt.so:devel/popt \ libgc.so:devel/boehm-gc \ libgsl.so:math/gsl \ liblcms2.so:graphics/lcms2 \ libfribidi.so:converters/fribidi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libpotrace.so:graphics/libpotrace \ libpng.so:graphics/png \ libsoup-2.4.so:devel/libsoup \ libyaml.so:textproc/libyaml \ libdouble-conversion.so:devel/double-conversion \ libenchant-2.so:textproc/enchant2 \ libepoxy.so:graphics/libepoxy \ lib2geom.so:math/lib2geom RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>=3.7.1:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cachecontrol>0:www/py-cachecontrol@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ fig2dev:print/fig2dev TEST_DEPENDS= googletest>0:devel/googletest \ bash:shells/bash USES= compiler:c++17-lang cmake:testing cpe desktop-file-utils ghostscript:run \ gnome iconv:wchar_t jpeg pathfix pkgconfig python \ readline shebangfix tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtkmm30 gtksourceview4 libxml2 libxslt USE_PYTHON= cython USE_XORG= sm ice x11 xext USE_LDCONFIG= yes DATETAG= 2023-07-21_0e150ed6c4 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}_${DATETAG} BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= share/extensions/*.py share/extensions/genpofiles.sh \ share/templates/*.py man/fix-roff-punct OPTIONS_DEFINE= OPENMP POPPLER SCRIBUS VISIO CDR WPG GVFS NLS GSPELL OPTIONS_DEFAULT= POPPLER VISIO CDR WPG GM GSPELL OPTIONS_DEFAULT_amd64= OPENMP OPTIONS_DEFAULT_powerpc64= OPENMP OPTIONS_DEFAULT_powerpc64le= OPENMP OPTIONS_RADIO= IMAGICK OPTIONS_RADIO_IMAGICK= IMAGICK6 GM OPTIONS_SUB= yes CDR_DESC= Support for CorelDRAW graphics CDR_CMAKE_BOOL= WITH_LIBCDR CDR_LIB_DEPENDS= librevenge-stream-0.0.so:textproc/librevenge \ libcdr-0.1.so:graphics/libcdr01 GVFS_USE= GNOME=gvfs OPENMP_CMAKE_BOOL= WITH_OPENMP POPPLER_DESC= PDF preview rendering POPPLER_CMAKE_BOOL= ENABLE_POPPLER ENABLE_POPPLER_CAIRO POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler \ libpoppler-glib.so:graphics/poppler-glib SCRIBUS_DESC= Support color-managed PDF export using Scribus (experimental) SCRIBUS_RUN_DEPENDS= scribus:print/scribus-devel VISIO_DESC= Support for Microsoft Visio diagrams VISIO_CMAKE_BOOL= WITH_LIBVISIO VISIO_LIB_DEPENDS= librevenge-stream-0.0.so:textproc/librevenge \ libvisio-0.1.so:textproc/libvisio01 WPG_DESC= Support for WordPerfect graphics WPG_CMAKE_BOOL= WITH_LIBWPG WPG_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 IMAGICK_DESC= Raster image format library IMAGICK6_DESC= Use ImageMagick6 IMAGICK6_USES= magick:6 IMAGICK6_CMAKE_BOOL= WITH_IMAGE_MAGICK GM_DESC= Use GraphicsMagick GM_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick GM_CMAKE_BOOL= WITH_GRAPHICS_MAGICK NLS_CMAKE_BOOL= WITH_NLS NLS_USES= gettext GSPELL_DESC= Support for spell checking through gspell GSPELL_CMAKE_BOOL= WITH_GSPELL GSPELL_LIB_DEPENDS= libgspell-1.so:textproc/gspell post-patch: @${REINPLACE_CMD} -e 's|COMMAND python3|COMMAND ${PYTHON_VERSION}|g' \ ${WRKSRC}/share/*/CMakeLists.txt # Third entry in the table of interpreters is basename of executable @${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_VERSION}"|g' \ ${WRKSRC}/src/extension/implementation/script.cpp @${TOUCH} ${WRKSRC}/share/extensions/gcodetools_check_for_updates.inx.h .include diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 5ba7f41d16ee..cef2325763ed 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1692891317 +TIMESTAMP = 1694983728 SHA256 (inkscape-1.3.tar.xz) = bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307 SIZE (inkscape-1.3.tar.xz) = 85764028 SHA256 (3db96bfbac475022a32b70473b767b21a8d70c7f.patch) = fb572fa3b566149293b0ffeae468ff6025d0e54a090d928eb8c2037afe2d3f8d SIZE (3db96bfbac475022a32b70473b767b21a8d70c7f.patch) = 2003 -SHA256 (00851fede7f9162cbcacf81258d1dda823b88a5c.patch) = d0ebfcb85682345d7e10d97931894acd171881a8467b70a777f37a293d255a59 -SIZE (00851fede7f9162cbcacf81258d1dda823b88a5c.patch) = 5207 +SHA256 (5183d14d331e4f2022b9ab0f83d45e4e17951013.patch) = f62186b0655ea0aae5802b464c71e107155a4c93b6e0c9bae7c870dad956f4fa +SIZE (5183d14d331e4f2022b9ab0f83d45e4e17951013.patch) = 7711 diff --git a/graphics/inkscape/files/patch-src_helper_geom.h b/graphics/inkscape/files/patch-src_helper_geom.h deleted file mode 100644 index 6c6a70977402..000000000000 --- a/graphics/inkscape/files/patch-src_helper_geom.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/helper/geom.h.orig 2023-08-24 15:45:30 UTC -+++ src/helper/geom.h -@@ -55,7 +55,7 @@ inline Geom::Coord triangle_area(Geom::Point const &p1 - return p1[X] * p2[Y] + p1[Y] * p3[X] + p2[X] * p3[Y] - p2[Y] * p3[X] - p1[Y] * p2[X] - p1[X] * p3[Y]; - } - --inline auto rounddown(Geom::IntPoint const &a, Geom::IntPoint const &b) -+inline auto round_down(Geom::IntPoint const &a, Geom::IntPoint const &b) - { - using namespace Inkscape::Util; - return Geom::IntPoint(round_down(a.x(), b.x()), round_down(a.y(), b.y()));