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

- Update to 2.34.0 (see changes for graphviz),

Browse Source 
- Remove patches accepted upstream:
  graphviz-missing_headers.patch, graphviz-aarch64_lib64_support.patch,
  graphviz-type_punning.patch, graphviz-buffer_overflow.patch,
  graphviz-proper_prototypes.patch, graphviz-python_version.patch,
  graphviz-guile.patch, graphviz-java_in_lib64.patch

- Update to 2.34.0:
  - Resolved bugs: 
    * graphviz will hangs if only one point and attribute given (gvz#2326)
    * Inconsistent text position in xdot with HTML-like label (gvz#2333)
    * Graphviz createsedges not asked for, with rank=same (gvz#2334)
    * Graph padding rectangle too big (gvz#2337)
    * labelloc has no effect for HTML-like labels with formatting (gvz#2338)
    * Global search and replace operation in the documentation seems to 
      have gone awry (gvz#2340)
    * Rotated graph not quite centered (gvz#2343)
    * When arrowType is list and contains none all subsequent
      arrowTypes are dropped (gvz#2345)
    * arrowType none when included as a multiple arrowtype fails to
      render empty space (gvz#2346)
    * Buffer overflow in lib/common/shapes.c(round_corners) (gvz#2349).
    * Add aarch64 to the architectures using lib64 (gvz#2350)
    * Ask guile-config for includes and libraries (gvz#2351).
    * If string.h present, don't declare memcmp and strcmp (gvz#2352).
    * Include ast_common.h in cdt sources (gvz#2353)
    * Alternative way to get python's version (gvz#2354)
    * Unportable test(1) construct in configure script (gvz#2357)
    * Use parantheses around qw() call in loop (gvz#2359)
    * Saving in Vimdot can crash the graphical window (rh#847458).

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=61
This commit is contained in:
Philipp Thomas 2013-09-09 13:44:08 +00:00 committed by Git OBS Bridge
parent da0ecc79a3
commit d4c84f6c61
15 changed files with 68 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphviz-2.32.0.tar.gz
View File

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

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

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

11
graphviz-aarch64_lib64_support.patch
View File

@ -1,11 +0,0 @@
--- configure.ac
+++ configure.ac
@@ -100,7 +100,7 @@
case "${host_os}" in
*linux* )
case "${host_cpu}" in
- powerpc64 | s390x | x86_64 | sparc64 )
+ aarch64 | powerpc64 | s390x | x86_64 | sparc64 )
LIBPOSTFIX="64"
;;
esac

25
graphviz-buffer_overflow.patch
View File

@ -1,25 +0,0 @@
From: Philipp Thomas <pth@suse.de>
Date: 2013-09-02 18:18:46+02:00
Subject: Fix the buffer overflow
C is defined as
pointf C[4]
so C[4] is a clear off-by-one.
---
lib/common/shapes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: lib/common/shapes.c
===================================================================
--- lib/common/shapes.c.orig 2013-08-01 19:35:15.000000000 +0200
+++ lib/common/shapes.c 2013-09-04 14:12:21.899122174 +0200
@@ -495,7 +495,7 @@ static void Mcircle_hack(GVJ_t * job, no
*/
void round_corners(GVJ_t * job, pointf * AF, int sides, int style, int filled)
{
- pointf *B, C[4], *D, p0, p1;
+ pointf *B, C[5], *D, p0, p1;
double rbconst, d, dx, dy, t;
int i, seg, mode, shape;
pointf* pts;

28
graphviz-guile.patch
View File

@ -1,28 +0,0 @@
---
configure.ac | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2013-09-05 18:53:19.358820405 +0200
+++ configure.ac 2013-09-05 18:55:36.109623495 +0200
@@ -706,8 +706,8 @@ else
if test "x$GUILE" == "x"; then
use_guile="No (guile is too old)"
else
- GUILE_INCLUDES=
- GUILE_LIBS=
+ GUILE_INCLUDES=$(guile-config compile)
+ GUILE_LIBS=$(guile-config link)
# don't die if PKG_CHECK_MODULES not available - el4, el5
PKG_CHECK_MODULES([GUILE],
[guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
@@ -718,8 +718,6 @@ else
GUILE_INCLUDES="$GUILE_CFLAGS",
false)
])
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CPPFLAGS="$CPPFLAGS"
CFLAGS="$CFLAGS $GUILE_INCLUDES"
CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"
AC_CHECK_HEADER(libguile.h,,[

23
graphviz-java_in_lib64.patch
View File

@ -1,23 +0,0 @@
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2013-09-03 18:32:36.438493137 +0200
+++ configure.ac 2013-09-04 12:24:08.990497310 +0200
@@ -795,10 +795,10 @@ else
else
for try_java_include in \
/System/Library/Frameworks/JavaVM.framework/Headers \
- /usr/lib/jvm/java/include \
- /usr/lib/jvm/java/include/linux \
- /usr/lib/jvm/default-java/include \
- /usr/lib/jvm/default-java/include/linux \
+ /usr/lib${LIBPOSTFIX}/jvm/java/include \
+ /usr/lib${LIBPOSTFIX}/jvm/java/include/linux \
+ /usr/lib${LIBPOSTFIX}/jvm/default-java/include \
+ /usr/lib${LIBPOSTFIX}/jvm/default-java/include/linux \
/etc/java-config-2/current-system-vm/include \
/etc/java-config-2/current-system-vm/include/linux \
/etc/java-config-2/current-system-vm/include/freebsd

24
graphviz-missing_headers.patch
View File

@ -1,24 +0,0 @@
Index: graphviz-2.28.0/lib/cdt/cdt.h
===================================================================
--- graphviz-2.28.0.orig/lib/cdt/cdt.h 2010-04-26 20:35:08.000000000 +0200
+++ graphviz-2.28.0/lib/cdt/cdt.h 2011-10-03 15:47:24.632084472 +0200
@@ -17,6 +17,7 @@
#endif
#include <stddef.h> /* size_t */
+#include <string.h>
#ifndef _BEGIN_EXTERNS_
#define _BEGIN_EXTERNS_
@@ -238,11 +239,6 @@ extern int dtsize _ARG_((Dt_t*));
extern int dtstat _ARG_((Dt_t*, Dtstat_t*, int));
extern unsigned int dtstrhash _ARG_((unsigned int, Void_t*, int));
-#if !_PACKAGE_ast
-extern int memcmp _ARG_((const Void_t*, const Void_t*, size_t));
-extern int strcmp _ARG_((const char*, const char*));
-#endif
-
#undef extern
_END_EXTERNS_

18
graphviz-plugins-fix_install_dirs.patch
View File

@ -5,9 +5,9 @@
Index: configure
===================================================================
--- configure.orig 2013-08-01 19:39:03.000000000 +0200
+++ configure 2013-09-03 18:16:16.259887587 +0200
@@ -22152,8 +22152,8 @@ done
--- configure.orig 2013-09-07 03:11:08.000000000 +0200
+++ configure 2013-09-09 13:52:31.087729979 +0200
@@ -22284,8 +22284,8 @@ done
else
PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
fi
@ -18,20 +18,20 @@ Index: configure
PHP_LIBS=
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
@@ -23704,7 +23704,7 @@ $as_echo "using $TCLCONFIG" >&6; }
@@ -23844,7 +23844,7 @@ $as_echo "using $TCLCONFIG" >&6; }
$as_echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;}
use_tcl="No (missing tclConfig.sh)"
fi
- TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}
fi
if test "x$use_tcl" == "x"; then
if test "x$use_tcl" = "x"; then
Index: configure.ac
===================================================================
--- configure.ac.orig 2013-09-03 18:11:59.386022594 +0200
+++ configure.ac 2013-09-03 18:11:59.427021615 +0200
@@ -1091,8 +1091,8 @@ else
--- configure.ac.orig 2013-09-07 03:07:52.000000000 +0200
+++ configure.ac 2013-09-09 13:51:37.757974780 +0200
@@ -1100,8 +1100,8 @@ else
else
PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
fi

15
graphviz-plugins-tcl_install_dir.patch
View File

@ -1,7 +1,12 @@
---
tclpkg/Makefile.am | 4 ++--
tclpkg/Makefile.in | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
Index: tclpkg/Makefile.am
===================================================================
--- tclpkg/Makefile.am.orig 2012-06-11 16:26:00.106677610 +0200
+++ tclpkg/Makefile.am 2012-06-11 16:27:30.595435808 +0200
--- tclpkg/Makefile.am.orig 2013-09-07 03:07:52.000000000 +0200
+++ tclpkg/Makefile.am 2013-09-09 13:52:50.830269146 +0200
@@ -18,9 +18,9 @@ pkgpython26dir = $(pkglibdir)/python26
pkgpython27dir = $(pkglibdir)/python27
pkgRdir = $(pkglibdir)/R
@ -16,9 +21,9 @@ Index: tclpkg/Makefile.am
endif
Index: tclpkg/Makefile.in
===================================================================
--- tclpkg/Makefile.in.orig 2012-06-11 16:26:00.000000000 +0200
+++ tclpkg/Makefile.in 2012-06-11 16:28:03.111911549 +0200
@@ -487,8 +487,9 @@ pkgpython26dir = $(pkglibdir)/python26
--- tclpkg/Makefile.in.orig 2013-09-07 03:11:21.000000000 +0200
+++ tclpkg/Makefile.in 2013-09-09 13:52:50.830269146 +0200
@@ -522,8 +522,9 @@ pkgpython26dir = $(pkglibdir)/python26
pkgpython27dir = $(pkglibdir)/python27
pkgRdir = $(pkglibdir)/R
pkgrubydir = $(pkglibdir)/ruby

10
graphviz-plugins.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 9 13:45:47 CEST 2013 - pth@suse.de
- Update to 2.34.0 (see changes for graphviz),
- Remove patches accepted upstream:
graphviz-missing_headers.patch, graphviz-aarch64_lib64_support.patch,
graphviz-type_punning.patch, graphviz-buffer_overflow.patch,
graphviz-proper_prototypes.patch, graphviz-python_version.patch,
graphviz-guile.patch, graphviz-java_in_lib64.patch
-------------------------------------------------------------------
Thu Sep 5 15:46:47 CEST 2013 - pth@suse.de

38
graphviz-plugins.spec
View File

@ -88,46 +88,20 @@ BuildRequires: pkgconfig(pango)
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
Version: 2.32.0
Version: 2.34.0
Release: 0
Summary: Graph Visualization Tools
License: IPL-1.0
Group: Productivity/Graphics/Visualization/Graph
Url: http://www.graphviz.org/
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
#Patches up to 99 are for graphviz and graphviz-plugins
#PATCH-FIX-UPSTREAM Get the right header included to get proper prototypes
# Accepted upstream -> remove for next update
Patch3: graphviz-missing_headers.patch
#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64
# Accepted upstream -> remove for next update
Patch4: graphviz-aarch64_lib64_support.patch
#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64
Patch5: graphviz-type_punning.patch
#PATCH-FIX-UPSTREAM Increase array to the need size.
# Accepted upstream -> remove for next update
Patch6: graphviz-buffer_overflow.patch
#PATCH-FIX-UPSTREAM Include ast_common.h to get __STD_C defined
# This is the patch as used upstream -> remove for next update
Patch7: graphviz-proper_prototypes.patch
#Patches from 100 up are for graphviz-plugin only
Patch100: graphviz-plugins-fix_install_dirs.patch
#PATCH-FIX-UPSTREAM Use python to get the version.
# Accepted upstream -> remove for next update
Patch101: graphviz-python_version.patch
Patch102: graphviz-plugins-tcl_install_dir.patch
Patch103: graphviz-2.20.2-interpreter_names.patch
#PATCH-FIX-UPSTREAM Use guile-config to get libs and includes
# Accepted upstream -> remove for next update
Patch104: graphviz-guile.patch
Patch106: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM also search in /usr/lib64 for Java headers
Patch107: graphviz-java_in_lib64.patch
#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
Patch108: graphviz-useless_warnings.patch
#PATCH-FIX-UPSTREAM qw must be put in brackets in recent perl versions
# Upstream also did this change -> remove for next update
Patch109: graphviz-proper_use_of_qw.patch
Requires(pre): coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -292,21 +266,11 @@ Provides some additional PDF and HTML documentation for graphviz.
%prep
%setup -q -n %{mname}-%{version}
%patch3 -p1
%patch4
%patch5
%patch6
%patch7
#
%patch100
%patch101
%patch102
%patch103
%patch104
%patch106
%patch107
%patch108
%patch109
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl

18
graphviz-python_version.patch
View File

@ -1,18 +0,0 @@
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2013-09-03 18:17:24.215264529 +0200
+++ configure.ac 2013-09-03 18:18:10.984147480 +0200
@@ -1134,7 +1134,7 @@ else
if test "x$PYTHON" == "x"; then
use_python="No (python not available)"
else
- PYTHON_VERSION=`$PYTHON -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
+ PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"`
if test "x$PYTHON_VERSION" == "x"; then
PYTHON=
else

37
graphviz-type_punning.patch
View File

@ -1,37 +0,0 @@
From: Philipp Thomas <pth@suse.de>
Date: 2013-03-28 11:43:28+01:00
Subject: Switch of strict aliasing
The vmalloc code uses type-punning in a macro so switch off strict aliasing
for this code.
---
lib/vmalloc/Makefile.am | 2 ++
tclpkg/gv/Makefile.am | 1 +
2 files changed, 3 insertions(+)
Index: lib/vmalloc/Makefile.am
===================================================================
--- lib/vmalloc/Makefile.am.orig 2013-08-01 19:35:15.000000000 +0200
+++ lib/vmalloc/Makefile.am 2013-09-04 13:53:20.113966325 +0200
@@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes
vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \
vmtrace.c vmwalk.c
+AM_CFLAGS = -fno-strict-aliasing
+
${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc
mkdir -p ${top_builddir}/FEATURE
${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@
Index: tclpkg/gv/Makefile.am
===================================================================
--- tclpkg/gv/Makefile.am.orig 2013-08-01 19:35:15.000000000 +0200
+++ tclpkg/gv/Makefile.am 2013-09-05 14:21:57.670757739 +0200
@@ -80,6 +80,7 @@ nodist_libgv_java_la_SOURCES = gv_java.c
libgv_java_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_java_la_LIBADD = $(BASELIBS) $(JAVA_LIBS)
libgv_java_la_LDFLAGS = -module -avoid-version
+libgv_java_la_CXXFLAGS = -fno-strict-aliasing
libgv_java_la_CPPFLAGS = $(BASECPPFLAGS) $(JAVA_INCLUDES)
$(JAVA_data): gv_java.cpp
gv_java.cpp: gv.i

34
graphviz.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Mon Sep 9 13:27:19 CEST 2013 - pth@suse.de
- Update to 2.34.0:
- Resolved bugs:
* graphviz will hangs if only one point and attribute given (gvz#2326)
* Inconsistent text position in xdot with HTML-like label (gvz#2333)
* Graphviz createsedges not asked for, with rank=same (gvz#2334)
* Graph padding rectangle too big (gvz#2337)
* labelloc has no effect for HTML-like labels with formatting (gvz#2338)
* Global search and replace operation in the documentation seems to
have gone awry (gvz#2340)
* Rotated graph not quite centered (gvz#2343)
* When arrowType is list and contains none all subsequent
arrowTypes are dropped (gvz#2345)
* arrowType none when included as a multiple arrowtype fails to
render empty space (gvz#2346)
* Buffer overflow in lib/common/shapes.c(round_corners) (gvz#2349).
* Add aarch64 to the architectures using lib64 (gvz#2350)
* Ask guile-config for includes and libraries (gvz#2351).
* If string.h present, don't declare memcmp and strcmp (gvz#2352).
* Include ast_common.h in cdt sources (gvz#2353)
* Alternative way to get python's version (gvz#2354)
* Unportable test(1) construct in configure script (gvz#2357)
* Use parantheses around qw() call in loop (gvz#2359)
* Saving in Vimdot can crash the graphical window (rh#847458).
- Added mingle command and library for edge bundling
- Removed Patches that where accepted upstream:
graphviz-missing_headers.patch
graphviz-aarch64_lib64_support.patch
graphviz-type_punning.patch
graphviz-buffer_overflow.patch
graphviz-proper_prototypes.patch
-------------------------------------------------------------------
Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de

22
graphviz.spec
View File

@ -20,7 +20,7 @@
%define config_file config6
Name: graphviz
Version: 2.32.0
Version: 2.34.0
Release: 0
Summary: Graph Visualization Tools
License: IPL-1.0
@ -29,21 +29,6 @@ Url: http://www.graphviz.org/
Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
Source2: graphviz-rpmlintrc
Patch2: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM Get the right header included to get proper prototypes
# Accepted upstream -> remove for next update
Patch3: graphviz-missing_headers.patch
#PATCH-FIX-UPSTREAM Add aarch64 to the archs that use lib64
# Accepted upstream -> remove for next update
Patch4: graphviz-aarch64_lib64_support.patch
#PATCH-FIX-UPSTREAM Increase array to the need size.
# Accepted upstream -> remove for next update
Patch5: graphviz-type_punning.patch
#PATCH-FIX-UPSTREAM Increase array to the need size.
# Accepted upstream -> remove for next update
Patch6: graphviz-buffer_overflow.patch
#PATCH-FIX-UPSTREAM Include ast_common.h to get __STD_C defined
# This is the patch as used upstream -> remove for next update
Patch7: graphviz-proper_prototypes.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -103,11 +88,6 @@ Note: If you need output in png format you also need to install
%prep
%setup -q
%patch2
%patch3 -p1
%patch4
%patch5
%patch6
%patch7
# Fix path in generated man pages
sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl