From nobody Tue Apr 25 10:49:48 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q5Jfh2KgFz471yf; Tue, 25 Apr 2023 10:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q5Jfh1nyPz43Wj; Tue, 25 Apr 2023 10:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682419788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNiDOIjhQfhF5GjxGgyjCnrIGQHRnT/WdIKzjJt6ur4=; b=l6j6cb5FkyatbxYHbwR6NCeyVqnnbTohZ5bu+gI1s8/qthhq8qVGFFOQHS2rG8LJyuXAT8 EU+v3UWdJNcXRHbKSe/Rre9E9VkTRcEHJ0T5afHVnsy7Bnz50L2HgNup6hAuwgmCVmk30S CkAoAHRmbnuP6Rb0TcjIGxHQk5Z+OIHrbhje7pkTYo396t0TNKlMttZraAh6/jBiT2mnuB tdlZcwQlpEKWpSulg2IbM9lh+yRJusa+VQnczBuZRZFvwerGw98uRptRcCbJQlJX7AvNA2 JwV9M+mc7v5Y9PLyhjdhf+JPprmOv8D2PBpggA46OG3halGIXyWcAqLNb9MLLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682419788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNiDOIjhQfhF5GjxGgyjCnrIGQHRnT/WdIKzjJt6ur4=; b=XEcEwqlbLWnXyNMohdiZLGiaBdYtXQPLZ4MSbMBWXYnIaW04PlKWvEnkW6kCYq4cfBIYXK a6U9V+JKmKzxUEY75oBnc4dyCxN6wMIOZilsVDUe3wdVatUrmVhVJBa7ys/VJPe5nS56nF 23ZiKTXnSGUcRSPV1mPlmDUdy70OTOGu7TwdjzdDHAig2jPS7R2NJGWHZU491Q0uvDDPcW fpLTbeFS0E7bpkr2tmKYRyv/nszSYev3FoMH1QHzB7oAcJzSHciSqXXONxc0I9ZLgPf/XT u0IevSMfG56qCK2/UK/599akJtK2FNoc2wHZuUAeZ90+sjn418hX9eJ2wAmSDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682419788; a=rsa-sha256; cv=none; b=ASoS84r3pRicV5N4HnhbKFe71zqJPRBgeyIlwruWIBsVw9+fb1rnO0HpfGSVsAJLoJMlys Gxie+1OPeZ0NcLE1zaWX12MZPsWiF3IlIJvUDzBEjoyvNiRz2TW72QYihhNHOY2+pYeZsN 7gGCjppIzDqrYkX8cRhsF1ICGcSfDa6JIRJbrT2sWvcFZRqJ5wORA8ut7stoFKbyGXBZDq bCnQAkwe2defo6RoROdwbZjp0Ef8XNvGCTM/3f70dj83EwikCuOBjh8uV89Yg2VPwMKPWl k8ofvcL49ZkYZkGJX/JE6kdZD1bnIPuRTf9IKG586x+S4HgsucZw843LfUsbBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q5Jfh0tLBz14Qt; Tue, 25 Apr 2023 10:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33PAnmUQ062853; Tue, 25 Apr 2023 10:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PAnme5062852; Tue, 25 Apr 2023 10:49:48 GMT (envelope-from git) Date: Tue, 25 Apr 2023 10:49:48 GMT Message-Id: <202304251049.33PAnme5062852@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 0c5de1fc4a84 - main - graphics/pstoedit: update to 3.78. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c5de1fc4a8429faf94c34e6459110ec40e2e48b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c5de1fc4a8429faf94c34e6459110ec40e2e48b commit 0c5de1fc4a8429faf94c34e6459110ec40e2e48b Author: Eric Camachat AuthorDate: 2023-04-24 16:55:42 +0000 Commit: Fernando Apesteguía CommitDate: 2023-04-25 10:45:04 +0000 graphics/pstoedit: update to 3.78. ChangeLog: http://www.calvina.de/pstoedit/changelog.htm * Bug fix. pstoedit did not find older versions of GhostScript under Windows. * Support for mawk in creation of pstoedit.ph header file. mawk is often used on build servers in place of gawk. * Some small update to comply with some Debian requirements. * Added experimental support for filled objects in DXF output using the HATCH element of DXF. * Fixed a problem when running pstoedit with output to standard output instead of a file. * Adapted to new versioning scheme of GhostScript. * Additional backend for pcb-rnd contributed by Erich Heinzle. * Some additional options in WEMF driver. * Better handling of bounding box in EMF output. Contributed by Samuel Thibault. * Better handling of metric option in fig driver. * Fix a compile problem under certain MacOS versions. * Various changes needed for interworking with newer versions of GhostScript. * Some code modernization based on feedback from VS-2019, Clang Powertools and PVS Studio. * Added support for dotted and dashed lines to the DXF backend. * Reduce redundancy in help documents. * Porting to Windows CE by Rohan Shetty. * Made pstoedit compatible with ghostscript 9.27. * Fix a bug occurring with large scale factors. * Include full documentation by default and provide an option to generate documentation locally which then fit best to the local installation. * Started to apply improvements proposed by clang-tidy. * Included a bunch of patches from Debian for easier maintenance of the package plus correction to some spelling issues. Thanks to Barak A. Pearlmutter. * added a -vl option to specify a verbosity level. Using the older -v enables level 1. For more use -vl 2. * included a patch contributed by OpenSuse folks fixing a problem in finding the plugins under certain conditions. * included a patch contributed by Martin Madsen related to checking non existing directories when looking for plugins. * added support for pdfwithshow and pdfawidthshow special operators when reading PDF files. * Scott Pakin updated the cfdg driver to support the current version of cfdg. * changes needed for newer versions of GhostScript. * some code cleanup. pstoedit passed all Coverity checks. PR: 270984 Reported by: eric@camachat.org --- graphics/pstoedit/Makefile | 8 +-- graphics/pstoedit/distinfo | 5 +- graphics/pstoedit/files/patch-configure | 10 ++-- graphics/pstoedit/files/patch-imagemagick7 | 77 ---------------------------- graphics/pstoedit/files/patch-src_drvwmf.cpp | 15 ++++++ 5 files changed, 27 insertions(+), 88 deletions(-) diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 5259f61ad3e3..929e37c7d756 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,6 +1,5 @@ PORTNAME= pstoedit -PORTVERSION= 3.70 -PORTREVISION= 12 +PORTVERSION= 3.78 CATEGORIES= graphics print MASTER_SITES= SF @@ -28,17 +27,18 @@ OPTIONS_DEFAULT= EMF MAGICK MING PLOTUTILS OPTIONS_SUB= yes EMF_DESC= WMF/EMF support via libEMF +MING_DESC= Flash support via Ming +PLOTUTILS_DESC= Plotting support via Plotutils + EMF_LIB_DEPENDS= libEMF.so:graphics/libemf EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF EMF_CONFIGURE_OFF= --without-emf MAGICK_USES= magick MAGICK_CONFIGURE_ON= --with-magick MAGICK_CONFIGURE_OFF= --without-magick -MING_DESC= Flash support via Ming MING_LIB_DEPENDS= libming.so:graphics/ming MING_CONFIGURE_ON= --with-swf MING_CONFIGURE_OFF= --without-swf -PLOTUTILS_DESC= Plotting support via Plotutils PLOTUTILS_LIB_DEPENDS= libplotter.so:graphics/plotutils PLOTUTILS_CONFIGURE_ON= --with-libplot PLOTUTILS_CONFIGURE_OFF= --without-libplot diff --git a/graphics/pstoedit/distinfo b/graphics/pstoedit/distinfo index 537a934f5980..fabca8785c07 100644 --- a/graphics/pstoedit/distinfo +++ b/graphics/pstoedit/distinfo @@ -1,2 +1,3 @@ -SHA256 (pstoedit-3.70.tar.gz) = 06b86113f7847cbcfd4e0623921a8763143bbcaef9f9098e6def650d1ff8138c -SIZE (pstoedit-3.70.tar.gz) = 1013949 +TIMESTAMP = 1682094664 +SHA256 (pstoedit-3.78.tar.gz) = 8cc28e34bc7f88d913780f8074e813dd5aaa0ac2056a6b36d4bf004a0e90d801 +SIZE (pstoedit-3.78.tar.gz) = 1301408 diff --git a/graphics/pstoedit/files/patch-configure b/graphics/pstoedit/files/patch-configure index 52a4d772a974..e84d00decc5a 100644 --- a/graphics/pstoedit/files/patch-configure +++ b/graphics/pstoedit/files/patch-configure @@ -1,6 +1,6 @@ ---- configure 2014-12-28 20:39:58 UTC +--- configure.orig 2023-04-21 16:38:20 UTC +++ configure -@@ -8263,6 +8263,7 @@ +@@ -8517,6 +8517,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -8,7 +8,7 @@ #include #include #include -@@ -16701,12 +16702,12 @@ +@@ -17994,12 +17995,12 @@ if test -n "$LIBMAGICK_CFLAGS"; then pkg_cv_LIBMAGICK_CFLAGS="$LIBMAGICK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ @@ -24,7 +24,7 @@ test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -16718,12 +16719,12 @@ +@@ -18011,12 +18012,12 @@ if test -n "$LIBMAGICK_LIBS"; then pkg_cv_LIBMAGICK_LIBS="$LIBMAGICK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ @@ -40,7 +40,7 @@ test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -16744,9 +16745,9 @@ +@@ -18037,9 +18038,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then diff --git a/graphics/pstoedit/files/patch-imagemagick7 b/graphics/pstoedit/files/patch-imagemagick7 deleted file mode 100644 index 9d9cd61ca2d9..000000000000 --- a/graphics/pstoedit/files/patch-imagemagick7 +++ /dev/null @@ -1,77 +0,0 @@ -By Jan Rekorajski, obtained from: - - http://git.pld-linux.org/gitweb.cgi/packages/pstoedit.git/commitdiff/1db94627498886a91a6e6ed80d0a8b2b6da1a16b - -and made conditional to still work with ImageMagick earlier than 7. - -(The configure.ac is not currently used by the port.) - ---- configure.ac 2014-12-28 21:39:18.000000000 +0100 -+++ configure.ac 2016-12-25 22:16:29.147826432 +0100 -@@ -299,7 +299,7 @@ - else - if test -n "$PKG_CONFIG"; then - AC_MSG_CHECKING(ImageMagick flags through pkg-config) -- PKG_CHECK_MODULES(LIBMAGICK, ImageMagick++, -+ PKG_CHECK_MODULES(LIBMAGICK, Magick++, - HAVE_LIBMAGICK=yes - LIBMAGICK_CFLAGS="-DHAVE_MAGIC $LIBMAGICK_CFLAGS" - LIBMAGICK_LDFLAGS="$LIBMAGICK_LIBS" , ---- src/drvmagick++.cpp 2015-01-01 18:05:33.000000000 +0100 -+++ src/drvmagick++.cpp 2017-08-08 16:38:28.879138000 -0400 -@@ -121,5 +121,9 @@ void drvMAGICK::create_vpath(VPathList & - switch (elem.getType()) { - case moveto:{ -+#if MagickLibVersion < 0x700 - const Point & p = elem.getPoint(0); -+#else /* MAGICK7 */ -+ const ::Point & p = elem.getPoint(0); -+#endif /* MAGICK7 */ - const Magick::Coordinate coord(p.x_ + x_offset, - currentDeviceHeight - p.y_ + y_offset); -@@ -128,5 +132,9 @@ void drvMAGICK::create_vpath(VPathList & - break; - case lineto:{ -+#if MagickLibVersion < 0x700 - const Point & p = elem.getPoint(0); -+#else /* MAGICK7 */ -+ const ::Point & p = elem.getPoint(0); -+#endif /* MAGICK7 */ - const Magick::Coordinate coord(p.x_ + x_offset, - currentDeviceHeight - p.y_ + y_offset); -@@ -138,7 +146,13 @@ void drvMAGICK::create_vpath(VPathList & - break; - case curveto:{ -+#if MagickLibVersion < 0x700 - const Point & p0 = elem.getPoint(0); - const Point & p1 = elem.getPoint(1); - const Point & p2 = elem.getPoint(2); -+#else /* MAGICK7 */ -+ const ::Point & p0 = elem.getPoint(0); -+ const ::Point & p1 = elem.getPoint(1); -+ const ::Point & p2 = elem.getPoint(2); -+#endif /* MAGICK7 */ - vpath. - push_back(PathCurvetoAbs -@@ -279,5 +293,9 @@ void drvMAGICK::show_path() - } - dasharray[dp.nrOfEntries] = 0; // mark last element -+#if MagickLibVersion < 0x700 - drawList.push_back(DrawableDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray -+#else /* MAGICK7 */ -+ drawList.push_back(DrawableStrokeDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray -+#endif /* MAGICK7 */ - //?? DrawableDashOffset - delete[]dasharray; -@@ -301,5 +319,11 @@ void drvMAGICK::show_path() - drawList.push_back(DrawablePopGraphicContext()); - // Draw everything using completed drawing list -+#if MagickLibVersion < 0x700 - imageptr->draw(drawList); -+#else /* MAGICK7 */ -+ std::vector drawVect; -+ copy(drawList.begin(),drawList.end(),back_inserter(drawVect)); -+ imageptr->draw(drawVect); -+#endif /* MAGICK7 */ - #endif - diff --git a/graphics/pstoedit/files/patch-src_drvwmf.cpp b/graphics/pstoedit/files/patch-src_drvwmf.cpp new file mode 100644 index 000000000000..b587d2ce0282 --- /dev/null +++ b/graphics/pstoedit/files/patch-src_drvwmf.cpp @@ -0,0 +1,15 @@ +--- src/drvwmf.cpp.orig 2021-04-17 18:52:47 UTC ++++ src/drvwmf.cpp +@@ -30,6 +30,12 @@ + #include I_stdlib + + #include ++#ifdef max ++#undef max ++#endif ++#ifdef min ++#undef min ++#endif + #include + + #ifndef M_PI