CVS commit: pkgsrc/graphics/graphviz

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/graphviz
From: "Michael Baeuerle" <micha%netbsd.org@localhost>
Date: Fri, 16 Aug 2024 11:50:39 +0000

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Aug 16 11:50:39 UTC 2024

Modified Files:
        pkgsrc/graphics/graphviz: Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/graphics/graphviz/patches: patch-lib_gvc_Makefile.am

Log Message:
graphics/graphviz: Update to 12.1.0

Requires C11/C++17.
Remove broken option "perl" (was disabled by default).

## [12.1.0] – 2024-08-12

### Added

- Enable the GNU Triangulated Surface Library (GTS) in Windows builds. #2557
- `dot_builtins` now also includes the vt plugin (`-Tvt` output format).
- The vt plugin gained new output formats, `-Tvt-4up`, `-Tvt-6up`, and
  `-Tvt-8up`, for drawing monochrome 4-, 6-, and 8-pixel-per-character
  visualizations, respectively.
- The CMake build system now includes the WebP plugin also on Windows.
- A Windows x64 `mingle` binary is now built with CMake.
- Support for building the SWIG-generated D language bindings has been
  integrated into the CMake build system. This is controllable by the
  `-DENABLE_D={AUTO|ON|OFF}` option.
- Support for building the SWIG-generated Go language bindings has been
  integrated into the CMake build system. This is controllable by the
  `-DENABLE_GO={AUTO|ON|OFF}` option. The target integer size can be set with
  `-DINTGOSIZE=…` if it is not auto-detected correctly.
- Support for building the SWIG-generated JavaScript language bindings has been
  integrated into the CMake build system. This is controllable by the
  `-DENABLE_JAVASCRIPT={AUTO|ON|OFF}` option.

### Changed

- The GTK plugin, for which build system support was removed in Graphviz 10.0.1,
  has been removed from the portable source tarball. #1848
- To build from source, the required C++ standard has been upgraded from C++11
  to C++17. #2536
- **Breaking**: the CMake variables `enable_ltdl`, `with_expat`, `with_gvedit`,
  `with_smyrna`, `with_zlib`, `enable_tcl`, `enable_swig` and `enable_sharp`
  have been renamed  to `ENABLE_LTDL`, `WITH_EXPAT`, `WITH_GVEDIT`,
  `WITH_SMYRNA`, `WITH_ZLIB`, `ENABLE_TCL`, `ENABLE_SWIG` and `ENABLE_SHARP`,
  respectively.
- To build from source, the required Python version has been upgraded from 3.6
  to 3.8. #2549
- Build system discovery of GDK now looks for GDK 3.0 instead of GDK 2.0. #1848
- Visual Studio build files are no longer distributed in the portable source
  tarball. Builds on Windows must now use a repository clone.

### Fixed

- `ccomps`, `gc`, the fdp layout engine, the neato layout engine, and the
  patchwork algorithm now understand a cluster to be indicated by the common
  rules, including the “cluster” prefix being case insensitive and the
  `cluster=true` attribute as an alternative. #2187
- `overlap` values whose prefixes are themselves valid values (e.g.
  `overlap=scalexy` where `overlap=scale` is also a valid setting) are once
  again usable. Previously such values would silently select the shortest valid
  prefix. This was a regression in Graphviz 2.24.0. #2563
- Setting `overlap=ortho_xy` no longer also runs the constraint pass of
  `overlap=porthoxy`. Setting `overlap=ortho` no longer also runs the constraint
  passes of `overlap=ortho_xy` and `ortho=porthoxy`. This bug has existed ever
  since these overlap modes were introduced in Graphviz 2.4. However its effect
  was masked by the bug discussed in the prior CHANGELOG entry that made it not
  possible to select `overlap=ortho_xy` or `overlap=porthoxy`.
- `splines = true` merging multiedges together when using the neato engine.
  #2241 (fixed on Windows by enabling GTS)
- The GVC output writing APIs handle writes of compressed data `> UINT_MAX` more
  correctly.
- GVPR casts of strings to floats now produce the expected values. This was a
  regression in Graphviz 2.30.
- CMake builds do not support format png:gd #1786
- The diffimg utility is not built in CMake builds #1788 (fixed also for
  Windows x64 builds)
- The Windows x86 `mingle` binary built with CMake no longer fails to start
  because of missing `ANN.dll`.
- The node and edge tags printed by the TK output format (`-Ttk`) are once again
  usable for later referencing those same nodes and edges in TCL scripting. This
  was likely broken in the transition from 32-bit to 64-bit hardware. #2568
- Ubuntu 24.04 binaries incorrectly are ASan enabled and produce memory leak
  errors. #2574
- gvpr’s ability to handle empty string parameters to `printf` (e.g.
  `printf("hello%s world", "")`) has been restored. This was a regression in
  Graphviz 9.0.0. #2577
- pkgIndex.tcl for the TCL bindings is constructed based on target system
  properties instead of host system properties. Previously, cross-compilation
  would result in potentially incorrect library loading directives in this file.
- The Autotools build system no longer checks for the presence of php.h, which
  previously caused spurious failures when trying to build the PHP bindings with
  PHP 8.3. #2589
- A `gvmap` crash due to out-of-bounds memory writes has been fixed. This was a
  regression in Graphviz 8.0.1.


To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/graphviz/PLIST
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/graphviz/buildlink3.mk \
    pkgsrc/graphics/graphviz/options.mk
cvs rdiff -u -r1.85 -r1.86 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.288 pkgsrc/graphics/graphviz/Makefile:1.289
--- pkgsrc/graphics/graphviz/Makefile:1.288     Thu Jul 11 19:53:36 2024
+++ pkgsrc/graphics/graphviz/Makefile   Fri Aug 16 11:50:39 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.288 2024/07/11 19:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.289 2024/08/16 11:50:39 micha Exp $
 
-DISTNAME=      graphviz-12.0.0
-PKGREVISION=   1
+DISTNAME=      graphviz-12.1.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
 #EXTRACT_SUFX= .tar.xz
@@ -15,8 +14,8 @@ CHECK_FILES_SKIP+=            ${PREFIX}/lib/graphv
 CHECK_PORTABILITY_SKIP+=       windows/*
 
 USE_LANGUAGES=         c c++
-USE_CC_FEATURES+=      c99
-USE_CXX_FEATURES+=     c++11 unique_ptr
+USE_CC_FEATURES+=      c11
+USE_CXX_FEATURES+=     c++17 unique_ptr
 
 USE_TOOLS+=            automake autoreconf makeinfo bison flex gmake groff pkg-config
 USE_LIBTOOL=           yes
@@ -31,6 +30,7 @@ CONFIGURE_ARGS+=      --disable-java
 CONFIGURE_ARGS+=       --disable-javascript
 CONFIGURE_ARGS+=       --disable-man-pdfs
 CONFIGURE_ARGS+=       --disable-ocaml
+CONFIGURE_ARGS+=       --disable-perl
 CONFIGURE_ARGS+=       --disable-php
 CONFIGURE_ARGS+=       --disable-python
 CONFIGURE_ARGS+=       --disable-python3
@@ -42,9 +42,11 @@ CONFIGURE_ARGS+=     --enable-rpath
 CONFIGURE_ARGS+=       --without-ann
 CONFIGURE_ARGS+=       --without-devil
 CONFIGURE_ARGS+=       --without-gdiplus
+CONFIGURE_ARGS+=       --without-gdk
 CONFIGURE_ARGS+=       --without-glade
 CONFIGURE_ARGS+=       --without-glitz
 CONFIGURE_ARGS+=       --without-glut
+CONFIGURE_ARGS+=       --without-gtk
 CONFIGURE_ARGS+=       --without-gtkgl
 CONFIGURE_ARGS+=       --without-gtkglext
 CONFIGURE_ARGS+=       --without-lasi

Index: pkgsrc/graphics/graphviz/PLIST
diff -u pkgsrc/graphics/graphviz/PLIST:1.62 pkgsrc/graphics/graphviz/PLIST:1.63
--- pkgsrc/graphics/graphviz/PLIST:1.62 Fri Jul  5 10:34:12 2024
+++ pkgsrc/graphics/graphviz/PLIST      Fri Aug 16 11:50:39 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.62 2024/07/05 10:34:12 micha Exp $
+@comment $NetBSD: PLIST,v 1.63 2024/08/16 11:50:39 micha Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -75,9 +75,6 @@ lib/graphviz/libgvplugin_vt.la
 lib/graphviz/libgvplugin_webp.la
 ${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
 ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
-${PLIST.perl}lib/graphviz/perl/gv.pm
-${PLIST.perl}lib/graphviz/perl/gv.so
-${PLIST.perl}lib/graphviz/perl/libgv_perl.la
 ${PLIST.tcl}${PLIST.x11}lib/graphviz/tcl/libgdtclft.la
 ${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
@@ -91,8 +88,6 @@ lib/libgvpr.la
 lib/libpathplan.la
 lib/libxdot.la
 ${PLIST.lua}lib/lua/gv.so
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.pm
-${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/gv.so
 lib/pkgconfig/libcdt.pc
 lib/pkgconfig/libcgraph.pc
 lib/pkgconfig/libgvc.pc
@@ -146,7 +141,6 @@ man/man3/cgraph.3
 man/man3/expr.3
 ${PLIST.tcl}${PLIST.gd}man/man3/gdtclft.3tcl
 ${PLIST.lua}man/man3/gv.3lua
-${PLIST.perl}man/man3/gv.3perl
 ${PLIST.swig}man/man3/gv.3python
 ${PLIST.tcl}man/man3/gv.3tcl
 man/man3/gvc.3
@@ -196,7 +190,6 @@ ${PLIST.tcl}share/graphviz/demo/entities
 ${PLIST.tcl}share/graphviz/demo/gcat.tcl
 ${PLIST.tcl}share/graphviz/demo/gcat.tcl.README
 ${PLIST.lua}share/graphviz/demo/modgraph.lua
-${PLIST.perl}share/graphviz/demo/modgraph.pl
 ${PLIST.tcl}share/graphviz/demo/modgraph.tcl
 ${PLIST.tcl}share/graphviz/demo/pathplan.tcl
 ${PLIST.tcl}share/graphviz/demo/pathplan.tcl.README

Index: pkgsrc/graphics/graphviz/buildlink3.mk
diff -u pkgsrc/graphics/graphviz/buildlink3.mk:1.39 pkgsrc/graphics/graphviz/buildlink3.mk:1.40
--- pkgsrc/graphics/graphviz/buildlink3.mk:1.39 Fri Jul  5 10:34:12 2024
+++ pkgsrc/graphics/graphviz/buildlink3.mk      Fri Aug 16 11:50:39 2024
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.39 2024/07/05 10:34:12 micha Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2024/08/16 11:50:39 micha Exp $
 
 BUILDLINK_TREE+=       graphviz
 
 .if !defined(GRAPHVIZ_BUILDLINK3_MK)
 GRAPHVIZ_BUILDLINK3_MK:=
 
-USE_CC_FEATURES+=      c99
-USE_CXX_FEATURES+=     c++11 unique_ptr
+USE_CC_FEATURES+=      c11
+USE_CXX_FEATURES+=     c++17 unique_ptr
 
 BUILDLINK_API_DEPENDS.graphviz+=       graphviz>=2.26.3
 BUILDLINK_ABI_DEPENDS.graphviz+=       graphviz>=12.0.0
Index: pkgsrc/graphics/graphviz/options.mk
diff -u pkgsrc/graphics/graphviz/options.mk:1.39 pkgsrc/graphics/graphviz/options.mk:1.40
--- pkgsrc/graphics/graphviz/options.mk:1.39    Fri Jul  5 10:34:12 2024
+++ pkgsrc/graphics/graphviz/options.mk Fri Aug 16 11:50:39 2024
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.39 2024/07/05 10:34:12 micha Exp $
+# $NetBSD: options.mk,v 1.40 2024/08/16 11:50:39 micha Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.graphviz
-PKG_SUPPORTED_OPTIONS= gd ghostscript lua perl poppler svg tcl x11
+PKG_SUPPORTED_OPTIONS= gd ghostscript lua poppler svg tcl x11
 PKG_SUGGESTED_OPTIONS= gd
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
@@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+=       x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           gd ghostscript lua perl poppler quartz svg swig tcl x11
+PLIST_VARS+=           gd ghostscript lua poppler quartz svg swig tcl x11
 
 # Basic graphic format support, especially GIF
 .if !empty(PKG_OPTIONS:Mgd)
@@ -105,17 +105,6 @@ CONFIGURE_ARGS+=   --enable-tcl
 CONFIGURE_ARGS+=       --disable-tcl
 .endif
 
-# Extension language support
-.if !empty(PKG_OPTIONS:Mperl)
-USING_SWIG=    yes
-.  include "../../lang/perl5/buildlink3.mk"
-PLIST.perl=            yes
-USE_TOOLS+=            perl
-CONFIGURE_ARGS+=       --enable-perl
-.else
-CONFIGURE_ARGS+=       --disable-perl
-.endif
-
 # Required by some of the other options
 .if !empty(USING_SWIG:Myes)
 PLIST.swig=            yes

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.85 pkgsrc/graphics/graphviz/distinfo:1.86
--- pkgsrc/graphics/graphviz/distinfo:1.85      Fri Jul  5 10:34:12 2024
+++ pkgsrc/graphics/graphviz/distinfo   Fri Aug 16 11:50:39 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.85 2024/07/05 10:34:12 micha Exp $
+$NetBSD: distinfo,v 1.86 2024/08/16 11:50:39 micha Exp $
 
-BLAKE2s (graphviz-12.0.0.tar.gz) = afcf0e8d7a875387234daaf4ac5f35124a40eaf0be9032092c9a1eb84e97af86
-SHA512 (graphviz-12.0.0.tar.gz) = abce2766f1f57f48e711361113ee496d67ab555d8bb9757377b8b8ad38e7e025f239f48ad8effb869eeca5fe15a095c2468eee81a18c1d72a8be6383a97a59f8
-Size (graphviz-12.0.0.tar.gz) = 27373201 bytes
+BLAKE2s (graphviz-12.1.0.tar.gz) = d999f9b145812bba1e41e6e53a80106e7a3fa1c9ccf02b92ed278882b01988a2
+SHA512 (graphviz-12.1.0.tar.gz) = 8f13b4bf272b35603e2c090dd13a6c43d92dbef8919f10071c8adc0dc8cb347b6d7b8261d886ed60b9b95098c4c3cc9ef67fab0533dfed96e6ec26792fc88137
+Size (graphviz-12.1.0.tar.gz) = 26818242 bytes
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
 SHA1 (patch-configure.ac) = dcb9fd2822d3eb5dddcda5a55746d51114f92d06
-SHA1 (patch-lib_gvc_Makefile.am) = a8067feb25afcc81ab6048bb6a8f1aa1e93af878
+SHA1 (patch-lib_gvc_Makefile.am) = 8a25c16a31923fc42138773f308f3b3fc5ee662b
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9

Index: pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am
diff -u pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.4 pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.5
--- pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am:1.4      Fri Jul  5 10:34:12 2024
+++ pkgsrc/graphics/graphviz/patches/patch-lib_gvc_Makefile.am  Fri Aug 16 11:50:39 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-lib_gvc_Makefile.am,v 1.4 2024/07/05 10:34:12 micha Exp $
+$NetBSD: patch-lib_gvc_Makefile.am,v 1.5 2024/08/16 11:50:39 micha Exp $
 
 Link with pthread library, if needed.
 
---- lib/gvc/Makefile.am.orig   2024-07-04 07:59:36.000000000 +0000
+--- lib/gvc/Makefile.am.orig   2024-08-11 22:39:26.000000000 +0000
 +++ lib/gvc/Makefile.am
-@@ -49,7 +49,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
-       $(top_builddir)/lib/pathplan/libpathplan.la \
+@@ -50,7 +50,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD)
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/cdt/libcdt.la \
+       $(top_builddir)/lib/util/libutil_C.la \
 -      $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS)
 +      $(EXPAT_LIBS) $(Z_LIBS) $(MATH_LIBS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index