Accepting request 40988 from graphics

Copy from graphics/graphviz based on submit request 40988 from user psmt

OBS-URL: https://build.opensuse.org/request/show/40988
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=36
This commit is contained in:
OBS User autobuild 2010-06-02 16:08:19 +00:00 committed by Git OBS Bridge
commit 1c5d1ccacd
6 changed files with 72 additions and 3 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jun 2 14:05:46 CEST 2010 - pth@suse.de
- Dot requires fonts when using pango for output (bnc#610873).
-------------------------------------------------------------------
Fri May 28 15:15:48 CEST 2010 - meissner@suse.de
- remove a powerpc hack for Darwin that failed our PowerPC build.
-------------------------------------------------------------------
Fri Nov 13 23:37:02 CET 2009 - dmueller@suse.de

View File

@ -30,7 +30,7 @@ BuildRequires: graphviz gtkglext-devel libglade2-devel libgnomeui-devel
BuildRequires: fdupes
%endif
Version: 2.26.3
Release: 3
Release: 4
AutoReqProv: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
@ -45,6 +45,7 @@ Patch100: graphviz-plugins-fix_install_dirs.patch
Patch101: graphviz-plugins-tcl_install_dir.patch
Patch103: graphviz-2.18-do_not_use_ocamlopt.patch
Patch104: python-version.diff
Patch105: graphviz-ruby-ppc.patch
Url: http://www.graphviz.org/
License: IBM Public License ..
Prefix: /usr
@ -79,6 +80,7 @@ Summary: Graphviz plugins that use gtk/GNOME
PreReq: graphviz = %{version}
PreReq: coreutils
Provides: graphviz_plugin = %{version}-%{release}
Requires: xorg-x11-fonts
%description -n graphviz-gnome
Graphviz plugins that use gtk/GNOME.
@ -380,6 +382,7 @@ Authors:
%patch101
%patch103
%patch104
%patch105 -p1
# 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
# remove broken macros

26
graphviz-ruby-ppc.patch Normal file
View File

@ -0,0 +1,26 @@
Index: graphviz-2.26.3/configure.ac
===================================================================
--- graphviz-2.26.3.orig/configure.ac
+++ graphviz-2.26.3/configure.ac
@@ -1405,8 +1405,6 @@ else
use_ruby="No (ruby not available)"
else
RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
- # hack for powerpc-darwin8 (10.4)
- RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
save_CPPFLAGS=$CPPFLAGS
Index: graphviz-2.26.3/configure
===================================================================
--- graphviz-2.26.3.orig/configure
+++ graphviz-2.26.3/configure
@@ -27575,8 +27575,6 @@ fi
use_ruby="No (ruby not available)"
else
RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
- # hack for powerpc-darwin8 (10.4)
- RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`"
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
save_CPPFLAGS=$CPPFLAGS

View File

@ -0,0 +1,19 @@
The second argument to the typeName function should be the ID of
a type, not a value. As typeName does no checking on it's arguments
it'll form a negative index for accessing the type names array.
Patch by Emden R. Gansner <erg@research.att.com>
Index: lib/gvpr/compile.c
===================================================================
--- lib/gvpr/compile.c.orig 2009-11-22 20:10:33.000000000 +0100
+++ lib/gvpr/compile.c 2010-06-01 12:52:04.902610547 +0200
@@ -1514,7 +1514,7 @@ setval(Expr_t * pgm, Exnode_t * x, Exid_
state->tvt = (trav_type) iv;
else
error(1, "unexpected value %d assigned to %s : ignored",
- iv, typeName(pgm, V_travtype));
+ iv, typeName(pgm, T_tvtyp));
break;
case V_travroot:
np = INT2PTR(Agnode_t *, v.integer);

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 1 16:29:05 UTC 2010 - pth@suse.de
- Fix array underflow in lib/gvpr/compile.c
(graphviz-wrong_index.patch).
- Mention in description that graphviz-gnome is needed for png
output.
-------------------------------------------------------------------
Mon May 17 12:22:51 UTC 2010 - coolo@novell.com

View File

@ -25,7 +25,7 @@ BuildRequires: xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
PreReq: /bin/rm
Version: 2.26.3
Release: 3
Release: 4
AutoReqProv: on
Summary: Graph Visualization Tools
Group: Productivity/Graphics/Visualization/Graph
@ -36,6 +36,7 @@ Patch3: graphviz-neato_splines.patch
Patch11: graphviz-2.20.2-interpreter_names.patch
Patch13: graphviz-stddefs.patch
Patch14: graphviz-gd_png_check_sig.patch
Patch15: graphviz-wrong_index.patch
Url: http://www.graphviz.org/
License: IBM Public License ..
Prefix: /usr
@ -73,7 +74,8 @@ Requires: libstdc++-devel tk-devel
The graphviz-devel package contains all that's necessary for developing
programs that use the graphviz libraries including man3 pages.
Note: If you need output in png format you also need to install
graphviz-gnome.
Authors:
--------
@ -92,6 +94,7 @@ Authors:
%patch11
%patch13
%patch14
%patch15
# 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
# remove broken macros