rpms
/
graphviz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New version 

Resolves: rhbz#1933722
This commit is contained in:
Jaroslav Škarvada 2021-03-02 19:20:03 +01:00
parent aecdcea831
commit 64e0f29620
4 changed files with 7 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
graphviz-2.42.2-coverity-scan-fixes.patch
View File

@ -1,26 +0,0 @@
diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
index cf738c0..65e17e2 100644
--- a/cmd/lefty/dot2l/dotlex.c
+++ b/cmd/lefty/dot2l/dotlex.c
@@ -252,7 +252,7 @@ static char *scan_token (char *p) {
char *q;
q = lexbuf;
- if (p == '\0')
+ if (!p || *p == '\0')
return NULL;
while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
*q++ = *p++;
diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
index c2b166d..c9a51e9 100644
--- a/cmd/tools/gvgen.c
+++ b/cmd/tools/gvgen.c
@@ -453,6 +453,8 @@ closeOpen (void)
fprintf(opts.outfile, "}\ngraph {\n");
}
+extern void makeTetrix(int depth, edgefn ef);
+
int main(int argc, char *argv[])
{
GraphType graphType;

22
graphviz-2.42.2-dotty-menu-fix.patch
View File

@ -1,22 +0,0 @@
diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
index 6fdec8f..270c0c8 100644
--- a/cmd/dotty/dotty_ui.lefty
+++ b/cmd/dotty/dotty_ui.lefty
@@ -351,7 +351,7 @@ dotty.protovt.normal.uifuncs = [
else
gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
};
- 'rightdown' = function (data) {
+ 'rightup' = function (data) {
local vt, gt, menu, i;
vt = dotty.views[data.widget];
@@ -456,7 +456,7 @@ dotty.protovt.birdseye.uifuncs = [
'middledown' = dotty.protovt.normal.uifuncs.middledown;
'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
'middleup' = dotty.protovt.normal.uifuncs.middleup;
- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
+ 'rightup' = dotty.protovt.normal.uifuncs.rightup;
'keyup' = dotty.protovt.normal.uifuncs.keyup;
'redraw' = dotty.protovt.normal.uifuncs.redraw;
'closeview' = dotty.protovt.normal.uifuncs.closeview;

127
graphviz-2.44.0-man-fix.patch
View File

@ -1,127 +0,0 @@
diff --git a/cmd/dot/dot.1 b/cmd/dot/dot.1
index 986b262..e9c56f2 100644
--- a/cmd/dot/dot.1
+++ b/cmd/dot/dot.1
@@ -352,7 +352,7 @@ in the layout.
layout the graph.
.PP
\fBstart=\fIval\fR. Adjusts the random initial placement of nodes
-with no specified position. If \fIval\fP is is an integer,
+with no specified position. If \fIval\fP is an integer,
it is used as the seed for the random number generator.
If \fIval\fP is not an integer, a random system\(hygenerated integer,
such as the process ID or current time, is used as the seed.
@@ -635,6 +635,22 @@ As usual, edge layout is guided by the \fBsplines\fR attribute.
.PP
\fB\-y\fR invert y coordinate in output.
.PP
+\fB\-o\fIfile\fR write output to \fIfile\fP.
+.PP
+\fB\-x\fP reduce graph.
+.PP
+\fB\-Lg\fP don't use grid.
+.PP
+\fB\-LO\fP use old attractive force.
+.PP
+\fB\-Ln\fIi\fR set number of iterations to \fIi\fP.
+.PP
+\fB\-LU\fIi\fR set unscaled factor to \fIi\fP.
+.PP
+\fB\-LC\fIv\fR set overlap expansion factor to \fIv\fP.
+.PP
+\fB\-LT\fR[*]\fIv\fR set temperature (temperature factor) to \fIv\fP.
+.PP
\fB\-V\fP (version) prints version information and exits.
.PP
\fB\-?\fP prints the usage and exits.
diff --git a/cmd/dot/osage.1 b/cmd/dot/osage.1
index 0efbf90..5eded8b 100644
--- a/cmd/dot/osage.1
+++ b/cmd/dot/osage.1
@@ -404,6 +404,22 @@ If \fB\-l\fP is given by itself, the standard library is omitted.
.PP
\fB\-O\fP automatically generate output filenames based on the input filename and the \-T format.
.PP
+\fB\-o\fIfile\fR write output to \fIfile\fP.
+.PP
+\fB\-x\fP reduce graph.
+.PP
+\fB\-Lg\fP don't use grid.
+.PP
+\fB\-LO\fP use old attractive force.
+.PP
+\fB\-Ln\fIi\fR set number of iterations to \fIi\fP.
+.PP
+\fB\-LU\fIi\fR set unscaled factor to \fIi\fP.
+.PP
+\fB\-LC\fIv\fR set overlap expansion factor to \fIv\fP.
+.PP
+\fB\-LT\fR[*]\fIv\fR set temperature (temperature factor) to \fIv\fP.
+.PP
\fB\-v\fP (verbose) prints various information useful for debugging.
.PP
\fB\-V\fP (version) prints version information and exits.
diff --git a/cmd/dot/patchwork.1 b/cmd/dot/patchwork.1
index 7fe68fb..852f516 100644
--- a/cmd/dot/patchwork.1
+++ b/cmd/dot/patchwork.1
@@ -398,6 +398,22 @@ If \fB\-l\fP is given by itself, the standard library is omitted.
.PP
\fB\-O\fP automatically generate output filenames based on the input filename and the \-T format.
.PP
+\fB\-o\fIfile\fR write output to \fIfile\fP.
+.PP
+\fB\-x\fP reduce graph.
+.PP
+\fB\-Lg\fP don't use grid.
+.PP
+\fB\-LO\fP use old attractive force.
+.PP
+\fB\-Ln\fIi\fR set number of iterations to \fIi\fP.
+.PP
+\fB\-LU\fIi\fR set unscaled factor to \fIi\fP.
+.PP
+\fB\-LC\fIv\fR set overlap expansion factor to \fIv\fP.
+.PP
+\fB\-LT\fR[*]\fIv\fR set temperature (temperature factor) to \fIv\fP.
+.PP
\fB\-v\fP (verbose) prints various information useful for debugging.
.PP
\fB\-V\fP (version) prints version information and exits.
diff --git a/cmd/gvmap/cluster.1 b/cmd/gvmap/cluster.1
index 15b0332..188dcd6 100644
--- a/cmd/gvmap/cluster.1
+++ b/cmd/gvmap/cluster.1
@@ -51,6 +51,9 @@ Specifies that output should go into the file \fIoutfile\fP. By default,
.TP
.BI \-v
Verbose mode.
+.TP
+.BI \-?
+Prints the usage and exits.
.SH EXAMPLES
.PP
Applying
diff --git a/cmd/tools/unflatten.1 b/cmd/tools/unflatten.1
index 7857cf0..089496f 100644
--- a/cmd/tools/unflatten.1
+++ b/cmd/tools/unflatten.1
@@ -3,7 +3,7 @@
unflatten \- adjust directed graphs to improve layout aspect ratio
.SH SYNOPSIS
.B unflatten
-[\fB\-f\fR]
+[\fB\-f?\fR]
[\fB\-l\fIlen\fR]
[\fB\-c\fIlen\fR
] [
@@ -41,6 +41,9 @@ Form disconnected nodes into chains of up to \fIlen\fP nodes.
.BI \-o " outfile"
causes the output to be written to the specified file; by default,
output is written to \fBstdout\fP.
+.TP
+.BI \-?
+Prints the usage and exits.
.SH OPERANDS
The following operand is supported:
.TP 8

18
graphviz.spec
View File

@ -59,16 +59,11 @@
Name: graphviz
Summary: Graph Visualization Tools
Version: 2.44.0
Release: 18%{?dist}
Version: 2.46.0
Release: 1%{?dist}
License: EPL-1.0
URL: http://www.graphviz.org/
Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
# rhbz#1505230
Patch0: graphviz-2.42.2-dotty-menu-fix.patch
Patch1: graphviz-2.42.2-coverity-scan-fixes.patch
# rhbz#1612692, https://gitlab.com/graphviz/graphviz/-/merge_requests/1367
Patch2: graphviz-2.44.0-man-fix.patch
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig, sed
BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel
@ -280,10 +275,7 @@ Requires: %{name} = %{version}-%{release}, tcl >= 8.3, tk
Various tcl packages (extensions) for the graphviz tools.
%prep
%setup -q
%patch0 -p1 -b .dotty-menu-fix
%patch1 -p1 -b .coverity-scan-fixes
%patch2 -p1 -b .man-fix
%autosetup -p1
# Attempt to fix rpmlint warnings about executable sources
find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
@ -581,6 +573,10 @@ php --no-php-ini \
%{_mandir}/man3/*.3tcl*
%changelog
* Tue Mar 2 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.46.0-1
- New version
Resolves: rhbz#1933722
* Mon Mar 1 13:11:59 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 2.44.0-18
- OCaml 4.12.0 build