]> granicus.if.org Git - graphviz/log
graphviz
2 years agoMerge branch 'smattr/E49AF984-3CD6-407B-A6F9-EB8A1DF600FB' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 16:18:37 +0000 (16:18 +0000)]
Merge branch 'smattr/E49AF984-3CD6-407B-A6F9-EB8A1DF600FB' into 'main'

CMake: enable DevIL plugin

See merge request graphviz/graphviz!2549

2 years agoMerge branch 'smattr/0C611C83-0C0E-441A-8341-2736681C3F5F' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 15:59:24 +0000 (15:59 +0000)]
Merge branch 'smattr/0C611C83-0C0E-441A-8341-2736681C3F5F' into 'main'

remove build system support for Lefty

See merge request graphviz/graphviz!2542

2 years agoCMake: enable DevIL plugin
Matthew Fernandez [Fri, 1 Apr 2022 00:20:34 +0000 (17:20 -0700)]
CMake: enable DevIL plugin

Gitlab: #1836

2 years agoremove build system support for 'lefty'
Matthew Fernandez [Tue, 29 Mar 2022 03:52:37 +0000 (20:52 -0700)]
remove build system support for 'lefty'

04a78cc9ae01b2a7e5d5435146cd503c45af90b9 disabled Lefty in the Autotools build
system. The only fall out from this seems to have been Gentoo discovering
mistakes in the Graphviz Autotools files.¹ With mild evidence that there is no
one downstream relying on Lefty, we take the next step in its removal. If
another three months pass with no issues, we can remove Lefty from the Graphviz
tree altogether.

CC: David Seifert <soap@gentoo.org>
Gitlab: related to #1836, #1854

¹ https://gitlab.com/graphviz/graphviz/-/merge_requests/2520

2 years agoremove build system support for 'dotty'
Matthew Fernandez [Tue, 29 Mar 2022 15:05:33 +0000 (08:05 -0700)]
remove build system support for 'dotty'

`dotty` is built on top of `lefty` which is deprecated and will be removed in a
future commit.

2 years agoremove build system support for 'lneato'
Matthew Fernandez [Tue, 29 Mar 2022 14:59:05 +0000 (07:59 -0700)]
remove build system support for 'lneato'

`lneato` is built on top of `lefty` which is deprecated and will be removed in a
future commit.

2 years agoMerge branch 'smattr/B664DAE8-8F55-42C9-A090-8D658C3F6777' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 01:23:20 +0000 (01:23 +0000)]
Merge branch 'smattr/B664DAE8-8F55-42C9-A090-8D658C3F6777' into 'main'

WebP plugin: squash warnings and enable in the CMake build system

See merge request graphviz/graphviz!2546

2 years agoCMake: enable WebP plugin
Matthew Fernandez [Thu, 31 Mar 2022 03:49:05 +0000 (20:49 -0700)]
CMake: enable WebP plugin

Gitlab: #1836

2 years agoWebP plugin: remove unnecessary parens
Matthew Fernandez [Thu, 31 Mar 2022 03:42:14 +0000 (20:42 -0700)]
WebP plugin: remove unnecessary parens

2 years agowebp_loadimage_cairo: squash -Wunused-parameter warning
Matthew Fernandez [Thu, 31 Mar 2022 03:38:56 +0000 (20:38 -0700)]
webp_loadimage_cairo: squash -Wunused-parameter warning

This function is used as a callback, so needs to have this type signature.

2 years agowebp_really_loadimage: correct type for 'data_size'
Matthew Fernandez [Thu, 31 Mar 2022 03:36:40 +0000 (20:36 -0700)]
webp_really_loadimage: correct type for 'data_size'

Squashes a -Wconversion warning.

2 years agowebp_format: squash -Wsign-conversion warnings
Matthew Fernandez [Thu, 31 Mar 2022 03:30:34 +0000 (20:30 -0700)]
webp_format: squash -Wsign-conversion warnings

2 years agoWebP plugin: remove unnecessary casts
Matthew Fernandez [Thu, 31 Mar 2022 03:24:14 +0000 (20:24 -0700)]
WebP plugin: remove unnecessary casts

2 years agoMerge branch 'smattr/495CECF8-863F-4028-A599-2376050D52EA' into 'main'
Matthew Fernandez [Fri, 1 Apr 2022 06:13:03 +0000 (06:13 +0000)]
Merge branch 'smattr/495CECF8-863F-4028-A599-2376050D52EA' into 'main'

upgrade Pylint

See merge request graphviz/graphviz!2545

2 years agoupgrade Pylint
Matthew Fernandez [Thu, 31 Mar 2022 00:33:35 +0000 (17:33 -0700)]
upgrade Pylint

2 years agoMerge branch 'smattr/A69045D6-DB2A-400C-AAC4-6E626F818E3E' into 'main'
Matthew Fernandez [Fri, 1 Apr 2022 00:01:11 +0000 (00:01 +0000)]
Merge branch 'smattr/A69045D6-DB2A-400C-AAC4-6E626F818E3E' into 'main'

CI: remove Ubuntu 21.04

See merge request graphviz/graphviz!2544

2 years agoCI: remove Ubuntu 21.04
Matthew Fernandez [Thu, 31 Mar 2022 03:07:46 +0000 (20:07 -0700)]
CI: remove Ubuntu 21.04

Ubuntu 21.04 was EOLed on 2022-01-20.¹

¹ https://wiki.ubuntu.com/Releases

2 years agoMerge branch 'smattr/0F04F849-05F9-46B6-A6B8-B4DB5F4DBF82' into 'main'
Matthew Fernandez [Wed, 30 Mar 2022 04:02:47 +0000 (04:02 +0000)]
Merge branch 'smattr/0F04F849-05F9-46B6-A6B8-B4DB5F4DBF82' into 'main'

remove 'WIN32_LEAN_AND_MEAN' manipulation

See merge request graphviz/graphviz!2538

2 years agoremove 'WIN32_LEAN_AND_MEAN' manipulation
Matthew Fernandez [Sun, 27 Mar 2022 02:39:53 +0000 (19:39 -0700)]
remove 'WIN32_LEAN_AND_MEAN' manipulation

This macro is a legacy toggle to suppress parts of the Windows API surface in
order to accelerate compilation. In a parallel compilation of a code base the
size of Graphviz, it has a negligible effect. As always, Raymond Chen gives the
back story.¹ This commit removes these tricks to ease future maintenance.

¹ https://devblogs.microsoft.com/oldnewthing/20091130-00/?p=15863

2 years agoMerge branch 'smattr/469B07AD-AF55-4239-AFAD-9601CEFA4059' into 'main'
Matthew Fernandez [Wed, 30 Mar 2022 01:20:49 +0000 (01:20 +0000)]
Merge branch 'smattr/469B07AD-AF55-4239-AFAD-9601CEFA4059' into 'main'

CMake: enable Smyrna on Linux

See merge request graphviz/graphviz!2540

2 years agoCI: enable Smyrna on Ubuntu CMake jobs
Matthew Fernandez [Tue, 22 Mar 2022 01:20:19 +0000 (18:20 -0700)]
CI: enable Smyrna on Ubuntu CMake jobs

2 years agoCMake: enable 'smyrna'
Matthew Fernandez [Mon, 21 Mar 2022 04:02:58 +0000 (21:02 -0700)]
CMake: enable 'smyrna'

Gitlab: #1836, #1854

2 years agotests: strip 'XType' warnings in '-?' usage test
Matthew Fernandez [Sat, 26 Mar 2022 19:36:30 +0000 (12:36 -0700)]
tests: strip 'XType' warnings in '-?' usage test

On macOS, Smyrna prints some warnings prior to the usage text:

  2022-03-26 19:32:21.216 smyrna[70079:124370] XType: com.apple.fonts is not
    accessible.
  2022-03-26 19:32:21.216 smyrna[70079:124370] XType: XTFontStaticRegistry is
    enabled.
  Usage: smyrna [-v?] <file>

Gitlab: related to #1836, #1854

2 years agotests: when squashing macOS 'XType' warnings, also swallow trailing '\n'
Matthew Fernandez [Sun, 27 Mar 2022 18:20:16 +0000 (11:20 -0700)]
tests: when squashing macOS 'XType' warnings, also swallow trailing '\n'

Enabling Smyrna on macOS fails the test `test_tools` because running `smyrna -?`
outputs some XType warnings prior to the usage text. Suppressing these with
`remove_xtype_warnings` still does not fix the issue because the seen text now
begins “\n\nusage:…”. This change makes `remove_xtype_warnings` act more
precisely and strip the end of line character that is part of the warning as
well.

Gitlab: related to #1836, #1854

2 years agotests: move 'XType' stripping into a library function
Matthew Fernandez [Sat, 26 Mar 2022 19:40:01 +0000 (12:40 -0700)]
tests: move 'XType' stripping into a library function

We will need to use this in another test case in an upcoming commit.

2 years agolib/glcomp: silence deprecation warnings
Matthew Fernandez [Sat, 26 Mar 2022 01:42:46 +0000 (18:42 -0700)]
lib/glcomp: silence deprecation warnings

Warnings about OpenGL function usage fail the CMake build when Smyrna is enabled
on macOS.

Gitlab: related to #1836, #1854

2 years agoadd an OpenGL abstraction header
Matthew Fernandez [Thu, 24 Mar 2022 04:18:20 +0000 (21:18 -0700)]
add an OpenGL abstraction header

On macOS, the OpenGL implementation is provided by the XCode SDK under the
“OpenGL/” prefix instead of “GL/” as on other operating systems. Note that
glut.h is still provided by the Freeglut package under “GL/”.

Gitlab: related to #1836, #1854

2 years agoCI: replicate Qt tweak explanation from one macOS file into another
Matthew Fernandez [Wed, 23 Mar 2022 03:39:41 +0000 (20:39 -0700)]
CI: replicate Qt tweak explanation from one macOS file into another

Makes it slightly less cryptic to the reader why these steps are being done.

2 years agoCMake: make all glcomp checks required if 'with_smyrna=ON'
Matthew Fernandez [Tue, 22 Mar 2022 14:43:27 +0000 (07:43 -0700)]
CMake: make all glcomp checks required if 'with_smyrna=ON'

Given there is a build system flag `with_smyrna` that defaults to `OFF`, it
seems to make more sense to unconditionally attempt to build glcomp when this
flag is on. The current silent disabling behavior when dependencies are missing
results in a confusing link failure when glcomp cannot be found. Following this
change, this is instead a configuration failure pointing to the missing
dependency(ies).

2 years agoMerge branch 'smattr/A63E118C-81BA-4D68-8659-80C2FE6883AE' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 17:31:43 +0000 (17:31 +0000)]
Merge branch 'smattr/A63E118C-81BA-4D68-8659-80C2FE6883AE' into 'main'

move installation test into CI-only tests

See merge request graphviz/graphviz!2528

2 years agomove installation test into CI-only tests
Matthew Fernandez [Thu, 24 Mar 2022 02:24:52 +0000 (19:24 -0700)]
move installation test into CI-only tests

This test was introduced in !1347¹ in response to some version confusion due to
the Graphviz version being generated in several different places. Locally, this
test could fail misleadingly if the developer had new commits in their Graphviz
checkout and had not recompiled. But these failures are not relevant; running
the test suite against a slightly different version of Graphviz should not
unconditionally fail one of the tests. Moreover a developer working locally is
generally only running a single work flow, so their local Graphviz version is
generated in a single place.

The place where we do worry about version divergence is in CI, where the steps
for generating the Graphviz version for different platforms are in different
places and can accidentally skew. So this change makes the test only run in CI,
not locally.

Note that we can also drop the conditional logic to recover the version from the
GRAPHVIZ_VERSION file because the `$GV_VERSION` environment variable is defined
in all the CI testing jobs.

¹ https://gitlab.com/graphviz/graphviz/-/merge_requests/1347

2 years agoMerge branch 'smattr/6E28F98D-AFCD-4FD0-8D05-340CC2F883A7' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 15:19:05 +0000 (15:19 +0000)]
Merge branch 'smattr/6E28F98D-AFCD-4FD0-8D05-340CC2F883A7' into 'main'

CMake: some minor clean up

See merge request graphviz/graphviz!2534

2 years agoCMake: replace a hard-coded libm reference with '$MATH_LIB'
Matthew Fernandez [Sat, 26 Mar 2022 18:39:42 +0000 (11:39 -0700)]
CMake: replace a hard-coded libm reference with '$MATH_LIB'

2 years agoCMake: use 'SYSTEM' for third-party include directories
Matthew Fernandez [Sat, 26 Mar 2022 18:37:29 +0000 (11:37 -0700)]
CMake: use 'SYSTEM' for third-party include directories

This tells CMake to use `-isystem` for these directories instead of `-I`,
suppressing any compiler warnings in third-party code.

2 years agoCMake: fix indentation in lib/mingle’s CMakeLists.txt
Matthew Fernandez [Sat, 26 Mar 2022 18:32:26 +0000 (11:32 -0700)]
CMake: fix indentation in lib/mingle’s CMakeLists.txt

2 years agolneato on Windows: remove unused 'panic' function
Matthew Fernandez [Sat, 26 Mar 2022 18:20:18 +0000 (11:20 -0700)]
lneato on Windows: remove unused 'panic' function

2 years agoCMake: remove generator expressions in comments
Matthew Fernandez [Sat, 26 Mar 2022 18:16:26 +0000 (11:16 -0700)]
CMake: remove generator expressions in comments

Generator expressions¹ within strings are not expanded. So these lines were
leading to confusing build output indicating the literal text of the generator
expression was being symlinked:

  [ 79%] Linking C executable dot
  Linking $<TARGET_FILE_NAME:dot> as circo
  Linking $<TARGET_FILE_NAME:dot> as fdp
  Linking $<TARGET_FILE_NAME:dot> as neato
  Linking $<TARGET_FILE_NAME:dot> as osage
  Linking $<TARGET_FILE_NAME:dot> as patchwork
  Linking $<TARGET_FILE_NAME:dot> as sfdp
  Linking $<TARGET_FILE_NAME:dot> as twopi
  [ 79%] Built target dot

¹ https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html

2 years agoMerge branch 'smattr/AEEEBED2-E88B-4F17-BA22-76A206A83DAD' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 05:51:29 +0000 (05:51 +0000)]
Merge branch 'smattr/AEEEBED2-E88B-4F17-BA22-76A206A83DAD' into 'main'

gdiplus plugin: remove MS Visual Studio 8 patches

See merge request graphviz/graphviz!2539

2 years agogdiplus plugin: remove MS Visual Studio 8 patches
Matthew Fernandez [Sun, 27 Mar 2022 22:20:58 +0000 (15:20 -0700)]
gdiplus plugin: remove MS Visual Studio 8 patches

These patches appear to have been working around some non-portable code in the
headers shipped with Microsoft Visual Studio 8 (a.k.a. Microsoft Visual Studio
2005). This version of Visual Studio was EOLed on 2016-04-12. Neither the CMake
nor MS Build build systems (the only CI environments for which compilation of
this plugin is enabled) were using these patches. So apparently they have not
been useful for a long time.

2 years agoMerge branch 'smattr/17FC7676-22B2-48E6-9D6F-0BC12096581A' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 03:08:43 +0000 (03:08 +0000)]
Merge branch 'smattr/17FC7676-22B2-48E6-9D6F-0BC12096581A' into 'main'

remove unused Smyrna icons

See merge request graphviz/graphviz!2537

2 years agoshare/gui: remove duplicate 'zoom.png'
Matthew Fernandez [Wed, 23 Mar 2022 02:42:42 +0000 (19:42 -0700)]
share/gui: remove duplicate 'zoom.png'

2 years agoshare/gui: remove duplicate 'move.png'
Matthew Fernandez [Wed, 23 Mar 2022 02:41:55 +0000 (19:41 -0700)]
share/gui: remove duplicate 'move.png'

2 years agoremove 'rect_select*.png' Smyrna icons
Matthew Fernandez [Wed, 23 Mar 2022 02:32:14 +0000 (19:32 -0700)]
remove 'rect_select*.png' Smyrna icons

These appear to have never been used.

2 years agoremove 'preview.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:29:14 +0000 (19:29 -0700)]
remove 'preview.png' Smyrna icon

This appears to have never been used.

2 years agoshare/gui: remove duplicate pan.png
Matthew Fernandez [Wed, 23 Mar 2022 02:27:31 +0000 (19:27 -0700)]
share/gui: remove duplicate pan.png

2 years agoremove 'node.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:27:04 +0000 (19:27 -0700)]
remove 'node.png' Smyrna icon

This seems to have never been used.

2 years agoremove 'fit.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:22:51 +0000 (19:22 -0700)]
remove 'fit.png' Smyrna icon

The last use of this was removed in 68ba63a7c72e61bc0b2f12db9041f4dde4ab47cf.

2 years agoremove 'fish.PNG' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:19:43 +0000 (19:19 -0700)]
remove 'fish.PNG' Smyrna icon

This seems to have never been used.

2 years agoremove 'edge.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:18:19 +0000 (19:18 -0700)]
remove 'edge.png' Smyrna icon

This seems to have never been used.

2 years agoremove 'ltwopi.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:15:06 +0000 (19:15 -0700)]
remove 'ltwopi.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'lneato.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:13:43 +0000 (19:13 -0700)]
remove 'lneato.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'lfdp.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:12:31 +0000 (19:12 -0700)]
remove 'lfdp.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'ldot.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:09:54 +0000 (19:09 -0700)]
remove 'ldot.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'lcirco.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:08:27 +0000 (19:08 -0700)]
remove 'lcirco.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'glade-3.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:07:01 +0000 (19:07 -0700)]
remove 'glade-3.png' Smyrna icon

This seems to have never been used.

2 years agoremove 'dot.PNG' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:05:38 +0000 (19:05 -0700)]
remove 'dot.PNG' Smyrna icon

This seems to have never been used.

2 years agoremove 'rotate.*' Smyrna icons
Matthew Fernandez [Wed, 23 Mar 2022 01:51:51 +0000 (18:51 -0700)]
remove 'rotate.*' Smyrna icons

The last use of these was removed in f565e185203d287fd659af1f11d83bcf44c351f3.

2 years agoremove 'zoomplus.raw' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:49:17 +0000 (18:49 -0700)]
remove 'zoomplus.raw' Smyrna icon

The last use of this was removed in 9a9cfd4e90775aa14a11a0db6745783f3a59ef56.

2 years agoremove 'zoomminus.raw' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:48:08 +0000 (18:48 -0700)]
remove 'zoomminus.raw' Smyrna icon

The last use of this was removed in 9a9cfd4e90775aa14a11a0db6745783f3a59ef56.

2 years agoremove 'ok*.raw' Smyrna icons
Matthew Fernandez [Wed, 23 Mar 2022 01:46:20 +0000 (18:46 -0700)]
remove 'ok*.raw' Smyrna icons

These seem to have never been used.

2 years agoremove 'select.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:43:20 +0000 (18:43 -0700)]
remove 'select.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'newzoom.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:39:55 +0000 (18:39 -0700)]
remove 'newzoom.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'new_node.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:36:07 +0000 (18:36 -0700)]
remove 'new_node.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'magnifier_zoom_in.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:34:38 +0000 (18:34 -0700)]
remove 'magnifier_zoom_in.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'magnifier.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:33:10 +0000 (18:33 -0700)]
remove 'magnifier.png' Smyrna icon

The last use of this was removed in f565e185203d287fd659af1f11d83bcf44c351f3.

2 years agoremove 'magifier_zoom_out.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:29:22 +0000 (18:29 -0700)]
remove 'magifier_zoom_out.png' Smyrna icon

The last use of this was removed in 1a65f4b82be8bb588edf6895e4712012f1cbe17a.

2 years agoremove 'hourglass.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:27:55 +0000 (18:27 -0700)]
remove 'hourglass.png' Smyrna icon

The last use of this was removed in 1a65f4b82be8bb588edf6895e4712012f1cbe17a.

2 years agoremove 'find_node.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:25:39 +0000 (18:25 -0700)]
remove 'find_node.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'find_edge.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:24:48 +0000 (18:24 -0700)]
remove 'find_edge.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'delete_node.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:23:22 +0000 (18:23 -0700)]
remove 'delete_node.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'deletE_edge.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:22:34 +0000 (18:22 -0700)]
remove 'deletE_edge.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'AntiselectRect' Smyrna icons
Matthew Fernandez [Wed, 23 Mar 2022 01:18:32 +0000 (18:18 -0700)]
remove 'AntiselectRect' Smyrna icons

The last use of these was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoremove 'add_edge.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:16:25 +0000 (18:16 -0700)]
remove 'add_edge.png' Smyrna icon

The last use of this was removed in 1c6ea45d410c76f6b98dc9d33c7f91a6e02f7e7e.

2 years agoMerge branch 'smattr/5B54693E-4A14-4B13-8A39-B13568AEE42D' into 'main'
Matthew Fernandez [Mon, 28 Mar 2022 17:33:02 +0000 (17:33 +0000)]
Merge branch 'smattr/5B54693E-4A14-4B13-8A39-B13568AEE42D' into 'main'

CMake: enable 'diffimg'

Closes #1788

See merge request graphviz/graphviz!2535

2 years agoCMake: enable 'diffimg'
Matthew Fernandez [Sat, 26 Mar 2022 20:39:07 +0000 (13:39 -0700)]
CMake: enable 'diffimg'

Note that the rtest/rtest.py work around is still not fully removed because
libgd is not currently available in the 64-bit Windows CI environment.

Gitlab: closes #1788

2 years agoMerge branch 'smattr/0E5378C5-27A2-4E7A-A4A8-8BC527899AF6' into 'main'
Matthew Fernandez [Sun, 27 Mar 2022 19:40:35 +0000 (19:40 +0000)]
Merge branch 'smattr/0E5378C5-27A2-4E7A-A4A8-8BC527899AF6' into 'main'

smyrna: clean up and warning squashing

See merge request graphviz/graphviz!2533

2 years agocmd/smyrna: remove unused return value from 'close_graph'
Matthew Fernandez [Sun, 27 Mar 2022 18:22:34 +0000 (11:22 -0700)]
cmd/smyrna: remove unused return value from 'close_graph'

2 years agocmd/smyrna/viewport.c: fix -Wnon-literal-null-conversion with Clang
Matthew Fernandez [Sat, 26 Mar 2022 19:46:23 +0000 (12:46 -0700)]
cmd/smyrna/viewport.c: fix -Wnon-literal-null-conversion with Clang

This was causing the CMake build (to be enabled in a future commit) on macOS to
fail.

Gitlab: #1836, #1854

2 years agocmd/smyrna: fix a comment typo
Matthew Fernandez [Sat, 26 Mar 2022 18:08:11 +0000 (11:08 -0700)]
cmd/smyrna: fix a comment typo

2 years agocmd/smyrna: fix -Wnon-literal-null-conversion with Clang
Matthew Fernandez [Sat, 26 Mar 2022 18:07:00 +0000 (11:07 -0700)]
cmd/smyrna: fix -Wnon-literal-null-conversion with Clang

This was causing the CMake build (to be enabled in a future commit) on macOS to
fail.

Gitlab: #1836, #1854

2 years agocmd/smyrna: remove no-op if statement
Matthew Fernandez [Sat, 26 Mar 2022 15:39:20 +0000 (08:39 -0700)]
cmd/smyrna: remove no-op if statement

When enabling Smyrna in the CMake build system, compilation fails with a
-Wempty-body warning about this line. I am guessing that it was intended to not
be a conditional here.

Gitlab: #1836, #1854

2 years agofix: teach Smyrna '-?' on macOS and Windows
Matthew Fernandez [Sat, 26 Mar 2022 15:13:30 +0000 (08:13 -0700)]
fix: teach Smyrna '-?' on macOS and Windows

This is the equivalent of cd80b6262c7e1b95307756f13c89a9f6b2900520 and friends
but for Smyrna. It was not previously detected that this problem also affects
Smyrna because it is not currently built on macOS or Windows in CI. This will be
improved in future.

Gitlab: #1852

2 years agolib/glcomp: fix -Wnon-literal-null-conversion with Clang
Matthew Fernandez [Sat, 26 Mar 2022 00:30:58 +0000 (17:30 -0700)]
lib/glcomp: fix -Wnon-literal-null-conversion with Clang

This was causing the CMake build (to be enabled in a future commit) on macOS to
fail.

Gitlab: #1836, #1854

2 years agolib/glcomp: remove unused 'glCompButton.customptr'
Matthew Fernandez [Sat, 26 Mar 2022 00:28:25 +0000 (17:28 -0700)]
lib/glcomp: remove unused 'glCompButton.customptr'

With Clang on macOS, this causes compiler warnings due to initializing a pointer
with `'\0'`. This fails the CMake build which will be enabled in a future
commit. We could rephrase this, but it is simpler to just remove this unused
member.

Gitlab: #1836, #1854

2 years agosmyrna: remove unnecessary 'gpointer' cast
Matthew Fernandez [Sat, 26 Mar 2022 19:52:56 +0000 (12:52 -0700)]
smyrna: remove unnecessary 'gpointer' cast

`gpointer` is just a typedef for `void*` that implicitly coerces to all other
pointer types.

2 years agosmyrma: remove unnecessary 'gint' cast
Matthew Fernandez [Sat, 26 Mar 2022 19:50:16 +0000 (12:50 -0700)]
smyrma: remove unnecessary 'gint' cast

`G_PRIORITY_DEFAULT` is already a `gint` (typedef for `int`).

2 years agosmyrna: remove use of 'guint' cast
Matthew Fernandez [Sat, 26 Mar 2022 19:48:28 +0000 (12:48 -0700)]
smyrna: remove use of 'guint' cast

`guint` is just a Glib typedef for `unsigned int`. So we can write this simpler.

2 years agoMerge branch 'smattr/1D9B0E32-37CA-4547-A966-AE877344C814' into 'main'
Matthew Fernandez [Sun, 27 Mar 2022 18:12:06 +0000 (18:12 +0000)]
Merge branch 'smattr/1D9B0E32-37CA-4547-A966-AE877344C814' into 'main'

tests: remove unused cdiff.c

See merge request graphviz/graphviz!2532

2 years agotests: remove unused cdiff.c
Matthew Fernandez [Sat, 26 Mar 2022 20:08:17 +0000 (13:08 -0700)]
tests: remove unused cdiff.c

2 years agoMerge branch 'smattr/63D62C3D-D094-4ED8-A675-538D7283B9E6' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 19:58:17 +0000 (19:58 +0000)]
Merge branch 'smattr/63D62C3D-D094-4ED8-A675-538D7283B9E6' into 'main'

use suffixed literals instead of casts to construct 'GLfloat' values

See merge request graphviz/graphviz!2530

2 years agouse suffixed literals instead of casts to construct 'GLfloat' values
Matthew Fernandez [Fri, 25 Mar 2022 05:13:05 +0000 (22:13 -0700)]
use suffixed literals instead of casts to construct 'GLfloat' values

The `GLfloat` type is 32-bit IEEE-754 floating-point.¹ As of C99, the `float`
type is also 32-bit IEEE-754 floating-point on all platforms with support.² In
contemporary usage, this is effectively all C99 platforms that support
floating-point arithmetic. Graphviz has been compiled in C99 mode since commit
fe3f9411d2c59b463ab1b64eecfd19f2db55d2fc. Putting those things together, we can
abbreviate the way we write `GLfloat` literals, leading to more readable code.

¹ https://www.khronos.org/opengl/wiki/OpenGL_Type
² https://en.wikipedia.org/wiki/C99#IEEE_754_floating-point_support

2 years agoMerge branch 'smattr/26236D4A-346B-44B1-ACAB-ED8D7E59E09E' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 18:27:02 +0000 (18:27 +0000)]
Merge branch 'smattr/26236D4A-346B-44B1-ACAB-ED8D7E59E09E' into 'main'

gvc: remove unused unistd.h #include

See merge request graphviz/graphviz!2531

2 years agogvc: remove unused unistd.h #include
Matthew Fernandez [Sat, 26 Mar 2022 03:16:51 +0000 (20:16 -0700)]
gvc: remove unused unistd.h #include

Gitlab: #2204

2 years agoMerge branch 'smattr/9691B69C-F05E-4819-B327-8258BB2B3D23' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 15:45:29 +0000 (15:45 +0000)]
Merge branch 'smattr/9691B69C-F05E-4819-B327-8258BB2B3D23' into 'main'

move XML validation tests into a separate CI job

Closes #2216

See merge request graphviz/graphviz!2527

2 years agomove XML validation tests into a separate CI job
Matthew Fernandez [Wed, 23 Mar 2022 00:42:32 +0000 (17:42 -0700)]
move XML validation tests into a separate CI job

This parametrized test was checking the validity of checked in Graphviz HTML
sources. There is no need to run this identical check in every single CI test
job nor on end users machines where they may have differing versions of
`xmllint` installed.

Gitlab: closes #2216

2 years agoMerge branch 'smattr/A0DB9535-2265-4E6C-9389-16058C1BB35B' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 06:47:53 +0000 (06:47 +0000)]
Merge branch 'smattr/A0DB9535-2265-4E6C-9389-16058C1BB35B' into 'main'

towards enabling Smyrna in CMake

See merge request graphviz/graphviz!2526

2 years agosmyrna Init: squash -Wincompatible-pointer-types
Matthew Fernandez [Mon, 21 Mar 2022 15:09:55 +0000 (08:09 -0700)]
smyrna Init: squash -Wincompatible-pointer-types

OpenGL has an unorthodox API wherein the `gluTessCallback` function’s prototype
indicates it takes a `void(*)(void)`, but its docs¹ explain that the type
actually varies depending on the second argument. As a result, the compiler
(correctly) warns that some of these `gluTessCallback` calls are passing
function pointers that do not have the same ABI. Presumably this works out
because at the end of the day a function pointer is just some bits in C and the
OpenGL implementation branches on the `which` argument and invokes the pointer
correctly. But if OpenGL really wanted to discard type safety this way, it is
not clear to me why they did not make the function pointer argument a `void*`.
Anyway, this commit squashes the compiler warnings which emerge when enabling
this in the CMake build system, failing the build.

Gitlab: related to #1836

¹ This is not the authoritative source, but Microsoft’s docs for their
  implementation provide a good explanation.
  https://docs.microsoft.com/en-us/windows/win32/opengl/glutess

2 years agosmyrna cb_mouseclick: remove unused 'g'
Matthew Fernandez [Mon, 21 Mar 2022 14:57:22 +0000 (07:57 -0700)]
smyrna cb_mouseclick: remove unused 'g'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agosmyrna on_attrAddBtn_clicked: remove unused 'value'
Matthew Fernandez [Mon, 21 Mar 2022 14:49:00 +0000 (07:49 -0700)]
smyrna on_attrAddBtn_clicked: remove unused 'value'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agosmyrna: remove unused 'gvpr_select'
Matthew Fernandez [Mon, 21 Mar 2022 14:33:28 +0000 (07:33 -0700)]
smyrna: remove unused 'gvpr_select'

The last use of this was removed in 7e1f01ad52915498a252dd213f85daf5a058aa5d.
This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836