pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
graphviz: Update to 10.0.1
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Fri Feb 23 15:57:59 2024 +0100
Changeset: f0f7115e6cb4af5a083f307ab34d9531260a485c
Modified Files:
graphviz/COMMIT_MSG
graphviz/Makefile
graphviz/PLIST
graphviz/TODO
graphviz/distinfo
graphviz/patches/patch-configure.ac
Removed Files:
graphviz/patches/patch-lib_gvpr_actions.c
graphviz/patches/patch-lib_gvpr_compile.c
graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
Log Message:
graphviz: Update to 10.0.1
Remove pkgsrc patches for LUA location.
Add pkgsrc patch for nonportable shell syntax in configure script.
- Releases now include packages for [Rocky Linux](https://rockylinux.org/) 8
and 9.
- A new output format, `-Tsvg_inline`, has been added to generate a header-less
SVG suitable for inlining into HTML. #2285
- The functionality of the `acyclic`, `tred` and `unflatten` command line tools
are now exposed via the `graphviz_acyclic`, `graphviz_tred` and
`graphviz_unflatten` API functions in libcgraph. #2194
- `graphviz_node_induce` is available as a new API function in cgraph.h.
- `tred` gained a `-o` command line option to redirect its output to a file.
- The Criterion unit tests have been removed and migrated to Pytest. This is
primarily relevant to downstream packagers of Graphviz. #2443
- **Breaking**: `Dtdisc_t.memoryf` and its associated macros has been removed.
- **Breaking**: The `Dt_t.type` field has been removed.
- **Breaking**: The `dtfound`, `DT_FOUND`, `dtleast`, and `dtmost` macros have
been removed.
- The nrtmain.c test program has been removed from the portable tarball.
- The TCL Graphviz packages for inter-release versions/snapshots report
themselves as `<next release>b<internal number>` instead of
`<next release>~dev.<internal number>`. This fixes a problem wherein TCL would
see `~dev` as being invalid characters to appear in a version. #2370
- Support for discovering Lua via `lua-config*` has been removed from the
Autotools build system.
- Lua discovery in the Autotools build system should now respect the location of
your Lua installation and not unconditionally attempt installation into
`/usr`. #2152
- The GTK plugin is no longer built or distributed. This plugin relies on GTK 2
and X11. If you use this plugin, please contact the maintainers to let
them know it is worthwhile re-enabling this and forward porting it to GTK 3/4
and Wayland. #1848
- In the Autotools build system, `LIBPOSTFIX=` can now be used to suppress `64`
being appended to the library installation path.
- The `-m` command line option, whose functionality was disabled in Graphviz
3.0.0, has been removed.
- Man page typography has been slightly improved.
- macOS release artifacts no longer include `vimdot`. This may be restored in
future. #2423
- macOS release artifacts no longer include `smyrna`. This may be restored in
future. #2422
- The PDF output format, `-Tpdf`, respects the environment variable
`$SOURCE_DATE_EPOCH` for overriding `CreationDate` when built against Cairo
>= 1.16.0. #2473
- The legacy C# viewer app is no longer distributed in the portable source
tarball.
- Graphviz headers no longer define the `FALSE` and `TRUE` constants.
- The Autotools build system no longer supports Darwin 9 (Mac OSX Leopard).
- **Breaking**: `Agraph_t.link` has been split into `Agraph_t.id_link` and
`Agraph_t.seq_link`. `Agraph_t.g_dict` has been split into `Agraph_t.g_id`
and `Agraph_t.g_seq`.
- **Breaking**: `gvpropts.n_outgraphs` is now a `size_t`.
- The OCaml bindings have been removed. If you use these bindings, please contact
the maintainers to notify them of the existence of users.
- **Breaking**: `polygon_t.sides` and `polygon_t.peripheries` are now `size_t`s.
- **Breaking**: liblab_gamut is no longer included in a Graphviz installation.
This library had no accompanying header, so using it was not easy. If you are
using this library, please contact the maintainers to notify them of the
existence of users. #2489
- **Breaking**: `bezier.size` and `splines.size` are now `size_t`s.
- **Breaking**: the gv.i and gv.cpp SWIG inputs are no longer included in a
Graphviz installation. #2491
- **Breaking**: the `gvrender_engine_t.beziercurve`,
`gvrender_engine_t.library_shape`, `gvrender_engine_t.polygon`, and
`gvrender_engine_t.polyline` callbacks now take the number of points, `n`, as
a `size_t`.
- **Breaking**: the `AVG` macro has been removed.
- **Breaking**: the `inside_t.s` union member gained members `lastn`, `radius`,
`last_poly`, `last`, `outp`, `scalex`, `scaley`, `box_URx`, and `box_URy`.
Zero initialize these when you construct instances of this type. #2498
- The paper size for Doxygen docs generation in the Autotools build system has
been corrected to `a4`.
- References to `eventf` and `hashf` data structures in the libcdt man page
have been removed. These data structures were removed in Graphviz 9.0.0.
- References to `DTOFFSET` in the libcdt man page have been removed. This macro
was removed in Graphviz 2.40.0.
- A number of further updates to the libcdt man page have been made to reflect
other changes that happened in Graphviz 9.0.0.
- Use of the non-portable `PATH_MAX` constant has been removed. This was a
regression in Graphviz 7.0.1. In addition to fixing the regression, code has
been adjusted to remove assumptions on the maximum path length and treat it as
unbounded. #2452
- Compilation on NetBSD has been repaired. This was a regression in Graphviz
9.0.0.
- Compilation on SunOS has been repaired. This appears to have been broken since
the xlib plugin was added some time prior to Graphviz 2.38.0.
- gvpr programs that attempt to close out of range file descriptors no longer
cause out of bounds memory accesses.
- When large edge weights are used that cause an integer overflow when summing
them up, Graphviz now gracefully exits with an error message instead of
crashing. #2450
- Support for the `%n` specifier in `scanf` in gvpr has been restored. This was
a regression in Graphviz 9.0.0. #2454
- In the Autotools build system, `make dist` now processes cmd/gvedit correctly
when Qt is not installed. Generating Qt "mocables" is postponed from configure
time to build time. #2463
- The Autotools build system correctly detects Ruby headers, even when
pkg-config support is unavailable. #2464
- Escaped characters in xdot fields no longer lead to the containing text being
truncated. #2460
- When building against a libgd that is configured with `!gif && (jpeg || png)`,
the GD plugin is once again compilable. This was a regression in Graphviz
2.46.0.
- edgepaint spline intersection code would previously incorrectly use the second
spline in one instance where it should have used the first. #1464
- In the Autotools build, libexpat discovery on macOS has been improved. #2477
- A bug that caused compound edges to sometimes be drawn in the wrong direction
has been corrected. This was a regression in Graphviz 8.0.3. #2478
- When operating on multiple graphs, `unflatten` no longer retains chain node
and size internal state across graphs.
- Repeated runs of a graph with subgraphs now produce a stable subgraph
ordering. #2242
- The `dot` and `gml2gv` tools are now built with case-insensitive parsing
by the CMake and MSBuild systems, as they always were by autotools, and
in accordance with the graphviz specification. #2481
- Putting nodes in a subgraph no longer causes their layout order to be
reversed. #1585
- Edges are no longer lost when using subgraphs and record shapes in
combination. #1624
- A malformed config6 file that leads to plugin search failing no longer causes
out-of-bounds memory reads. This now causes an error message and graceful
failure. #2441
- Discovery of `php` in the Autotools build system has been improved.
- Text in the PIC output format is no longer forced to font size 1. This was a
regression in Graphviz 8.0.2. Even with this fix, the PIC output format is
limited in its utility. #2487
- When encountering a syntactically invalid HTML-like label, Graphviz.app no
longer aborts. The abort was an intentional change in Graphviz 8.0.1 to avoid
invalid memory reads in `dot`, but had the undesirable side effect of the
graphical Graphviz.app exiting with no obvious cause. #2488
- Use of an uninitialized variable in `poly_inside` has been corrected. #2498
- Input containing UTF-8 data that is destined to appear as-is in the output
(e.g. UTF-8 characters in a label when using the `-Tdot` output format) is
once again processed correctly. On platforms with a signed `char` this could
previously crash. This was a regression in Graphviz 2.49.0. #2502
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f0f7115e6cb4af5a083f307ab34d9531260a485c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
graphviz/COMMIT_MSG | 148 ++++++++++++++++++++-
graphviz/Makefile | 2 +-
graphviz/PLIST | 4 -
graphviz/TODO | 6 +-
graphviz/distinfo | 11 +-
graphviz/patches/patch-configure.ac | 86 ++++--------
graphviz/patches/patch-lib_gvpr_actions.c | 18 ---
graphviz/patches/patch-lib_gvpr_compile.c | 18 ---
.../patches/patch-plugin_xlib_gvdevice__xlib.c | 16 ---
9 files changed, 181 insertions(+), 128 deletions(-)
diffs:
diff --git a/graphviz/COMMIT_MSG b/graphviz/COMMIT_MSG
index 999f702134..f6a71e7675 100644
--- a/graphviz/COMMIT_MSG
+++ b/graphviz/COMMIT_MSG
@@ -1,4 +1,150 @@
-graphics/graphviz: Update to 9.0.0
+graphics/graphviz: Update to 10.0.1
+
+Remove pkgsrc patches for LUA location.
+Add pkgsrc patch for nonportable shell syntax in configure script.
+
+## [10.0.1] - 2024-02-11
+
+### Added
+
+- Releases now include packages for [Rocky Linux](https://rockylinux.org/) 8
+ and 9.
+- A new output format, `-Tsvg_inline`, has been added to generate a header-less
+ SVG suitable for inlining into HTML. #2285
+- The functionality of the `acyclic`, `tred` and `unflatten` command line tools
+ are now exposed via the `graphviz_acyclic`, `graphviz_tred` and
+ `graphviz_unflatten` API functions in libcgraph. #2194
+- `graphviz_node_induce` is available as a new API function in cgraph.h.
+- `tred` gained a `-o` command line option to redirect its output to a file.
+
+### Changed
+
+- The Criterion unit tests have been removed and migrated to Pytest. This is
+ primarily relevant to downstream packagers of Graphviz. #2443
+- **Breaking**: `Dtdisc_t.memoryf` and its associated macros has been removed.
+- **Breaking**: The `Dt_t.type` field has been removed.
+- **Breaking**: The `dtfound`, `DT_FOUND`, `dtleast`, and `dtmost` macros have
+ been removed.
+- The nrtmain.c test program has been removed from the portable tarball.
+- The TCL Graphviz packages for inter-release versions/snapshots report
+ themselves as `<next release>b<internal number>` instead of
+ `<next release>~dev.<internal number>`. This fixes a problem wherein TCL would
+ see `~dev` as being invalid characters to appear in a version. #2370
+- Support for discovering Lua via `lua-config*` has been removed from the
+ Autotools build system.
+- Lua discovery in the Autotools build system should now respect the location of
+ your Lua installation and not unconditionally attempt installation into
+ `/usr`. #2152
+- The GTK plugin is no longer built or distributed. This plugin relies on GTK 2
+ and X11. If you use this plugin, please contact the maintainers to let
+ them know it is worthwhile re-enabling this and forward porting it to GTK 3/4
+ and Wayland. #1848
+- In the Autotools build system, `LIBPOSTFIX=` can now be used to suppress `64`
+ being appended to the library installation path.
+- The `-m` command line option, whose functionality was disabled in Graphviz
+ 3.0.0, has been removed.
+- Man page typography has been slightly improved.
+- macOS release artifacts no longer include `vimdot`. This may be restored in
+ future. #2423
+- macOS release artifacts no longer include `smyrna`. This may be restored in
+ future. #2422
+- The PDF output format, `-Tpdf`, respects the environment variable
+ `$SOURCE_DATE_EPOCH` for overriding `CreationDate` when built against Cairo
+ >= 1.16.0. #2473
+- The legacy C# viewer app is no longer distributed in the portable source
+ tarball.
+- Graphviz headers no longer define the `FALSE` and `TRUE` constants.
+- The Autotools build system no longer supports Darwin 9 (Mac OSX Leopard).
+- **Breaking**: `Agraph_t.link` has been split into `Agraph_t.id_link` and
+ `Agraph_t.seq_link`. `Agraph_t.g_dict` has been split into `Agraph_t.g_id`
+ and `Agraph_t.g_seq`.
+- **Breaking**: `gvpropts.n_outgraphs` is now a `size_t`.
+- The OCaml bindings have been removed. If you use these bindings, please contact
+ the maintainers to notify them of the existence of users.
+- **Breaking**: `polygon_t.sides` and `polygon_t.peripheries` are now `size_t`s.
+- **Breaking**: liblab_gamut is no longer included in a Graphviz installation.
+ This library had no accompanying header, so using it was not easy. If you are
+ using this library, please contact the maintainers to notify them of the
+ existence of users. #2489
+- **Breaking**: `bezier.size` and `splines.size` are now `size_t`s.
+- **Breaking**: the gv.i and gv.cpp SWIG inputs are no longer included in a
+ Graphviz installation. #2491
+- **Breaking**: the `gvrender_engine_t.beziercurve`,
+ `gvrender_engine_t.library_shape`, `gvrender_engine_t.polygon`, and
+ `gvrender_engine_t.polyline` callbacks now take the number of points, `n`, as
+ a `size_t`.
+- **Breaking**: the `AVG` macro has been removed.
+- **Breaking**: the `inside_t.s` union member gained members `lastn`, `radius`,
+ `last_poly`, `last`, `outp`, `scalex`, `scaley`, `box_URx`, and `box_URy`.
+ Zero initialize these when you construct instances of this type. #2498
+
+### Fixed
+
+- The paper size for Doxygen docs generation in the Autotools build system has
+ been corrected to `a4`.
+- References to `eventf` and `hashf` data structures in the libcdt man page
+ have been removed. These data structures were removed in Graphviz 9.0.0.
+- References to `DTOFFSET` in the libcdt man page have been removed. This macro
+ was removed in Graphviz 2.40.0.
+- A number of further updates to the libcdt man page have been made to reflect
+ other changes that happened in Graphviz 9.0.0.
+- Use of the non-portable `PATH_MAX` constant has been removed. This was a
+ regression in Graphviz 7.0.1. In addition to fixing the regression, code has
+ been adjusted to remove assumptions on the maximum path length and treat it as
+ unbounded. #2452
+- Compilation on NetBSD has been repaired. This was a regression in Graphviz
+ 9.0.0.
+- Compilation on SunOS has been repaired. This appears to have been broken since
+ the xlib plugin was added some time prior to Graphviz 2.38.0.
+- gvpr programs that attempt to close out of range file descriptors no longer
+ cause out of bounds memory accesses.
+- When large edge weights are used that cause an integer overflow when summing
+ them up, Graphviz now gracefully exits with an error message instead of
+ crashing. #2450
+- Support for the `%n` specifier in `scanf` in gvpr has been restored. This was
+ a regression in Graphviz 9.0.0. #2454
+- In the Autotools build system, `make dist` now processes cmd/gvedit correctly
+ when Qt is not installed. Generating Qt "mocables" is postponed from configure
+ time to build time. #2463
+- The Autotools build system correctly detects Ruby headers, even when
+ pkg-config support is unavailable. #2464
+- Escaped characters in xdot fields no longer lead to the containing text being
+ truncated. #2460
+- When building against a libgd that is configured with `!gif && (jpeg || png)`,
+ the GD plugin is once again compilable. This was a regression in Graphviz
+ 2.46.0.
+- edgepaint spline intersection code would previously incorrectly use the second
+ spline in one instance where it should have used the first. #1464
+- In the Autotools build, libexpat discovery on macOS has been improved. #2477
+- A bug that caused compound edges to sometimes be drawn in the wrong direction
+ has been corrected. This was a regression in Graphviz 8.0.3. #2478
+- When operating on multiple graphs, `unflatten` no longer retains chain node
+ and size internal state across graphs.
+- Repeated runs of a graph with subgraphs now produce a stable subgraph
+ ordering. #2242
+- The `dot` and `gml2gv` tools are now built with case-insensitive parsing
+ by the CMake and MSBuild systems, as they always were by autotools, and
+ in accordance with the graphviz specification. #2481
+- Putting nodes in a subgraph no longer causes their layout order to be
+ reversed. #1585
+- Edges are no longer lost when using subgraphs and record shapes in
+ combination. #1624
+- A malformed config6 file that leads to plugin search failing no longer causes
+ out-of-bounds memory reads. This now causes an error message and graceful
+ failure. #2441
+- Discovery of `php` in the Autotools build system has been improved.
+- Text in the PIC output format is no longer forced to font size 1. This was a
+ regression in Graphviz 8.0.2. Even with this fix, the PIC output format is
+ limited in its utility. #2487
+- When encountering a syntactically invalid HTML-like label, Graphviz.app no
+ longer aborts. The abort was an intentional change in Graphviz 8.0.1 to avoid
+ invalid memory reads in `dot`, but had the undesirable side effect of the
+ graphical Graphviz.app exiting with no obvious cause. #2488
+- Use of an uninitialized variable in `poly_inside` has been corrected. #2498
+- Input containing UTF-8 data that is destined to appear as-is in the output
+ (e.g. UTF-8 characters in a label when using the `-Tdot` output format) is
+ once again processed correctly. On platforms with a signed `char` this could
+ previously crash. This was a regression in Graphviz 2.49.0. #2502
## 9.0.0 - 2023-09-11
diff --git a/graphviz/Makefile b/graphviz/Makefile
index 0319d9b873..3265f3c468 100644
--- a/graphviz/Makefile
+++ b/graphviz/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= graphviz-9.0.0
+DISTNAME= graphviz-10.0.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.xz
diff --git a/graphviz/PLIST b/graphviz/PLIST
index 1cd839dcd9..224682d910 100644
--- a/graphviz/PLIST
+++ b/graphviz/PLIST
@@ -42,8 +42,6 @@ include/graphviz/cgraph.h
include/graphviz/color.h
include/graphviz/geom.h
include/graphviz/graphviz_version.h
-include/graphviz/gv.cpp
-include/graphviz/gv.i
include/graphviz/gvc.h
include/graphviz/gvcext.h
include/graphviz/gvcjob.h
@@ -92,7 +90,6 @@ lib/libcdt.la
lib/libcgraph.la
lib/libgvc.la
lib/libgvpr.la
-lib/liblab_gamut.la
lib/libpathplan.la
lib/libxdot.la
${PLIST.lua}lib/lua/gv.so
@@ -102,7 +99,6 @@ lib/pkgconfig/libcdt.pc
lib/pkgconfig/libcgraph.pc
lib/pkgconfig/libgvc.pc
lib/pkgconfig/libgvpr.pc
-lib/pkgconfig/liblab_gamut.pc
lib/pkgconfig/libpathplan.pc
lib/pkgconfig/libxdot.pc
${PLIST.tcl}${PLIST.x11}lib/tcl${TCL_BASEVER}/graphviz/libgdtclft.la
diff --git a/graphviz/TODO b/graphviz/TODO
index 09140db7aa..401672f2c4 100644
--- a/graphviz/TODO
+++ b/graphviz/TODO
@@ -1,2 +1,4 @@
-- Postponed until already merged NetBSD patches are released ...
- again with a different major version :-(
+[X] Postponed until already merged NetBSD patches are released ...
+ again with a different major version :-(
+[X] Package should work again with all options disabled
+[ ] Test options
diff --git a/graphviz/distinfo b/graphviz/distinfo
index ff70af210f..cdec0365dc 100644
--- a/graphviz/distinfo
+++ b/graphviz/distinfo
@@ -1,12 +1,9 @@
$NetBSD: distinfo,v 1.82 2023/07/07 13:38:11 micha Exp $
-BLAKE2s (graphviz-9.0.0.tar.xz) = dc5bb0e4b72c6187068414e2061116f5d56f32f96b9d649effee2db7966eab08
-SHA512 (graphviz-9.0.0.tar.xz) = 912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c
-Size (graphviz-9.0.0.tar.xz) = 21412796 bytes
+BLAKE2s (graphviz-10.0.1.tar.xz) = 7fdf6be370be702dba267f5b0895aa69a3cf3fcc53fd951a6358602ad5264d48
+SHA512 (graphviz-10.0.1.tar.xz) = 5e6a195357d38aa93fbd231c854b25e4ae4b0efd011de1e37550bc77b2137c98d72fdf7b0df0e8f3e9ba70849461e85cbd591b0064eccfc8788fcf532b7ae2c1
+Size (graphviz-10.0.1.tar.xz) = 21297808 bytes
SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
-SHA1 (patch-configure.ac) = 80e303d6a9b95c5bb732677a0f1f63d209b39856
+SHA1 (patch-configure.ac) = e76919fc4705194e2ebe0f71f2d19d95c692b9f4
SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f
-SHA1 (patch-lib_gvpr_actions.c) = 5307d2c543127e4d90330699be65b529ed34bdf1
-SHA1 (patch-lib_gvpr_compile.c) = 497909cf6819052319cf7e77f92666227c4b821d
SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9
-SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
diff --git a/graphviz/patches/patch-configure.ac b/graphviz/patches/patch-configure.ac
index 90f4b974cc..ea19defefa 100644
--- a/graphviz/patches/patch-configure.ac
+++ b/graphviz/patches/patch-configure.ac
@@ -1,11 +1,11 @@
$NetBSD: patch-configure.ac,v 1.12 2023/01/23 13:44:02 micha Exp $
Use the same path for all platforms in pkgsrc.
-Use lua from pkgsrc.
+Fix nonportable shell syntax.
---- configure.ac.orig 2023-01-06 05:16:50.000000000 +0000
+--- configure.ac.orig 2024-02-10 22:00:40.000000000 +0000
+++ configure.ac
-@@ -92,8 +92,7 @@ if test -z "$LIBPOSTFIX"; then
+@@ -92,8 +92,7 @@ if test -z "${LIBPOSTFIX++}"; then
case "${host_os}" in
*linux* )
case "${host_cpu}" in
@@ -15,7 +15,7 @@ Use lua from pkgsrc.
INTGOSIZE=64
;;
esac
-@@ -101,7 +100,6 @@ if test -z "$LIBPOSTFIX"; then
+@@ -101,7 +100,6 @@ if test -z "${LIBPOSTFIX++}"; then
*solaris* )
case "${host_cpu}" in
x86_64 | sparc64 )
@@ -23,65 +23,29 @@ Use lua from pkgsrc.
INTGOSIZE=64
;;
esac
-@@ -858,7 +856,7 @@ else
- if test "x$?" = "x0" ; then
- LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l`
- LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l`
-- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
-+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`"
-
- pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null`
- if test "x$?" = "x0"; then
-@@ -879,7 +877,7 @@ else
- echo
- LUA_INCLUDES=`$LUACONFIG --include`
- LUA_LIBS=`$LUACONFIG --libs`
-- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
-+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
- fi
- fi
-
-@@ -2053,43 +2051,6 @@ fi
- AM_CONDITIONAL(WITH_QUARTZ, [test "x$use_quartz" = "xYes"])
-
+@@ -1760,7 +1758,10 @@ AM_CONDITIONAL([WITH_QT], [test "$use_qt
dnl -----------------------------------
--dnl INCLUDES and LIBS for PLATFORMSDK
--
--AC_ARG_WITH(platformsdkincludedir,
-- [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
-- [PLATFORMSDKINCLUDE=$withval])
--
--AC_ARG_WITH(platformsdklibdir,
-- [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],
-- [PLATFORMSDKLIB=$withval])
--
--AC_SUBST([PLATFORMSDKINCLUDE])
--AC_SUBST([PLATFORMSDKLIB])
--
--dnl -----------------------------------
--dnl INCLUDES and LIBS for GDI+
--
--AC_ARG_WITH(gdiplus,
-- [AS_HELP_STRING([--with-gdiplus=no],[GDI+ framework (Windows)])],
-- [], [with_gdiplus=no])
--
--if test "x$with_gdiplus" != "xyes"; then
-- use_gdiplus="No (disabled by default - Windows only)"
+ dnl INCLUDES and LIBS for QUARTZ
+
+-if test "${host_os::6}" = "darwin"; then
++dnl Not suitable for a POSIX shell
++dnl if test "${host_os::6}" = "darwin"; then
++case ${host_os} in
++darwin*)
+ AC_ARG_WITH(quartz,
+ [AS_HELP_STRING([--with-quartz=yes],[Quartz framework (Mac OS X)])],
+ [],[with_quartz=yes])
+@@ -1777,10 +1778,11 @@ if test "${host_os::6}" = "darwin"; then
+ use_quartz="No (missing ApplicationServices.framework)"
+ fi
+ fi
-else
-- if test -f "$PLATFORMSDKINCLUDE\GdiPlus.h" -a -f "$PLATFORMSDKLIB\GdiPlus.lib"; then
-- use_gdiplus="Yes"
-- AC_DEFINE_UNQUOTED(HAVE_GDIPLUS,1,[Define if you have the GDI+ framework for Windows])
-- GDIPLUS_HEADS=`cd "$PLATFORMSDKINCLUDE" && echo GdiPlus*.h`
-- GDIPLUS_CFLAGS=''
-- GDIPLUS_LIBS=''
-- AC_SUBST([GDIPLUS_HEADS])
-- AC_SUBST([GDIPLUS_CFLAGS])
-- AC_SUBST([GDIPLUS_LIBS])
-- else
-- use_gdiplus="No (missing headers)"
-- AC_MSG_WARN(--with-gdiplus requires valid --with-platformsdkincludedir and --with-platformsdklibdir.)
-- fi
++ ;;
++*)
+ with_quartz=no
+ use_quartz="No (disabled by default - Mac only)"
-fi
- AM_CONDITIONAL(WITH_GDIPLUS, [test "x$use_gdiplus" = "xYes"])
++esac
+ AM_CONDITIONAL(WITH_QUARTZ, [test "$use_quartz" = "Yes"])
dnl -----------------------------------
diff --git a/graphviz/patches/patch-lib_gvpr_actions.c b/graphviz/patches/patch-lib_gvpr_actions.c
deleted file mode 100644
index fffe8bf0a0..0000000000
--- a/graphviz/patches/patch-lib_gvpr_actions.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Workaround for upstream commit 8ce6b211ce7b9ebad3e30fa909effebf59955a93 .
-At least with NetBSD stdio fileno() does not accept (void *) type for parameter.
-
---- lib/gvpr/actions.c.orig 2023-09-11 18:30:04.000000000 +0000
-+++ lib/gvpr/actions.c
-@@ -33,7 +33,9 @@
- #define KINDS(p) ((AGTYPE(p) == AGRAPH) ? "graph" : (AGTYPE(p) == AGNODE) ? "node" : "edge")
-
- static int iofread(void *chan, char *buf, int bufsize) {
-- return (int)read(fileno(chan), buf, bufsize);
-+ FILE *fp = chan;
-+
-+ return (int)read(fileno(fp), buf, bufsize);
- }
-
- static int ioputstr(void *chan, const char *str) {
diff --git a/graphviz/patches/patch-lib_gvpr_compile.c b/graphviz/patches/patch-lib_gvpr_compile.c
deleted file mode 100644
index 364cffb7d5..0000000000
--- a/graphviz/patches/patch-lib_gvpr_compile.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Workaround for upstream commit 8ce6b211ce7b9ebad3e30fa909effebf59955a93 .
-At least with NetBSD stdio fileno() does not accept (void *) type for parameter.
-
---- lib/gvpr/compile.c.orig 2023-09-11 18:30:04.000000000 +0000
-+++ lib/gvpr/compile.c
-@@ -56,7 +56,9 @@ static Sflong_t ptr2int(const void *p) {
-
- static int iofread(void *chan, char *buf, int bufsize)
- {
-- return (int)read(fileno(chan), buf, bufsize);
-+ FILE *fp = chan;
-+
-+ return (int)read(fileno(fp), buf, bufsize);
- }
-
- static int ioputstr(void *chan, const char *str)
diff --git a/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c b/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
deleted file mode 100644
index 26e3c0455c..0000000000
--- a/graphviz/patches/patch-plugin_xlib_gvdevice__xlib.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugin_xlib_gvdevice__xlib.c,v 1.3 2022/07/22 12:04:46 micha Exp $
-
-SunOS inotify requires sys/filio.h for FIONREAD.
-
---- plugin/xlib/gvdevice_xlib.c.orig 2020-04-08 07:51:58.000000000 +0000
-+++ plugin/xlib/gvdevice_xlib.c
-@@ -32,6 +32,9 @@
- #endif
- #ifdef HAVE_SYS_INOTIFY_H
- #include <sys/inotify.h>
-+#ifdef __sun
-+#include <sys/filio.h>
-+#endif
- #endif
- #include <errno.h>
- #ifdef HAVE_FCNTL_H
Home |
Main Index |
Thread Index |
Old Index