Hello community, here is the log from the commit of package graphviz for openSUSE:Factory checked in at 2014-01-22 23:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/graphviz (Old) and /work/SRC/openSUSE:Factory/.graphviz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "graphviz" Changes: -------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:Factory/.graphviz.new/graphviz-gvedit.changes 2014-01-23 15:44:40.000000000 +0100 @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - [email protected] + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + +------------------------------------------------------------------- +Wed Sep 11 13:42:43 CEST 2013 - [email protected] + +- Initial package split off from graphviz. +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + --- /work/SRC/openSUSE:Factory/graphviz/graphviz-plugins.changes 2013-06-24 09:29:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.graphviz.new/graphviz-plugins.changes 2014-01-23 15:44:40.000000000 +0100 @@ -1,0 +2,132 @@ +Sat Jan 18 17:06:59 UTC 2014 - [email protected] + +- fix mono bcond. It's without, not !with + +------------------------------------------------------------------- +Sat Jan 18 16:47:55 UTC 2014 - [email protected] + +- use global java bcond instead of an own now that it buildrequires + jdk and no longer gcc + +------------------------------------------------------------------- +Tue Jan 14 11:54:17 UTC 2014 - [email protected] + +- Don't build C# binding without mono. Otherwise we get unpackaged + files. + +------------------------------------------------------------------- +Sat Jan 11 07:27:19 UTC 2014 - [email protected] + +- remove unneeded ksh dependency + +------------------------------------------------------------------- +Fri Dec 6 22:26:21 UTC 2013 - [email protected] + +- Add powerpc64le to list of lib64 platforms + (graphviz-ppc64le_lib64_support.patch). + +------------------------------------------------------------------- +Mon Oct 14 15:28:40 CEST 2013 - [email protected] + +- Use wildcards for specifying tcl directory. + +------------------------------------------------------------------- +Thu Oct 10 19:37:47 CEST 2013 - [email protected] + +- Change BuildRequires for Java so that the spec doesn't need + to be modified for newer jdk versions. + +------------------------------------------------------------------- +Tue Oct 8 20:01:18 CEST 2013 - [email protected] + +- Don't apply graphviz-fix-pkgIndex.patch twice. +- Remove Buildrequires for libqt4-devel. + +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - [email protected] + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + +------------------------------------------------------------------- +Mon Sep 9 13:45:47 CEST 2013 - [email protected] + +- 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 +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + +------------------------------------------------------------------- +Thu Sep 5 15:46:47 CEST 2013 - [email protected] + +- Update to 2.32.0. Changes since 2.28.0: + 2.32.0: + - New version of xdot format, annotating gradient color schemes + - Support for reading pdf images using poppler + - Lefty/dotty/lneato now accept anonymous graphs + - Add star node shape + - Add two-tone (non-gradient) fill + 2.30.1: + - various build fixes + 2.30.0: + - Replaced libgraph with libcgraph; use of libgraph is now deprecated + - New ranking algorithm that allows multiple subgraph constraints + - Support edges using curved arcs. + - Added new shapes used by the synthetic biology community. + - For HTML-like labels, provide rounded cells, and dashed or dotted borders. + - Add lcurve and rcurve arrowheads. + - Add prototype pie chart and striped fills. + - Support insets in treemaps to make containment clear + - Add random rooted tree generation to gvgen + - Allow GVPRPATH to specify that the default path be prepended or + appended to it. + - Support arbitrary lists of layers; allow the user to specify arbitrary + layers for output. + - A collection of gvpr scripts, which were part of the source package, + are now installed in <prefix>/share/graphviz/gvpr, and the that path + is used as part of th default built-in path for gvpr. + - Update libexpr to reflect Glenn Fowler's changes including scopes for + variables. + - Add next graph variable to gvpr + - Modify dot and fdp so that a cluster's margin attribute will affect + the space between the bounding box and nodes + - Modify the dijkstra tool to use only directed edges + - Output numbers without quotes if quotes are not needed on input + - Support gradient fill + - Provide support for webp images + - Fix tapered edges to use the dir attribute and arrowhead + - Add imagepath attribute + - Add help functionality to Graphviz.app + - Add <B>,<I>,<U> to html strings via svg + - Add tapered edges + - Add support for external labels + - Add initial implementation of graphml2gv + - Add basic horizontal and vertical rules to html tables + +- Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't + exist anymore. +- Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in + lib/common/shapes.c(round_corners) by increasing the number of + elements in the array. +- Add graphviz-proper_prototypes.patch that changes dthdr.h to + include ast_common.h to get __STD_C defined, which in turn + enables proper prototypes. +- Run autoreconf to use -fno-strict-aliasing for libvmalloc sources +- Remove graphviz-2.18-do_not_use_ocamlopt.patch as it's not needed + anymore. +- Adapt graphviz-guile.patch, graphviz-plugins-fix_install_dirs.patch + and graphviz-python_version.patch to the new sources. +- Add graphviz-java_in_lib64.patch to search in /usr/lib64/jvm for + the java headers on platforms using lib64. +- Add graphviz-proper_use_of_qw.patch to put the use of qw in + config/config_perl.pl in brackets. +- Add graphviz-useless_warnings.patch to make gcc not warn about + harmless issues that arise from code generated by swig. +- Add patch tags in the spec files +- Upstreamed all patches that aren't SUSE specific. + +------------------------------------------------------------------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:Factory/.graphviz.new/graphviz-smyrna.changes 2014-01-23 15:44:40.000000000 +0100 @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 2 02:21:22 UTC 2014 - [email protected] + +- drop BuildRequires:gtkglarea2-devel its not in Factory + +------------------------------------------------------------------- +Thu Oct 24 11:16:01 CEST 2013 - [email protected] + +- Split off smyrna into its own package and spec file to eliminate + the dependency cycle for the graphviz package. + +- Add libGLU and libGL as libraries to link to which was missing. + --- /work/SRC/openSUSE:Factory/graphviz/graphviz.changes 2013-04-02 11:49:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.graphviz.new/graphviz.changes 2014-01-23 15:44:40.000000000 +0100 @@ -1,0 +2,131 @@ +Wed Dec 11 16:17:50 UTC 2013 - [email protected] + +- graphviz-fix-includes.patch: Use #include "cgraph.h", not <cgraph.h> + in graphviz/types.h. + +------------------------------------------------------------------- +Tue Oct 29 12:22:26 CET 2013 - [email protected] + +- Add graphviz-getaddrinfo.patch to use getaddrinfo instead of + gethostbyname. + +------------------------------------------------------------------- +Wed Oct 23 12:30:42 CEST 2013 - [email protected] + +- Split off smyrna into its own package and spec to eliminate the + dependency cycle for graphiz. + +------------------------------------------------------------------- +Mon Oct 14 14:06:03 CEST 2013 - [email protected] + +- Remove gvedit files from filelist in grapfviz.spec. +- Remove build requirement for libqt4. + +------------------------------------------------------------------- +Thu Sep 12 17:56:06 CEST 2013 - [email protected] + +- Add graphviz-python3_version.patch that put the call to print in + Parentheses. + +------------------------------------------------------------------- +Wed Sep 11 18:55:22 CEST 2013 - [email protected] + +- Split off gvedit to it's own spec to avoid circular dependency + for graphviz and its sup packages. +- Add graphviz-type_punning.patch which compiles the vmalloc sources + with -fno-strict-aliasing. + +------------------------------------------------------------------- +Mon Sep 9 13:27:19 CEST 2013 - [email protected] + +- 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 - [email protected] + +- Update to 2.32.0. Changes since 2.28.0: + 2.32.0: + - New version of xdot format, annotating gradient color schemes + - Support for reading pdf images using poppler + - Lefty/dotty/lneato now accept anonymous graphs + - Add star node shape + - Add two-tone (non-gradient) fill + 2.30.1: + - various build fixes + 2.30.0: + - Replaced libgraph with libcgraph; use of libgraph is now deprecated + - New ranking algorithm that allows multiple subgraph constraints + - Support edges using curved arcs. + - Added new shapes used by the synthetic biology community. + - For HTML-like labels, provide rounded cells, and dashed or dotted borders. + - Add lcurve and rcurve arrowheads. + - Add prototype pie chart and striped fills. + - Support insets in treemaps to make containment clear + - Add random rooted tree generation to gvgen + - Allow GVPRPATH to specify that the default path be prepended or + appended to it. + - Support arbitrary lists of layers; allow the user to specify arbitrary + layers for output. + - A collection of gvpr scripts, which were part of the source package, + are now installed in <prefix>/share/graphviz/gvpr, and the that path + is used as part of th default built-in path for gvpr. + - Update libexpr to reflect Glenn Fowler's changes including scopes for + variables. + - Add next graph variable to gvpr + - Modify dot and fdp so that a cluster's margin attribute will affect + the space between the bounding box and nodes + - Modify the dijkstra tool to use only directed edges + - Output numbers without quotes if quotes are not needed on input + - Support gradient fill + - Provide support for webp images + - Fix tapered edges to use the dir attribute and arrowhead + - Add imagepath attribute + - Add help functionality to Graphviz.app + - Add <B>,<I>,<U> to html strings via svg + - Add tapered edges + - Add support for external labels + - Add initial implementation of graphml2gv + - Add basic horizontal and vertical rules to html tables + +- Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't + exist anymore. +- Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in + lib/common/shapes.c(round_corners) by increasing the number of + elements in the array. +- Add graphviz-proper_prototypes.patch that changes dthdr.h to + include ast_common.h to get __STD_C defined, which in turn + enables proper prototypes. +- Run autoreconf to use -fno-strict-aliasing for libvmalloc sources +- Add patch tags in the spec files +- Upstreamed all patches that aren't SUSE specific. + +------------------------------------------------------------------- Old: ---- graphviz-2.18-do_not_use_ocamlopt.patch graphviz-2.28.0.tar.gz graphviz-aarch64_lib64_support.patch graphviz-gd_png_check_sig.patch graphviz-guile.patch graphviz-missing_headers.patch graphviz-python_version.patch graphviz-type_punning.patch New: ---- graphviz-2.34.0.tar.gz graphviz-fix-includes.patch graphviz-getaddrinfo.patch graphviz-gvedit.changes graphviz-gvedit.spec graphviz-no_strict_aliasing.patch graphviz-ppc64le_lib64_support.patch graphviz-python3_version.patch graphviz-smyrna-link_against_glu.patch graphviz-smyrna.changes graphviz-smyrna.spec graphviz-useless_warnings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz-gvedit.spec ++++++ # # spec file for package graphviz-gvedit # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define mname graphviz Name: graphviz-gvedit Version: 2.34.0 Release: 0 Summary: Graph editor based on Qt 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 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 BuildRequires: fdupes BuildRequires: flex BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: zlib-devel BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) Requires(pre): /bin/cat Requires(pre): /bin/rm Recommends: graphviz = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is the graph editor included with graphviz, packaged separately to avoid cycles in the build of the graphviz package. %prep %setup -q -n %{mname}-%{version} %patch2 %patch3 %patch4 -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 %build autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 CFLAGS="$CFLAGS -ffast-math" %endif export CFLAGS="$CFLAGS" export CPPFLAGS="%{optflags}" %configure \ --with-x \ --with-mylibgd \ --disable-static \ --enable-ltdl-install=no \ --with-ipsepcola \ --without-ming \ --disable-io \ --disable-silent-rules \ --with-mylibgd=no \ --with-libgd=no make %{?_smp_mflags} DESTDIR=%{buildroot} %install make install \ DESTDIR=%{buildroot} \ docdir=%{buildroot}%{_docdir}/%{mname} \ pkgconfigdir=%{_libdir}/pkgconfig find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f mkdir -p %{buildroot}/%{_docdir} mkdir -p %{buildroot}%{_datadir}/%{mname} rm -f %{buildroot}/%{_libdir}/%{mname}/pkgIndex.tcl cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc rm -rf %{buildroot}%{_datadir}/%{mname}/doc rm -rf %{buildroot}%{_libdir} mv %{buildroot}/%{_mandir}/man1/gvedit.1 /tmp/gvedit.1 rm -f %{buildroot}/%{_mandir}/man1/* rm -rf %{buildroot}/%{_mandir}/man[37] mv /tmp/gvedit.1 %{buildroot}/%{_mandir}/man1/gvedit.1 mv %{buildroot}/%{_bindir}/gvedit /tmp/gvedit rm -f %{buildroot}/%{_bindir}/* mv /tmp/gvedit %{buildroot}/%{_bindir}/gvedit rm -rf %{buildroot}%{_datadir}/%{mname}/graphs rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr rm -rf %{buildroot}%{_datadir}/%{mname}/lefty rm -rf %{buildroot}%{_includedir}/%{mname} %files %defattr(-,root,root) %doc COPYING %attr(755,root,root) %{_bindir}/gvedit %dir %{_datadir}/%{mname} %dir %{_datadir}/%{mname}/gvedit %{_datadir}/%{mname}/gvedit/attrs.txt %doc %{_mandir}/man1/*.1* %changelog ++++++ graphviz-plugins.spec ++++++ --- /var/tmp/diff_new_pack.UrtwM5/_old 2014-01-23 15:44:41.000000000 +0100 +++ /var/tmp/diff_new_pack.UrtwM5/_new 2014-01-23 15:44:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package graphviz-plugins # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,17 @@ %define mname graphviz %ifarch aarch64 -%bcond_with graphviz_java +%bcond_with java %bcond_with graphviz_ocaml %else -%bcond_without graphviz_java +%bcond_without java %bcond_without graphviz_ocaml %endif %bcond_without mono Name: graphviz-plugins +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: freetype2-devel >= 2 @@ -37,7 +39,6 @@ BuildRequires: gmp-devel BuildRequires: graphviz BuildRequires: guile-devel -BuildRequires: ksh BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel @@ -49,9 +50,10 @@ BuildRequires: gtkglext-devel %endif %endif -%if %{with graphviz_java} -BuildRequires: gcc-java -BuildRequires: libgcj-devel +%if %{with java} +#BuildRequires: gcc-java +#BuildRequires: libgcj-devel +BuildRequires: java-devel >= 1.6.0 %endif %if %{with mono} BuildRequires: mono-core @@ -83,23 +85,25 @@ %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.28.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 -Patch1: graphviz-gd_png_check_sig.patch -Patch4: graphviz-aarch64_lib64_support.patch -Patch5: graphviz-type_punning.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 +#Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch -Patch101: graphviz-python_version.patch Patch102: graphviz-plugins-tcl_install_dir.patch Patch103: graphviz-2.20.2-interpreter_names.patch -Patch104: graphviz-guile.patch -Patch105: graphviz-2.18-do_not_use_ocamlopt.patch Patch106: graphviz-fix-pkgIndex.patch +#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code +Patch108: graphviz-useless_warnings.patch +Patch109: graphviz-ppc64le_lib64_support.patch Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -147,7 +151,7 @@ A collection of tools and tcl packages for the manipulation and layout of graphs (as in nodes and edges, not as in bar charts). -%if %{with graphviz_java} +%if %{with java} %package -n graphviz-java Summary: Graph Visualization Tools Group: Productivity/Graphics/Visualization/Graph @@ -191,6 +195,8 @@ Requires: perl = %{perl_version} Provides: graphviz_plugin = %{version} +%perl_requires + %description -n graphviz-perl The graphviz-perl package contains the Perl extension for the graphviz tools. @@ -262,21 +268,20 @@ %prep %setup -q -n %{mname}-%{version} -%patch1 -%patch4 -%patch5 +%patch3 +%patch4 -p1 %patch100 -%patch101 %patch102 %patch103 -%patch104 -p1 -%patch105 %patch106 +%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 %build +autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 @@ -299,6 +304,9 @@ --without-ming \ --disable-silent-rules \ --enable-ltdl-install=no \ +%if %{without mono} + --enable-sharp=no \ +%endif --disable-io make DESTDIR=%{buildroot} %{?_smp_mflags} @@ -334,6 +342,8 @@ rm -f %{buildroot}%{_mandir}/man3/*.3 rm -f %{buildroot}%{_mandir}/man7/*.7 rm -f %{buildroot}%{_mandir}/man7/*.7.gz +rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr +rm -rf %{buildroot}%{_datadir}/%{mname}/gvedit for lib in libgdtclft* libgv_tcl.so libtcldot* libtclplan* libtkspline*; do mv %{buildroot}%{_libdir}/%{mname}/tcl/${lib} %{buildroot}%{_libdir} done @@ -374,10 +384,11 @@ %{_libdir}/graphviz/guile %doc %{_mandir}/man3/gv.3guile.gz -%if %{with graphviz_java} +%if %{with java} %files -n graphviz-java %defattr(-,root,root,-) %{_libdir}/graphviz/java +%{_mandir}/man3/gv.3java.gz %endif %if %{with mono} @@ -433,13 +444,14 @@ %files -n graphviz-ruby %defattr(-,root,root,-) %{_libdir}/graphviz/ruby -%{rb_sitedir}/*-%{_os}/gv.so +%{rb_vendordir}/*-%{_os}/gv.so %doc %{_mandir}/man3/gv.3ruby.gz %{_datadir}/%{mname}/demo/modgraph.rb %files -n graphviz-tcl %defattr(-,root,root) %dir %{_datadir}/tcl/%{mname} +%{_libdir}/tcl[0-9].[0-9] %{_libdir}/libgdtclft* %{_libdir}/libgv_tcl.so %{_libdir}/libtcldot* ++++++ graphviz-smyrna.spec ++++++ # # spec file for package graphviz-smyrna # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define mname graphviz Name: graphviz-smyrna Version: 2.34.0 Release: 0 Summary: Glut based graph viewer 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 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 BuildRequires: automake BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: zlib-devel %ifnarch aarch64 %if 0%suse_version > 1220 BuildRequires: freeglut-devel BuildRequires: glu-devel BuildRequires: gtkglext-devel BuildRequires: gts-devel BuildRequires: libglade2-devel %endif %endif BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) Requires(pre): /bin/cat Requires(pre): /bin/rm Recommends: graphviz = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is the graph editor included with graphviz, packaged separately to avoid cycles in the build of the graphviz package. %prep %setup -q -n %{mname}-%{version} %patch2 %patch3 %patch4 -p1 %patch10 # 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 %build autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 CFLAGS="$CFLAGS -ffast-math" %endif export CFLAGS="$CFLAGS" export CPPFLAGS="%{optflags}" %configure \ --with-x \ --with-mylibgd \ --disable-static \ --enable-ltdl-install=no \ --with-ipsepcola \ --without-ming \ --disable-io \ --disable-silent-rules \ --with-mylibgd=no \ --with-libgd=no \ --with-smyrna=yes make %{?_smp_mflags} DESTDIR=%{buildroot} %install make install \ DESTDIR=%{buildroot} \ docdir=%{buildroot}%{_docdir}/%{mname} \ pkgconfigdir=%{_libdir}/pkgconfig find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f mkdir -p %{buildroot}/%{_docdir} mkdir -p %{buildroot}%{_datadir}/%{mname} rm -f %{buildroot}/%{_libdir}/%{mname}/pkgIndex.tcl cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc rm -rf %{buildroot}%{_datadir}/%{mname}/doc rm -rf %{buildroot}%{_libdir} mv %{buildroot}/%{_mandir}/man1/smyrna.1 /tmp/smyrna.1 rm -f %{buildroot}/%{_mandir}/man1/* rm -rf %{buildroot}/%{_mandir}/man[37] mv /tmp/smyrna.1 %{buildroot}/%{_mandir}/man1/smyrna.1 mv %{buildroot}/%{_bindir}/smyrna /tmp/smyrna rm -f %{buildroot}/%{_bindir}/* mv /tmp/smyrna %{buildroot}/%{_bindir}/smyrna rm -rf %{buildroot}%{_datadir}/%{mname}/graphs rm -rf %{buildroot}%{_datadir}/%{mname}/examples rm -rf %{buildroot}%{_datadir}/%{mname}/gvedit rm -rf %{buildroot}%{_datadir}/%{mname}/gvpr rm -rf %{buildroot}%{_datadir}/%{mname}/lefty rm -rf %{buildroot}%{_includedir}/%{mname} %files %defattr(-,root,root) %doc COPYING %attr(755,root,root) %{_bindir}/smyrna %dir %{_datadir}/%{mname} %{_datadir}/%{mname}/smyrna %doc %{_mandir}/man1/*.1* %changelog ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.UrtwM5/_old 2014-01-23 15:44:41.000000000 +0100 +++ /var/tmp/diff_new_pack.UrtwM5/_new 2014-01-23 15:44:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package graphviz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,19 +20,28 @@ %define config_file config6 Name: graphviz -Version: 2.28.0 +Version: 2.34.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 -Group: Productivity/Graphics/Visualization/Graph +Group: Applications/Productivity Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc -Patch1: graphviz-gd_png_check_sig.patch Patch2: graphviz-fix-pkgIndex.patch -Patch3: graphviz-missing_headers.patch -Patch4: graphviz-aarch64_lib64_support.patch -Patch5: graphviz-type_punning.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 BuildRequires: fdupes BuildRequires: flex @@ -87,16 +96,17 @@ %prep %setup -q -%patch1 %patch2 -%patch3 -p1 -%patch4 +%patch3 +%patch4 -p1 %patch5 +%patch6 # 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 %build +autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 @@ -164,7 +174,7 @@ %post /sbin/ldconfig -# run "dot -c" to generate plugin config %{_libdir}/graphviz/config +# run "dot -c" to generate plugin config %%{_libdir}/graphviz/config dot -c test -s %{_libdir}/graphviz/%{config_file} || echo "%{_libdir}/graphviz/%{config_file} doesn't exist! Check installation." @@ -175,16 +185,85 @@ %files %defattr(-,root,root) %doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog -%attr(755,root,root) %{_bindir}/* +#%%attr(755,root,root) %{_bindir}/* +%{_bindir}/acyclic +%{_bindir}/bcomps +%{_bindir}/ccomps +%{_bindir}/circo +%{_bindir}/cluster +%{_bindir}/dijkstra +%{_bindir}/dot +%{_bindir}/dot2gxl +%{_bindir}/dot_builtins +%{_bindir}/dotty +%{_bindir}/fdp +%{_bindir}/gc +%{_bindir}/gml2gv +%{_bindir}/graphml2gv +%{_bindir}/gv2gml +%{_bindir}/gv2gxl +%{_bindir}/gvcolor +%{_bindir}/gvgen +%{_bindir}/gvmap +%{_bindir}/gvmap.sh +%{_bindir}/gvpack +%{_bindir}/gvpr +%{_bindir}/gxl2dot +%{_bindir}/gxl2gv +%{_bindir}/lefty +%{_bindir}/lneato +%{_bindir}/mm2gv +%{_bindir}/neato +%{_bindir}/nop +%{_bindir}/osage +%{_bindir}/patchwork +%{_bindir}/prune +%{_bindir}/sccmap +%{_bindir}/sfdp +%{_bindir}/tred +%{_bindir}/twopi +%{_bindir}/unflatten %dir %{_datadir}/%{name} %{_datadir}/%{name}/lefty %{_datadir}/%{name}/graphs +%dir %{_datadir}/%{name}/gvpr +%{_datadir}/%{name}/gvpr/addranks +%{_datadir}/%{name}/gvpr/addrings +%{_datadir}/%{name}/gvpr/anon +%{_datadir}/%{name}/gvpr/attr +%{_datadir}/%{name}/gvpr/bb +%{_datadir}/%{name}/gvpr/bbox +%{_datadir}/%{name}/gvpr/cliptree +%{_datadir}/%{name}/gvpr/col +%{_datadir}/%{name}/gvpr/collapse +%{_datadir}/%{name}/gvpr/color +%{_datadir}/%{name}/gvpr/dechain +%{_datadir}/%{name}/gvpr/deghist +%{_datadir}/%{name}/gvpr/deledges +%{_datadir}/%{name}/gvpr/delmulti +%{_datadir}/%{name}/gvpr/delnodes +%{_datadir}/%{name}/gvpr/depath +%{_datadir}/%{name}/gvpr/dijkstra +%{_datadir}/%{name}/gvpr/flatten +%{_datadir}/%{name}/gvpr/get-layers-list +%{_datadir}/%{name}/gvpr/group +%{_datadir}/%{name}/gvpr/indent +%{_datadir}/%{name}/gvpr/knbhd +%{_datadir}/%{name}/gvpr/maxdeg +%{_datadir}/%{name}/gvpr/path +%{_datadir}/%{name}/gvpr/rotate +%{_datadir}/%{name}/gvpr/scale +%{_datadir}/%{name}/gvpr/scalexy +%{_datadir}/%{name}/gvpr/span +%{_datadir}/%{name}/gvpr/topon +%{_datadir}/%{name}/gvpr/treetoclust + %doc %{_mandir}/man1/*.1* %doc %{_mandir}/man7/*.7* %dir %{_libdir}/%{name} %{_libdir}/*.so.* %{_libdir}/graphviz/*.so* -%{_sysconfdir}/ld.so.conf.d/graphviz.conf +%config %{_sysconfdir}/ld.so.conf.d/graphviz.conf %ghost %{_libdir}/graphviz/config %files devel ++++++ graphviz-2.28.0.tar.gz -> graphviz-2.34.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/graphviz/graphviz-2.28.0.tar.gz /work/SRC/openSUSE:Factory/.graphviz.new/graphviz-2.34.0.tar.gz differ: char 5, line 1 ++++++ graphviz-fix-includes.patch ++++++ 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; ++++++ graphviz-getaddrinfo.patch ++++++ --- 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+"); } ++++++ graphviz-no_strict_aliasing.patch ++++++ --- lib/vmalloc/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) Index: lib/vmalloc/Makefile.am =================================================================== --- lib/vmalloc/Makefile.am.orig 2013-09-07 03:07:52.000000000 +0200 +++ lib/vmalloc/Makefile.am 2013-09-11 18:51:30.719515603 +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 +libvmalloc_C_la_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 > $@ ++++++ graphviz-plugins-fix_install_dirs.patch ++++++ --- /var/tmp/diff_new_pack.UrtwM5/_old 2014-01-23 15:44:41.000000000 +0100 +++ /var/tmp/diff_new_pack.UrtwM5/_new 2014-01-23 15:44:41.000000000 +0100 @@ -1,8 +1,13 @@ -Index: configure.ac +--- + configure | 6 +++--- + configure.ac | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: configure =================================================================== ---- configure.ac.orig 2012-06-11 16:25:59.960684453 +0200 -+++ configure.ac 2012-06-11 16:26:07.060351640 +0200 -@@ -1055,8 +1055,8 @@ else +--- 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 @@ -13,20 +18,20 @@ PHP_LIBS= save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" -@@ -1597,7 +1597,7 @@ if test "x$use_tcl" = "x"; then - AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built]) +@@ -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 -Index: configure +Index: configure.ac =================================================================== ---- configure.orig 2012-06-11 16:25:59.000000000 +0200 -+++ configure 2012-06-11 16:27:00.874828987 +0200 -@@ -21022,8 +21022,8 @@ fi +--- 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 @@ -37,12 +42,3 @@ PHP_LIBS= save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" -@@ -22032,7 +22032,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}" - fi - - if test "x$use_tcl" = "x"; then ++++++ graphviz-plugins-tcl_install_dir.patch ++++++ --- /var/tmp/diff_new_pack.UrtwM5/_old 2014-01-23 15:44:41.000000000 +0100 +++ /var/tmp/diff_new_pack.UrtwM5/_new 2014-01-23 15:44:41.000000000 +0100 @@ -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 @@ 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 ++++++ graphviz-ppc64le_lib64_support.patch ++++++ --- configure.ac +++ configure.ac @@ -102,7 +102,7 @@ if test -z "$LIBPOSTFIX"; then case "${host_os}" in *linux* ) case "${host_cpu}" in - aarch64 | powerpc64 | s390x | x86_64 | sparc64 ) + aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 ) LIBPOSTFIX="64" ;; esac ++++++ graphviz-python_version.patch -> graphviz-python3_version.patch ++++++ --- /work/SRC/openSUSE:Factory/graphviz/graphviz-python_version.patch 2012-06-12 07:06:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.graphviz.new/graphviz-python3_version.patch 2014-01-23 15:44:40.000000000 +0100 @@ -1,26 +1,19 @@ -Index: configure.ac +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 =================================================================== ---- configure.ac.orig 2012-06-11 16:26:07.060351640 +0200 -+++ configure.ac 2012-06-11 16:27:06.331573194 +0200 -@@ -1098,7 +1098,7 @@ else +--- 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 -V 2>&1 | $GREP 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 -Index: configure -=================================================================== ---- configure.orig 2012-06-11 16:27:00.000000000 +0200 -+++ configure 2012-06-11 16:27:26.152644075 +0200 -@@ -21117,7 +21117,7 @@ fi - if test "x$PYTHON" = "x"; then - use_python="No (python not available)" - else -- PYTHON_VERSION=`$PYTHON -V 2>&1 | $GREP Python | cut -d ' ' -f 2` -+ 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]])"` ++ PYTHON_VERSION=`$PYTHON -c "import sys; print('%d.%d' % sys.version_info[[0:2]])"` if test "x$PYTHON_VERSION" = "x"; then PYTHON= else ++++++ graphviz-smyrna-link_against_glu.patch ++++++ --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: configure.ac =================================================================== --- configure.ac.orig 2013-10-23 17:25:44.020188917 +0200 +++ configure.ac 2013-10-23 17:26:17.637411247 +0200 @@ -2811,7 +2811,7 @@ else AC_CHECK_HEADER(GL/glut.h, AC_CHECK_LIB(glut,main, - [GLUT_LIBS="$GLUT_LIBS -lglut" + [GLUT_LIBS="$GLUT_LIBS -lglut $(pkg-config --libs glu)" use_glut="Yes" AC_DEFINE_UNQUOTED(HAVE_GLUT,1,[Define if you have the GLUT library])], use_glut="No (missing libglut)" ++++++ graphviz-useless_warnings.patch ++++++ --- tclpkg/gv/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) Index: tclpkg/gv/Makefile.am =================================================================== --- tclpkg/gv/Makefile.am.orig 2013-09-05 17:59:52.837755940 +0200 +++ tclpkg/gv/Makefile.am 2013-09-05 18:00:53.696332434 +0200 @@ -20,6 +20,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/cdt \ -I$(top_srcdir)/lib/pathplan +AM_CXXFLAGS = -Wno-unused-label -Wno-unused-function \ + -Wno-unused-but-set-variable LIBS = -lc BASESOURCES = gv.cpp gv.i gv_builtins.c -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
