Nehal J Wani [Mon, 2 Jan 2023 14:04:33 +0000 (14:04 +0000)]
CMake: Similar to
3fcf0968, use gdlib.pc if available
The gdlib-config program is no longer installed with the newer versions
of the library as it is deprecated. The CMake build on CI for Fedora
prints the following, which is no longer the case with this patch:
CMake Warning at cmake/FindGD.cmake:63 (message):
gdlib-config not found; skipping feature checks
Call Stack (most recent call first):
contrib/diffimg/CMakeLists.txt:1 (find_package)
xref: https://github.com/libgd/libgd/issues/376#issuecomment-
276138975
Edits from Matthew Fernandez:
- Wrap CMake line
- Adjust #1786 work arounds
Gitlab: #1786
Matthew Fernandez [Fri, 6 Jan 2023 06:33:15 +0000 (06:33 +0000)]
Merge branch 'smattr/
f383f87f-8260-4e85-acfd-
26a2ade8605f' into 'main'
Start 7.0.7 development
See merge request graphviz/graphviz!3041
Matthew Fernandez [Fri, 6 Jan 2023 05:15:36 +0000 (21:15 -0800)]
Start 7.0.7 development
Matthew Fernandez [Fri, 6 Jan 2023 05:13:49 +0000 (05:13 +0000)]
Merge branch 'smattr/
006bd60d-8175-437b-aa06-
b6679d85b958' into 'main'
Stable Release 7.0.6
See merge request graphviz/graphviz!3025
Matthew Fernandez [Fri, 30 Dec 2022 18:54:49 +0000 (10:54 -0800)]
Stable Release 7.0.6
Matthew Fernandez [Thu, 5 Jan 2023 02:50:39 +0000 (02:50 +0000)]
Merge branch 'smattr/gitlab-1131' into 'main'
remove webdot
Closes #1131, #1048, and #934
See merge request graphviz/graphviz!3039
Matthew Fernandez [Thu, 5 Jan 2023 01:18:16 +0000 (17:18 -0800)]
remove webdot
Gitlab: closes #934, closes #1048, closes #1131
Mark Hansen [Tue, 3 Jan 2023 08:55:45 +0000 (08:55 +0000)]
Merge branch 'link-lib' into 'main'
dot_builtins: pass full path to GTS library to clang
Closes #2334
See merge request graphviz/graphviz!3035
Mark Hansen [Mon, 2 Jan 2023 03:10:44 +0000 (14:10 +1100)]
dot_builtins: pass full path to GTS library to clang
Clang was having trouble finding homebrew GTS on my macOS.
This is similar to a series of other changes I made to fix cmake builds
on macOS previously (search the codebase for _LINK_LIBRARIES).
Fixes #2334
Matthew Fernandez [Tue, 3 Jan 2023 05:10:06 +0000 (05:10 +0000)]
Merge branch 'smattr/gitlab-2233' into 'main'
Autotools: look for Qt6 in preference to Qt5
Closes #2233
See merge request graphviz/graphviz!3030
Matthew Fernandez [Sat, 31 Dec 2022 22:12:39 +0000 (14:12 -0800)]
Autotools: look for Qt6 in preference to Qt5
This is the equivalent of
743aed2fea0206827294c9efa6ab117a2ba8dceb, but for the
Autotools build system.
Qt6 no longer ships with pkg-config (.pc) file(s). So we need to do manual
discovery of the necessary information ourselves.
QMake is called `qtmake6` in Qt6 and the `qtmake` that ships with it is a
symlink to the former. So this change preferences Qt6 if both Qt5 and Qt6 are
installed.
Some notable warts:
1. Discovery uses `AC_CHECK_FILE` rather than
`AC_CHECK_HEADER`/`AC_CHECK_HEADERS`. The latter seems to exclusively call
the C compiler rather than the C++ compiler, and thus cannot be used for
C++ header discovery.¹ A consequence of this choice is that discovery
checks existence only, not whether the headers are usable.
2. Library discovery also uses `AC_CHECK_FILE` rather than `AC_CHECK_LIB`.
Given the above restriction, if we cannot call the C++ compiler, there is
little point in attempting a link check. But this does mean that discovery
here also only checks existence, not whether the libraries are usable.
3. There seems to be no pkg-config-like mechanism for discovering that e.g.
Qt6Widgets and Qt6PrintSupport depend on Qt6Gui and thus `-lQt6Gui.so` must
also be included in the link line. Qt6 has migrated to a CMake-based build
system and their answer to most of these such problems appears to be “move
to CMake.”² This change just hard codes the link lines under the assumption
these will be stable across the Qt6 series.
4. Qt6 requires C++17,³ so we need to switch from C++11 to C++17 mode when
`--with-qt=yes`. The CMake discovery apparently does this automatically.
5. The `QT_SELECT` environment variable does nothing in Qt6. The line using it
in cmd/gvedit/Makefile.am has been left unchanged in this commit. When
using Qt5 it still avoids accidentally picking up Qt4 and when using Qt6 it
is a no-op.
Gitlab: closes #2233
¹ If accurate, this would also explain the difficulty I had in
https://gitlab.com/graphviz/graphviz/-/issues/1835#note_794857735.
² https://www.qt.io/blog/qt-6-build-system
https://doc.qt.io/qt-6/qt6-buildsystem.html
³ https://www.qt.io/blog/2019/08/07/technical-vision-qt-6
https://www.qt.io/blog/qt-6.0-released
Matthew Fernandez [Sat, 31 Dec 2022 22:10:50 +0000 (14:10 -0800)]
Autotools: import C++17 macro from Autoconf archive
This commit imports m4/ax_cxx_compile_stdcxx_17.m4 from commit
da89908ef7d82a90fe5dab8904a65869b5a5d996 of
git://git.savannah.gnu.org/autoconf-archive.git. It will be used in an upcoming
change.
Gitlab: #2233
Matthew Fernandez [Tue, 3 Jan 2023 03:47:45 +0000 (03:47 +0000)]
Merge branch 'smattr/
e0f32e40-1fb8-45eb-a7f3-
4f29ff889495' into 'main'
sparse: warning squashing and flag removal
See merge request graphviz/graphviz!3034
Matthew Fernandez [Mon, 2 Jan 2023 00:36:45 +0000 (16:36 -0800)]
sparse modularity_clustering: remove 'use_value' parameter
This is always set to true.
Matthew Fernandez [Mon, 2 Jan 2023 00:34:06 +0000 (16:34 -0800)]
sparse mq_clustering: remove 'use_value' parameter
This is always set to true.
Matthew Fernandez [Mon, 2 Jan 2023 00:32:21 +0000 (16:32 -0800)]
sparse mq_clustering: remove 'inplace' parameter
This is always set to false.
Matthew Fernandez [Mon, 2 Jan 2023 00:30:59 +0000 (16:30 -0800)]
sparse mq_clustering: remove 'flag' parameter
This is always set to 0.
Matthew Fernandez [Mon, 2 Jan 2023 00:28:09 +0000 (16:28 -0800)]
sparse hierachical_mq_clustering: remove 'flag' parameter
This is always set to 0.
Matthew Fernandez [Mon, 2 Jan 2023 00:25:16 +0000 (16:25 -0800)]
sparse modularity_clustering: remove 'flag' parameter
This is always set to 0.
Matthew Fernandez [Mon, 2 Jan 2023 00:20:38 +0000 (16:20 -0800)]
sparse hierachical_modularity_clustering: remove 'flag' parameter
This is always set to 0.
Matthew Fernandez [Mon, 2 Jan 2023 00:19:26 +0000 (16:19 -0800)]
sparse Multilevel_Modularity_Clustering_establi: remove unhelpful comment
Matthew Fernandez [Mon, 2 Jan 2023 00:19:12 +0000 (16:19 -0800)]
sparse: remove unnecessary casts
Matthew Fernandez [Mon, 2 Jan 2023 00:18:58 +0000 (16:18 -0800)]
sparse: remove unnecessary parens
Matthew Fernandez [Mon, 2 Jan 2023 00:14:33 +0000 (16:14 -0800)]
sparse Multilevel_Modularity_Clustering_init: rephrase 'deg_total' clamping
Squashes a -Wfloat-equal warning.
Matthew Fernandez [Mon, 2 Jan 2023 00:12:59 +0000 (16:12 -0800)]
sparse Multilevel_Modularity_Clustering_init: remove shadowing of 'n'
This variable shadowed an `n` from the outer scope with an identical value.
Matthew Fernandez [Tue, 3 Jan 2023 02:50:26 +0000 (02:50 +0000)]
Merge branch 'smattr/
8d876879-1a00-4159-89fd-
5b42fa0e5243' into 'main'
sparse: squash a couple of compiler warnings
See merge request graphviz/graphviz!3032
Matthew Fernandez [Sun, 1 Jan 2023 22:17:58 +0000 (14:17 -0800)]
sparse: remove shadowing of 'point' global
Matthew Fernandez [Sun, 1 Jan 2023 22:10:31 +0000 (14:10 -0800)]
sparse: use an 'int' for 'id' field in node data
Making this a `double` seems to have been a mistake. Only `int` values are ever
stored into this field and it is only ever compared against `int` values.
Matthew Fernandez [Tue, 3 Jan 2023 01:52:27 +0000 (01:52 +0000)]
Merge branch 'smattr/gitlab-1835' into 'main'
Autotools: discover libANN manually if ann.pc is missing
Closes #1835
See merge request graphviz/graphviz!3037
Matthew Fernandez [Mon, 2 Jan 2023 17:24:43 +0000 (09:24 -0800)]
Autotools: discover libANN manually if ann.pc is missing
On Debian and Debian derivatives (e.g. Ubuntu) the libann and libann-dev
packages ship without an ann.pc file to support `pkg-config`. As a result of
this, `pkg-config` cannot find libANN and concludes it is not installed.
This change teaches the Autotools build system how to discover libANN manually
if the `pkg-config` technique fails. Note that we need to use `AC_CHECK_FILE`
instead of `AC_CHECK_HEADER` because libANN is in C++.
Gitlab: closes #1835
Matthew Fernandez [Mon, 2 Jan 2023 17:40:33 +0000 (09:40 -0800)]
lib/mingle: fix: rename 'DEBUG' to 'MINGLE_DEBUG'
When compiling Graphviz in debug mode (`-DDEBUG`) with libANN, this code causes
syntactic errors due to it using `DEBUG` itself.
Matthew Fernandez [Sun, 1 Jan 2023 18:34:20 +0000 (18:34 +0000)]
Merge branch 'smattr/
997bc5ba-8507-4ac3-a496-
eb9a2d0b2691' into 'main'
increase stack size on non-Linux platforms to 32MB
Closes #1710
See merge request graphviz/graphviz!3031
Matthew Fernandez [Sun, 1 Jan 2023 02:22:43 +0000 (18:22 -0800)]
increase stack size on macOS to 32MB
Similar to the prior situation with Windows platforms, the CMake build on macOS
was failing the long chain test due to insufficient stack reservation. This
change applies the same increase there. Note that there is no need to adjust the
Autotools build, which seems to handle this test case fine on all platforms.
Gitlab: closes #1710
Matthew Fernandez [Sun, 1 Jan 2023 02:18:31 +0000 (18:18 -0800)]
increase stack size on Windows to 32MB
This repairs the long chain test after it was previously inadvertently broken.
Technically going to 32MB is not necessary on all platforms; in release mode,
the MS Build built Graphviz can handle this example with only a 16MB stack. But
it seems simpler to uniformly go to 32MB on all Windows platforms. In a 64-bit
address space, 32MB is trivial and we could even adjust this limit higher in
future. Note that this is the reserved size, not the committed size.
Gitlab: #1710
Matthew Fernandez [Sun, 1 Jan 2023 01:29:42 +0000 (01:29 +0000)]
Merge branch 'smattr/
882be40c-6089-424b-99e1-
80cdc36ae886' into 'main'
circogen, fdpgen: warning squashing and fix a memory leak
See merge request graphviz/graphviz!3020
Matthew Fernandez [Fri, 18 Nov 2022 01:14:41 +0000 (17:14 -0800)]
fdpgen mkClusters: use cgraph wrappers for allocation
The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
Matthew Fernandez [Fri, 18 Nov 2022 01:14:41 +0000 (17:14 -0800)]
fdpgen deriveGraph: use cgraph wrapper for allocation
The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
Matthew Fernandez [Wed, 28 Dec 2022 23:17:03 +0000 (15:17 -0800)]
fdpgen: remove unnecessary parens
Matthew Fernandez [Wed, 28 Dec 2022 23:14:00 +0000 (15:14 -0800)]
fdpgen: remove 'K2' parameter
Without tracing the code, it was challenging to see that `K2` was always being
set consistently to evaluate to `K * K`. We can remove this complexity by
simply removing the parameter entirely and computing it on-demand.
Matthew Fernandez [Wed, 28 Dec 2022 23:12:48 +0000 (15:12 -0800)]
fdpgen: remove 'Ht2' parameter
Without tracing the code, it was challenging to see that `Ht2` was always being
set consistently to evaluate to `Ht * Ht`. We can remove this complexity by
simply removing the parameter entirely and computing it on-demand.
Matthew Fernandez [Wed, 28 Dec 2022 23:11:43 +0000 (15:11 -0800)]
fdpgen: remove 'Wd2' parameter
Without tracing the code, it was challenging to see that `Wd2` was always being
set consistently to evaluate to `Wd * Wd`. We can remove this complexity by
simply removing the parameter entirely and computing it on-demand.
Matthew Fernandez [Wed, 28 Dec 2022 23:08:00 +0000 (15:08 -0800)]
fdpgen: remove 'Cell2' parameter
This parameter was only being set conditionally, based on whether `useGrid` was
set, making it look as if the incorrect default value of `0` was being used in
some cases. By tracing the code, it was possible to see the only usage of
`T_Cell2` was under exactly the same conditions as which it was set, making the
use safe. We can remove this complexity by simply removing the parameter
entirely and computing it on-demand.
Matthew Fernandez [Wed, 28 Dec 2022 23:03:47 +0000 (15:03 -0800)]
fdpgen: replace inline object list with generic list
Matthew Fernandez [Wed, 28 Dec 2022 22:45:30 +0000 (14:45 -0800)]
fdpgen compoundEdges: fix memory leak
When hitting either of the error conditions in the loop, the next iteration
would be begun without clearing or freeing the object list. The next call to
`objectList` would overwrite the still-allocated previous object list and it
would be lost.
Matthew Fernandez [Fri, 18 Nov 2022 01:14:41 +0000 (17:14 -0800)]
circogen circomps: use cgraph wrapper for allocation
The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
Matthew Fernandez [Wed, 28 Dec 2022 22:17:43 +0000 (14:17 -0800)]
circogen prGraph: remove unnecessary casts
These casts were also unsafe in that they were casting pointers into a type that
is smaller on, e.g. x86-64, and would truncate the pointer.
Matthew Fernandez [Wed, 28 Dec 2022 22:17:34 +0000 (14:17 -0800)]
circogen: remove unnecessary parens
Matthew Fernandez [Wed, 28 Dec 2022 22:02:58 +0000 (14:02 -0800)]
circogen: fix -Wmissing-prototypes warnings for 'circPos'
Matthew Fernandez [Wed, 28 Dec 2022 22:01:26 +0000 (14:01 -0800)]
circogen position: use a more appropriate type for 'childCount'
Squashes a -Wsign-conversion warning.
Matthew Fernandez [Wed, 28 Dec 2022 22:00:14 +0000 (14:00 -0800)]
circogen position: remove shadowing of 'path' global
Matthew Fernandez [Wed, 28 Dec 2022 21:58:48 +0000 (13:58 -0800)]
circogen find_longest_path: remove shadowing of 'path' global
Matthew Fernandez [Sun, 1 Jan 2023 00:24:22 +0000 (00:24 +0000)]
Merge branch 'smattr/
ade039bf-94f1-4769-a861-
2f41b42a7b9d' into 'main'
misc warning squashing
See merge request graphviz/graphviz!3018
Matthew Fernandez [Mon, 26 Dec 2022 21:56:56 +0000 (13:56 -0800)]
expr print: squash a -Wconversion warning
`integer` is known to fit into an `int` here.
Matthew Fernandez [Mon, 26 Dec 2022 21:51:08 +0000 (13:51 -0800)]
sparse QuadTree_get_nearest_internal: remove shadowing of 'point' global
Matthew Fernandez [Mon, 26 Dec 2022 21:49:58 +0000 (13:49 -0800)]
sparse QuadTree_get_nearest_internal: fix comment typo
The use of “years” in this comment does not make sense to me, so the comment
still seems faulty, but this is at least an improvement.
Matthew Fernandez [Mon, 26 Dec 2022 21:45:48 +0000 (13:45 -0800)]
sparse QuadTree_new_from_point_list: rephrase conditional assignment as 'fmax'
Avoids a -Wfloat-equal warning.
Matthew Fernandez [Mon, 26 Dec 2022 21:43:18 +0000 (13:43 -0800)]
sparse Multilevel_MQ_Clustering: remove duplicate 'n'
This variable was shadowing another `n` in the outer scope with the same value.
Matthew Fernandez [Mon, 26 Dec 2022 21:37:33 +0000 (13:37 -0800)]
ortho traverse_polygon: squash two -Wsign-conversion warnings
`trnum` is known positive here.
Matthew Fernandez [Mon, 26 Dec 2022 21:35:34 +0000 (13:35 -0800)]
ortho emitGraph: do float rounding in 'fprintf'
Squashes four -Wfloat-conversion warnings.
Matthew Fernandez [Mon, 26 Dec 2022 21:19:16 +0000 (13:19 -0800)]
ortho: clang-format partition.h
Matthew Fernandez [Mon, 26 Dec 2022 21:18:48 +0000 (13:18 -0800)]
ortho: track number of rectangles as a 'size_t'
Squashes a -Wconversion warning.
Matthew Fernandez [Mon, 26 Dec 2022 21:09:47 +0000 (13:09 -0800)]
common: replace 'boxfof' with C99 initialization
Matthew Fernandez [Mon, 26 Dec 2022 21:06:34 +0000 (13:06 -0800)]
common: remove unused 'boxof'
Matthew Fernandez [Mon, 26 Dec 2022 21:01:00 +0000 (13:01 -0800)]
ast: use an int for 'groups'
Squashes five -Wconversion warnings.
Matthew Fernandez [Sat, 31 Dec 2022 23:18:46 +0000 (23:18 +0000)]
Merge branch 'smattr/
4ebb6901-a023-458e-a247-
b50a40ca5622' into 'main'
common: some warning squashing
See merge request graphviz/graphviz!3019
Matthew Fernandez [Wed, 28 Dec 2022 18:10:03 +0000 (10:10 -0800)]
common writenodeandport: remove shadowing of 'port' global
Matthew Fernandez [Wed, 28 Dec 2022 18:09:05 +0000 (10:09 -0800)]
common agputc: squash -Wconversion warning
Matthew Fernandez [Wed, 28 Dec 2022 18:07:02 +0000 (10:07 -0800)]
common attach_attrs_and_arrows: remove shadowing of 'i'
Matthew Fernandez [Wed, 28 Dec 2022 17:56:52 +0000 (09:56 -0800)]
common attach_attrs_and_arrows: use 'agxbprint' to simplify some code
This is similar to
bb80d536e9cfdd4680254d9e91511b224a143eb4.
Matthew Fernandez [Wed, 28 Dec 2022 17:56:52 +0000 (09:56 -0800)]
common set_record_rects: use 'agxbprint' to simplify some code
This is similar to
bb80d536e9cfdd4680254d9e91511b224a143eb4.
Matthew Fernandez [Sat, 31 Dec 2022 22:29:04 +0000 (22:29 +0000)]
Merge branch 'smattr/
b4703bf7-d781-48d4-bac0-
726026a5e221' into 'main'
slightly accelerate circo
See merge request graphviz/graphviz!3014
Matthew Fernandez [Sun, 25 Dec 2022 22:49:52 +0000 (14:49 -0800)]
circogen: replace CDT 'deglist' with a generic list
Apart from de-duplicating some code, this has the following notable effects:
1. The list of nodes is now stored as a contiguous array rather than a linked
list, improving performance characteristics.
2. The list no longer stores degrees, only node pointers. While the code using
this list does modify node degrees, it does not seem to modify the degree
of any node while it is present in the list. So looking up a node’s degree
through the node itself saves some memory overhead.
3. Nodes are inserted into the list and _then_ the list is sorted, rather than
maintaining an always-sorted list. This is a slight performance
improvement.
4. The list is sorted by degree _descending_ now instead of ascending. This
enables operating on the list as a stack, making the pop operation more
efficient.
Using `circo -Tsvg -o /dev/null swedish-flag.dot` on the example attached to
#1718, we have the following:
┌──────┬───────────────┬───────────────┬──────┐
│ │ before │ after │ diff │
╞══════╪═══════════════╪═══════════════╪══════╡
│ 1718 │ 3m34s │ 3m27s │ -3% │
│ │ 18MB peak RSS │ 18MB peak RSS │ -0% │
└──────┴───────────────┴───────────────┴──────┘
Matthew Fernandez [Sun, 25 Dec 2022 22:22:38 +0000 (14:22 -0800)]
cgraph: add remove-by-value functionality to the generic list
Note that this assumes elements can be compared using `memcmp` which is not true
for most aggregates. It is the responsibility of the caller to avoid using this
with types that cannot be compared in this way.
Matthew Fernandez [Sun, 25 Dec 2022 21:53:03 +0000 (13:53 -0800)]
cgraph: add sorting functionality to the generic list
Note that this implementation needed to guard the call to `qsort` with a check
that the list is non-empty. UBSan considers passing `NULL` as the first
parameter to `qsort` undefined behavior, even when `nmemb` is 0. I do not know
why this is. I cannot find any text in `qsort` references or ISO C99 to justify
this. But it is simple enough to avoid.
Similarly, passing 0 as `size` causes out-of-bounds accesses in Glibc’s `qsort`.
It is possible there is some text in ISO C99 regarding sizes that indirectly
implies this value must be non-zero. For this implementation, we rely on this
macro never being instantiated with a 0-sized type. It is possible 0-sized types
themselves are impossible without C++’s Empty Base Optimization. I only stumbled
across this quirk of `qsort` by accidentally swapping the `size` and `nmemb`
parameters.
Matthew Fernandez [Sat, 31 Dec 2022 20:43:25 +0000 (20:43 +0000)]
Merge branch 'smattr/
a6d4ce20-5174-4877-9f60-
60bd1cdf0829' into 'main'
sfdpgen: remove dead code
See merge request graphviz/graphviz!3026
Matthew Fernandez [Fri, 30 Dec 2022 18:16:39 +0000 (10:16 -0800)]
sfdpgen prolongate: remove unhelpful comment
Matthew Fernandez [Fri, 30 Dec 2022 18:10:38 +0000 (10:10 -0800)]
sfdpgen: remove 'coarsen_scheme_used' option that is always set the same
Matthew Fernandez [Fri, 30 Dec 2022 18:00:14 +0000 (10:00 -0800)]
sfdpgen: remove 'coarsen_mode' option that is always set the same
Matthew Fernandez [Fri, 30 Dec 2022 17:56:59 +0000 (09:56 -0800)]
sparse: remove no longer used doubly linked list implementation
Matthew Fernandez [Fri, 30 Dec 2022 17:47:52 +0000 (09:47 -0800)]
sfdpgen: remove 'MAX_IND_VTX_SET_*' constants
The last use of these was removed in
df4f59e20e2de38b47aa58571750df4bfcc1cc13.
Matthew Fernandez [Fri, 30 Dec 2022 17:44:06 +0000 (09:44 -0800)]
sfdpgen: remove 'PriorityQueue' code
The last use of this was removed in
d42aea4877c8ff9ea0d1cc4f23b45f2d1b958622.
Matthew Fernandez [Sat, 31 Dec 2022 18:10:37 +0000 (18:10 +0000)]
Merge branch 'smattr/gitlab-2233' into 'main'
CMake: look for and use Qt6 in preference to Qt5
See merge request graphviz/graphviz!3027
Matthew Fernandez [Sat, 31 Dec 2022 00:23:31 +0000 (16:23 -0800)]
CMake: look for and use Qt6 in preference to Qt5
Gitlab: #2233
Matthew Fernandez [Sat, 31 Dec 2022 00:20:20 +0000 (16:20 -0800)]
gvedit MdiChild::saveFile: disable explicit UTF-8 saving with Qt ≥ 6
From Qt6 onwards, `QTextStream` is in UTF-8 by default:¹
By default, QStringConverter::Utf8 is used, and automatic unicode detection
is enabled.
Gitlab: #2233
¹ https://doc.qt.io/qt-6.2/qtextstream.html#setEncoding
Matthew Fernandez [Sat, 31 Dec 2022 00:11:17 +0000 (16:11 -0800)]
gvedit CMainWindow::actions: use '|' instead of '+' to combine QKeyCombinations
`operator+` is deprecated on this type in Qt6 and produces a warning.
`operator|` works in both Qt5 and Qt6.
Gitlab: #2233
Matthew Fernandez [Sat, 31 Dec 2022 17:23:11 +0000 (17:23 +0000)]
Merge branch 'smattr/
0c9a1cb2-b3b4-4876-9d37-
15e27a83c8c7' into 'main'
sparse: some cgraph allocation wrapper migration, removing unnecessary casts
See merge request graphviz/graphviz!3023
Matthew Fernandez [Fri, 18 Nov 2022 01:14:41 +0000 (17:14 -0800)]
sparse get_or_alloc_force_qt: use cgraph wrapper for allocation
The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
Matthew Fernandez [Thu, 29 Dec 2022 21:47:09 +0000 (13:47 -0800)]
sparse get_or_alloc_force_qt: remove unnecessary casts
Matthew Fernandez [Thu, 29 Dec 2022 21:46:37 +0000 (13:46 -0800)]
sparse get_or_assign_node_force: remove unnecessary casts
Matthew Fernandez [Fri, 18 Nov 2022 01:14:41 +0000 (17:14 -0800)]
sparse DoubleLinkedList_new: use cgraph wrapper for allocation
The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
Matthew Fernandez [Thu, 29 Dec 2022 21:43:25 +0000 (13:43 -0800)]
sparse SingleLinkedList_prepend_int: remove unnecessary cast
Matthew Fernandez [Thu, 29 Dec 2022 21:43:15 +0000 (13:43 -0800)]
sparse SingleLinkedList_prepend_int: fix unchecked allocation failure
Matthew Fernandez [Thu, 29 Dec 2022 21:42:15 +0000 (13:42 -0800)]
sparse SingleLinkedList_new_int: remove unnecessary cast
Matthew Fernandez [Thu, 29 Dec 2022 21:42:03 +0000 (13:42 -0800)]
sparse SingleLinkedList_new_int: fix unchecked allocation failure
Matthew Fernandez [Fri, 18 Nov 2022 01:14:41 +0000 (17:14 -0800)]
sparse SingleLinkedList_new: use cgraph wrapper for allocation
The lib/cgraph/alloc.h wrappers are similar to the older lib/common/memory.h
wrappers except (1) they are header-only and (2) they live in a directory
(cgraph) that is at the root of the dependency tree. The long term plan is to
replace all use of lib/common/memory.h with lib/cgraph/alloc.h.
Matthew Fernandez [Fri, 30 Dec 2022 18:25:37 +0000 (18:25 +0000)]
Merge branch 'smattr/gitlab-2332' into 'main'
Autotools: remove legacy `python` discovery
See merge request graphviz/graphviz!3022
Matthew Fernandez [Thu, 29 Dec 2022 21:16:01 +0000 (13:16 -0800)]
Autotools: remove legacy `python` discovery
When removing Python 2 support, the discovery paths that checked for the Python
interpreter as `python` were retained to support older distros in the Red Hat
ecosystem where Python 3 goes by the name `python`. All currently supported
distros use the name `python3`, so this code is no longer needed.
Gitlab: related to #2332
Matthew Fernandez [Fri, 30 Dec 2022 07:36:19 +0000 (07:36 +0000)]
Merge branch 'smattr/
baf8fad8-8d84-44e2-8ff6-
1ac1ee98a0e2' into 'main'
sfdpgen: remove unused control options
See merge request graphviz/graphviz!3021
Matthew Fernandez [Thu, 29 Dec 2022 20:03:06 +0000 (12:03 -0800)]
sfdpgen: remove unused 'maximal_independent_vertex_set'
Matthew Fernandez [Thu, 29 Dec 2022 20:01:09 +0000 (12:01 -0800)]
sfdpgen: remove unused 'maximal_independent_vertex_set_RS'