pool/graphviz
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 2.36,0:

Browse Source 
(graphviz tracker lives at http://www.graphviz.org/mantisbt/my_view_page.php)
  Fixed bugs:
  * The xdot pad attribute is documented to have a default value of
    0.0555 (inches, equals 0002091:0000004 points).  However when no
    pad attribute was specified, xdot output behaved as though the
    default was 0 (graphviz tracker 2372).
  * Graphviz gave incorrect svg when labels contained HTML entities
    (graphviz tracker 2384).
  * Building gvedit failed with undefined references (graphviz
    tracker 2388).
  * Document that edge[style=tapered] does not support colorList and
    that edge[style=tapered] does not work with arrowType:none
    (graphviz tracker 2391).
  * Use a stronger test for orthogonal routing and, if it fails, revert
    to line segments for edges (graphviz tracker 2393).
  * Fix xdot background polygon coordinates being "nan" with no nodes
    (graphviz tracker 2393).
  * Circo couldn't rescale a graph using the mindist attribute
    (graphviz tracker 2395).
  - Remove old libgraph sources from distributions.
  - Move master git repo to github.com
  September 15, 2013
  - Add <S> element for strike-through to HTML-like labels.

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=82
This commit is contained in:
Philipp Thomas 2014-02-04 15:36:09 +00:00 committed by Git OBS Bridge
parent bfd546f3b3
commit 7e2a617a8f
10 changed files with 39 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphviz-2.34.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764
size 23921350

3
graphviz-2.36.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361
size 23846318

13
graphviz-fix-includes.patch
View File

@ -1,13 +0,0 @@
Index: lib/common/types.h.in
===================================================================
--- lib/common/types.h.in.orig 2013-09-07 03:11:41.000000000 +0200
+++ lib/common/types.h.in 2013-12-11 17:12:07.000000000 +0100
@@ -46,7 +46,7 @@ extern "C" {
typedef int (*bsearch_cmpf) (const void *, const void *);
#ifdef WITH_CGRAPH
-#include <cgraph.h>
+#include "cgraph.h"
typedef struct Agraph_s graph_t;
typedef struct Agnode_s node_t;
typedef struct Agedge_s edge_t;

67
graphviz-getaddrinfo.patch
View File

@ -1,67 +0,0 @@
---
cmd/lefty/os/unix/io.c | 43 +++++++++++++++++++++++++++++++------------
1 file changed, 31 insertions(+), 12 deletions(-)
Index: cmd/lefty/os/unix/io.c
===================================================================
--- cmd/lefty/os/unix/io.c.orig 2013-09-07 03:07:52.000000000 +0200
+++ cmd/lefty/os/unix/io.c 2013-10-29 18:18:55.989590810 +0100
@@ -285,27 +285,46 @@ int IOwriteline (int ioi, char *bufp) {
static FILE *serverconnect (char *name) {
char *host, *portp, buf[1024];
- int port;
- struct hostent *hp;
- struct sockaddr_in sin;
int cfd;
+ struct addrinfo hints;
+ struct addrinfo *result, *rp;
+
+ memset(&hints, 0, sizeof(struct addrinfo));
+
+ hints.ai_family = AF_UNSPEC; /* Allow IPv4 or IPv6 */
+ hints.ai_socktype = SOCK_STREAM;/* Stream socket */
+ hints.ai_flags = AI_PASSIVE; /* For wildcard IP address */
+ hints.ai_protocol = 0; /* Any protocol */
+ hints.ai_canonname = NULL;
+ hints.ai_addr = NULL;
+ hints.ai_next = NULL;
strcpy (buf, name);
host = buf + 9;
portp = strchr (host, '/');
+
if (*host == 0 || !portp)
return NULL;
- *portp++ = 0, port = atoi (portp);
- if (!(hp = gethostbyname (host)))
- return NULL;
- memset ((char *) &sin, 1, sizeof (sin));
- memcpy ((char *) &sin.sin_addr, hp->h_addr, hp->h_length);
- sin.sin_family = hp->h_addrtype;
- sin.sin_port = htons (port);
- if ((cfd = socket (hp->h_addrtype, SOCK_STREAM, 0)) < 0)
+
+ *portp++ = 0;
+
+ if (!(cfd = getaddrinfo(host, portp, &hints, &result)))
return NULL;
- if (connect (cfd, (struct sockaddr *) &sin, sizeof (sin)) < 0)
+
+ for (rp = result; rp != NULL; rp = rp->ai_next) {
+ cfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+
+ if (cfd == -1)
+ continue;
+ if (connect(cfd, rp->ai_addr, rp->ai_addrlen) != -1)
+ break; /* Success */
+ }
+
+ freeaddrinfo(result);
+
+ if (cfd < 0 || rp == NULL)
return NULL;
+
return fdopen (cfd, "w+");
}

3
graphviz-gvedit.spec
View File

@ -19,7 +19,7 @@
%define mname graphviz
Name: graphviz-gvedit
Version: 2.34.0
Version: 2.36.0
Release: 0
Summary: Graph editor based on Qt
License: IPL-1.0
@ -30,7 +30,6 @@ Source2: graphviz-rpmlintrc
Patch2: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
Patch3: graphviz-no_strict_aliasing.patch
Patch4: graphviz-python3_version.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison

5
graphviz-plugins.spec
View File

@ -85,7 +85,7 @@ BuildRequires: pkgconfig(pango)
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Version: 2.34.0
Version: 2.36.0
Release: 0
Summary: Graph Visualization Tools
License: IPL-1.0
@ -94,8 +94,6 @@ Url: http://www.graphviz.org/
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
Patch3: graphviz-no_strict_aliasing.patch
#PATCH-FIX-UPSTREAM print can only be called as function in python3
Patch4: graphviz-python3_version.patch
#Patches from 100 up are for graphviz-plugin only
Patch100: graphviz-plugins-fix_install_dirs.patch
Patch102: graphviz-plugins-tcl_install_dir.patch
@ -269,7 +267,6 @@ Provides some additional PDF and HTML documentation for graphviz.
%prep
%setup -q -n %{mname}-%{version}
%patch3
%patch4 -p1
%patch100
%patch102
%patch103

19
graphviz-python3_version.patch
View File

@ -1,19 +0,0 @@
Bracketing sys.version_info is wrong and print is only a function im python 3.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: graphviz-2.34.0/configure.ac
===================================================================
--- graphviz-2.34.0.orig/configure.ac 2013-09-07 03:07:52.000000000 +0200
+++ graphviz-2.34.0/configure.ac 2013-09-12 16:25:48.006562980 +0200
@@ -1143,7 +1143,7 @@ else
if test "x$PYTHON" = "x"; then
use_python="No (python not available)"
else
- PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"`
+ PYTHON_VERSION=`$PYTHON -c "import sys; print('%d.%d' % sys.version_info[[0:2]])"`
if test "x$PYTHON_VERSION" = "x"; then
PYTHON=
else

4
graphviz-smyrna.spec
View File

@ -19,7 +19,7 @@
%define mname graphviz
Name: graphviz-smyrna
Version: 2.34.0
Version: 2.36.0
Release: 0
Summary: Glut based graph viewer
License: IPL-1.0
@ -30,7 +30,6 @@ Source2: graphviz-rpmlintrc
Patch2: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
Patch3: graphviz-no_strict_aliasing.patch
Patch4: graphviz-python3_version.patch
#PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
Patch10: graphviz-smyrna-link_against_glu.patch
BuildRequires: autoconf
@ -78,7 +77,6 @@ package.
%setup -q -n %{mname}-%{version}
%patch2
%patch3
%patch4 -p1
%patch10
rm -f contrib/gprof2dot.awk

30
graphviz.changes
View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Tue Feb 4 15:52:00 CET 2014 - pth@suse.de
- Update to 2.36,0:
(graphviz tracker lives at http://www.graphviz.org/mantisbt/my_view_page.php)
Fixed bugs:
* The xdot pad attribute is documented to have a default value of
0.0555 (inches, equals 0002091:0000004 points). However when no
pad attribute was specified, xdot output behaved as though the
default was 0 (graphviz tracker 2372).
* Graphviz gave incorrect svg when labels contained HTML entities
(graphviz tracker 2384).
* Building gvedit failed with undefined references (graphviz
tracker 2388).
* Document that edge[style=tapered] does not support colorList and
that edge[style=tapered] does not work with arrowType:none
(graphviz tracker 2391).
* Use a stronger test for orthogonal routing and, if it fails, revert
to line segments for edges (graphviz tracker 2393).
* Fix xdot background polygon coordinates being "nan" with no nodes
(graphviz tracker 2393).
* Circo couldn't rescale a graph using the mindist attribute
(graphviz tracker 2395).
- Remove old libgraph sources from distributions.
- Move master git repo to github.com
September 15, 2013
- Add <S> element for strike-through to HTML-like labels.
-------------------------------------------------------------------
Tue Feb 4 13:19:20 CET 2014 - pth@suse.de

17
graphviz.spec
View File

@ -20,7 +20,7 @@
%define config_file config6
Name: graphviz
Version: 2.34.0
Version: 2.36.0
Release: 0
Summary: Graph Visualization Tools
License: EPL-1.0
@ -31,15 +31,6 @@ Source2: graphviz-rpmlintrc
Patch2: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
Patch3: graphviz-no_strict_aliasing.patch
#PATCH-FIX-UPSTREAM print can only be called as function in python3
Patch4: graphviz-python3_version.patch
#PATCH-FIX-UPSTREAM Use getaddrinfo instead of gethostbyname
# This got accepted upstream so it can be removed on the next
# release.
Patch5: graphviz-getaddrinfo.patch
#PATCH-FIX-UPSTREAM This is fixed upstream in a similar way, can be
# removed update to next release
Patch6: graphviz-fix-includes.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -98,9 +89,6 @@ Note: If you need output in png format you also need to install
%setup -q
%patch2
%patch3
%patch4 -p1
%patch5
%patch6
rm -f contrib/gprof2dot.awk
# Fix path in generated man pages
@ -186,7 +174,6 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%files
%defattr(-,root,root)
%doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog
#%%attr(755,root,root) %{_bindir}/*
%{_bindir}/acyclic
%{_bindir}/bcomps
%{_bindir}/ccomps
@ -258,6 +245,8 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
%{_datadir}/%{name}/gvpr/span
%{_datadir}/%{name}/gvpr/topon
%{_datadir}/%{name}/gvpr/treetoclust
%{_datadir}/%{name}/gvpr/chkclusters
%{_datadir}/%{name}/gvpr/cycle
%doc %{_mandir}/man1/*.1*
%doc %{_mandir}/man7/*.7*