From b25d15eb012655d4975ce11472dd280665d09ed66fcb81a0eadf79a4f42b1d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Tue, 23 Feb 2021 10:23:49 +0000 Subject: [PATCH] Accepting request 874532 from home:cvoegl:branches:graphics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to new release 2.46.1 (changes since 2.44.1) * Support for building against Guile 2.2 * Portable source is now also offered as a .tar.xz * CentOS/RHEL 6 is no longer supported * Vestiges of Qt4 support have been removed * C++11 support is now required of the C++ compiler used to build Graphviz * C99 support is now required of the C compiler used to build Graphviz * Question about userout() function in agerror.c #1924 * The minimum version of Python required to run the test suite is 3.6 * memory leak in label construction * gvedit compilation errors out, but works if manually compiled with qt5 #1862 * incorrect HTML BR attribute parsing code #1913 * broken overflow checks in RectArea #1906 * various memory leaks !1699 * Fix bad free in lefty !1709 * typo in pathcross #1926 * Out-of-bounds write caused by incorrect error handling of malloc in genUserdata #1928 * Offer .tar.xz files too #454 * Header file graphviz_version.h has no include guards #1929 * regression: newlines embedded in quoted labels / node names are not preserved in 2.46.0 #1931 * Properly fill graphviz_version.h !1706 * Cgraph's agxbuf API gained a new function agxbdisown(), for dissociating * backing memory from the managed buffer * Build system support for the Elbrus 2000 CPU, thanks to Michael Shigorin * Cgraph's agheap() API has been removed * Autotools build system support for eFence has been removed * Building Graphviz with ICC defaults to -O2 instead of -O0 * Build system work arounds for GCC 3 have been removed * Incomplete support for running the test suite under CMake has been removed * Portable source tarballs now use the “ustar” POSIX format * Minimum version of Flex required to build Graphviz is now 2.5.2 * Minimum version of Bison required to build Graphviz is now 3.0 * Minimum version of CMake required to build Graphviz using CMake is now 3.1 * gvpr: line numbers in gvpr errors/warnings are incorrect #1594 * URL typo in patchwork man page * Escaped backslashes are not correctly handled when producing xdot with dot #165 * heap-over-flow(off-by-null) in lib/common/shapes.c #1700 * Windows MSBuild executables have the wrong version #1745 * Cast Overflow at pango_textlayout #1314 * x11 back end segfaults if display is unavailable #1776 * typo in cmd/gvpr/lib/clustg #1781 * Segfault in dot #1783 * Incorrect 'Arrow type "s" unknown' error #1444 * segfault on reading 0x10 #1724 * Null-dereference READ (144736912) #1676 * "Warning! PATH too long installer unable to modify PATH!" using CMake Windows installer and PATH length > 1024 #1770 * gvedit -? gives "option - unrecognized - ignored" instead of showing usage #1813 * lefty is not built for Windows (fixed for MSBuild builds only) #1818 * a failure to detect OpenGL glGenTextures() errors has been corrected * sfio does compile time benchmarknig #1422 * iffe "lib" check always succeeds when compiler optimises #1521 * syntax error near text who is not present #1411 * Explicitly links with libstdc++; should allow libc++ if appropriate #163 * A macOS file that was erroneously excluded from portable source tarballs has * been restored * Add option -? for usage to diffimg * Add option -? for usage to dotty * Add option -? for usage to lneato * Add option -? for usage to vimdot * Fix smyrna -? to actually print usage instead of error * Fix edgepaint -? to actually print usage instead of error * Remove '"' from usage text in non-Windows version of dotty * Correct misspelled 'smyrna' in usage * Fix edgepaint -o option * Correct shebang of gvmap.sh to use ksh * Fix gvmap.sh -? option to exit with zero exit status * Graphviz doesn't build on MacOS with the latest libc++ #1785 * make fails if ps2pdf is not installed (using autotools) #1763 * multiple graphs to file output causes a segfault #1845 * lefty PTY functionality relies on file descriptor implementation details #1823 * buffer overflow in fdpgen * Crashes by VRML output when current directory is not writable #793 * Segmentation fault when newrank=true #1221 * sfdp craches #236 * fdp segmentation fault with GK=0 #1290 * fdp crash #1865 * Graphviz always crash with this simple dot file #167 * Seg fault in dot #1771 * gml2gv doesn't handle some attributes correctly #1869 * Add missing circo, fdp, neato, osage, patchwork, sfdp & twopi tools to Windows builds (copies of dot) * Add gv2gml tool to CMake (copy of gml2gv on Windows, symlink to gml2gv otherwise) * Regression: fdp generates internal names in the output #1876 * Regression: fdp assertion error on cluster in edge #1877 * Regression in id / <title> in svg for twopi #1907 - graphviz-2.46-fix-shebang.patch added to make rpmlint happy - graphviz-no_strict_aliasing.patch changed to be applicable to current files - configure without ghostscript to break new build cycle OBS-URL: https://build.opensuse.org/request/show/874532 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=153 --- graphviz-2.44.1.tar.gz | 3 - graphviz-2.44.1.tar.gz.md5 | 1 - graphviz-2.46-fix-shebang.patch | 8 +++ graphviz-2.46.1.tar.gz | 3 + graphviz-2.46.1.tar.gz.md5 | 1 + graphviz-no_strict_aliasing.patch | 13 ++--- graphviz.changes | 91 +++++++++++++++++++++++++++++++ graphviz.spec | 11 ++-- 8 files changed, 115 insertions(+), 16 deletions(-) delete mode 100644 graphviz-2.44.1.tar.gz delete mode 100644 graphviz-2.44.1.tar.gz.md5 create mode 100644 graphviz-2.46-fix-shebang.patch create mode 100644 graphviz-2.46.1.tar.gz create mode 100644 graphviz-2.46.1.tar.gz.md5 diff --git a/graphviz-2.44.1.tar.gz b/graphviz-2.44.1.tar.gz deleted file mode 100644 index 64ef855..0000000 --- a/graphviz-2.44.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313 -size 34079677 diff --git a/graphviz-2.44.1.tar.gz.md5 b/graphviz-2.44.1.tar.gz.md5 deleted file mode 100644 index 8e031d9..0000000 --- a/graphviz-2.44.1.tar.gz.md5 +++ /dev/null @@ -1 +0,0 @@ -96792adafea5cc6879060c400da31ea3 graphviz-2.44.1.tar.gz diff --git a/graphviz-2.46-fix-shebang.patch b/graphviz-2.46-fix-shebang.patch new file mode 100644 index 0000000..9edd326 --- /dev/null +++ b/graphviz-2.46-fix-shebang.patch @@ -0,0 +1,8 @@ +--- graphviz-2.46.1/cmd/gvmap/gvmap.sh.orig 2021-02-18 18:41:12.414357238 +0100 ++++ graphviz-2.46.1/cmd/gvmap/gvmap.sh 2021-02-18 18:41:23.626463135 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env ksh ++#!/usr/bin/ksh + + # Script for gvmap pipeline + # Use -A to add flags for gvmap; e.g., -Ae results in gvmap -e diff --git a/graphviz-2.46.1.tar.gz b/graphviz-2.46.1.tar.gz new file mode 100644 index 0000000..05e25c7 --- /dev/null +++ b/graphviz-2.46.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:931ed197bc833aec8501d66194b01620dd395130c380e350a6ec1b31e4866eac +size 34065777 diff --git a/graphviz-2.46.1.tar.gz.md5 b/graphviz-2.46.1.tar.gz.md5 new file mode 100644 index 0000000..8c11151 --- /dev/null +++ b/graphviz-2.46.1.tar.gz.md5 @@ -0,0 +1 @@ +a6d59382072fec4c08fc2e6c1da8ae8b graphviz-2.46.1.tar.gz diff --git a/graphviz-no_strict_aliasing.patch b/graphviz-no_strict_aliasing.patch index 094a693..ea4698d 100644 --- a/graphviz-no_strict_aliasing.patch +++ b/graphviz-no_strict_aliasing.patch @@ -1,9 +1,8 @@ ---- .orig/lib/vmalloc/Makefile.am 2019-04-02 14:39:35.873818775 +0200 -+++ lib/vmalloc/Makefile.am 2019-04-02 14:50:07.659001790 +0200 -@@ -9,4 +9,6 @@ - vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \ - vmtrace.c vmwalk.c +--- graphviz-2.46.1/lib/vmalloc/Makefile.am.orig 2021-02-18 17:44:23.990163756 +0100 ++++ graphviz-2.46.1/lib/vmalloc/Makefile.am 2021-02-18 17:46:38.615438829 +0100 +@@ -9,4 +9,5 @@ + vmopen.c \ + vmstrdup.c +libvmalloc_C_la_CFLAGS = -fno-strict-aliasing -+ - EXTRA_DIST = README vmalloc.vcxproj* + EXTRA_DIST = vmalloc.vcxproj* diff --git a/graphviz.changes b/graphviz.changes index 7a8cfdb..3cb42cf 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,94 @@ +------------------------------------------------------------------- +Thu Feb 18 18:04:09 UTC 2021 - Christian Vögl + +- Update to new release 2.46.1 (changes since 2.44.1) + * Support for building against Guile 2.2 + * Portable source is now also offered as a .tar.xz + * CentOS/RHEL 6 is no longer supported + * Vestiges of Qt4 support have been removed + * C++11 support is now required of the C++ compiler used to build Graphviz + * C99 support is now required of the C compiler used to build Graphviz + * Question about userout() function in agerror.c #1924 + * The minimum version of Python required to run the test suite is 3.6 + * memory leak in label construction + * gvedit compilation errors out, but works if manually compiled with qt5 #1862 + * incorrect HTML BR attribute parsing code #1913 + * broken overflow checks in RectArea #1906 + * various memory leaks !1699 + * Fix bad free in lefty !1709 + * typo in pathcross #1926 + * Out-of-bounds write caused by incorrect error handling of malloc in genUserdata #1928 + * Offer .tar.xz files too #454 + * Header file graphviz_version.h has no include guards #1929 + * regression: newlines embedded in quoted labels / node names are not preserved in 2.46.0 #1931 + * Properly fill graphviz_version.h !1706 + * Cgraph's agxbuf API gained a new function agxbdisown(), for dissociating + * backing memory from the managed buffer + * Build system support for the Elbrus 2000 CPU, thanks to Michael Shigorin + * Cgraph's agheap() API has been removed + * Autotools build system support for eFence has been removed + * Building Graphviz with ICC defaults to -O2 instead of -O0 + * Build system work arounds for GCC 3 have been removed + * Incomplete support for running the test suite under CMake has been removed + * Portable source tarballs now use the “ustar” POSIX format + * Minimum version of Flex required to build Graphviz is now 2.5.2 + * Minimum version of Bison required to build Graphviz is now 3.0 + * Minimum version of CMake required to build Graphviz using CMake is now 3.1 + * gvpr: line numbers in gvpr errors/warnings are incorrect #1594 + * URL typo in patchwork man page + * Escaped backslashes are not correctly handled when producing xdot with dot #165 + * heap-over-flow(off-by-null) in lib/common/shapes.c #1700 + * Windows MSBuild executables have the wrong version #1745 + * Cast Overflow at pango_textlayout #1314 + * x11 back end segfaults if display is unavailable #1776 + * typo in cmd/gvpr/lib/clustg #1781 + * Segfault in dot #1783 + * Incorrect 'Arrow type "s" unknown' error #1444 + * segfault on reading 0x10 #1724 + * Null-dereference READ (144736912) #1676 + * "Warning! PATH too long installer unable to modify PATH!" using CMake Windows installer and PATH length > 1024 #1770 + * gvedit -? gives "option - unrecognized - ignored" instead of showing usage #1813 + * lefty is not built for Windows (fixed for MSBuild builds only) #1818 + * a failure to detect OpenGL glGenTextures() errors has been corrected + * sfio does compile time benchmarknig #1422 + * iffe "lib" check always succeeds when compiler optimises #1521 + * syntax error near text who is not present #1411 + * Explicitly links with libstdc++; should allow libc++ if appropriate #163 + * A macOS file that was erroneously excluded from portable source tarballs has + * been restored + * Add option -? for usage to diffimg + * Add option -? for usage to dotty + * Add option -? for usage to lneato + * Add option -? for usage to vimdot + * Fix smyrna -? to actually print usage instead of error + * Fix edgepaint -? to actually print usage instead of error + * Remove '"' from usage text in non-Windows version of dotty + * Correct misspelled 'smyrna' in usage + * Fix edgepaint -o option + * Correct shebang of gvmap.sh to use ksh + * Fix gvmap.sh -? option to exit with zero exit status + * Graphviz doesn't build on MacOS with the latest libc++ #1785 + * make fails if ps2pdf is not installed (using autotools) #1763 + * multiple graphs to file output causes a segfault #1845 + * lefty PTY functionality relies on file descriptor implementation details #1823 + * buffer overflow in fdpgen + * Crashes by VRML output when current directory is not writable #793 + * Segmentation fault when newrank=true #1221 + * sfdp craches #236 + * fdp segmentation fault with GK=0 #1290 + * fdp crash #1865 + * Graphviz always crash with this simple dot file #167 + * Seg fault in dot #1771 + * gml2gv doesn't handle some attributes correctly #1869 + * Add missing circo, fdp, neato, osage, patchwork, sfdp & twopi tools to Windows builds (copies of dot) + * Add gv2gml tool to CMake (copy of gml2gv on Windows, symlink to gml2gv otherwise) + * Regression: fdp generates internal names in the output #1876 + * Regression: fdp assertion error on cluster in edge #1877 + * Regression in id / <title> in svg for twopi #1907 +- graphviz-2.46-fix-shebang.patch added to make rpmlint happy +- graphviz-no_strict_aliasing.patch changed to be applicable to current files +- configure without ghostscript to break new build cycle + ------------------------------------------------------------------- Thu Dec 31 16:07:29 UTC 2020 - Arjen de Korte diff --git a/graphviz.spec b/graphviz.spec index 22ea754..bc8fc00 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,7 +1,7 @@ # # spec file for package graphviz # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,7 +54,7 @@ %endif %bcond_without python2 Name: graphviz%{psuffix} -Version: 2.44.1 +Version: 2.46.1 Release: 0 Summary: Graph Visualization Tools License: EPL-1.0 @@ -74,6 +74,7 @@ Patch6: graphviz-2.20.2-interpreter_names.patch Patch7: graphviz-useless_warnings.patch Patch8: graphviz-no_strict_aliasing.patch Patch9: graphviz-no_php_extra_libs.patch +Patch10: graphviz-2.46-fix-shebang.patch BuildRequires: autoconf BuildRequires: automake @@ -81,7 +82,6 @@ BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ -BuildRequires: ghostscript BuildRequires: groff BuildRequires: guile-devel BuildRequires: libstdc++-devel @@ -343,8 +343,9 @@ programs that use the graphviz libraries including man3 pages. %patch6 %patch7 -%patch8 +%patch8 -p1 %patch9 +%patch10 -p1 # pkg-config returns 0 (TRUE) when guile-2.2 is present if pkg-config --atleast-version=2.2 guile-2.2; then @@ -383,6 +384,7 @@ export LDFLAGS="-pie" --without-ming \ --disable-io \ --without-visio \ + --without-ghostscript \ %if "%{flavor}" == "addons" %if %{with python2} --enable-python2 \ @@ -548,7 +550,6 @@ fi %{_bindir}/dot -c 2>/dev/null %files -n graphviz-gnome -%{_libdir}/graphviz/libgvplugin_gs* %{_libdir}/graphviz/libgvplugin_rsvg* %{_libdir}/graphviz/libgvplugin_pango* %{_libdir}/graphviz/libgvplugin_gtk*