From c93c1d471131458b5492ac668705593c257c7010b2dae69683767c34e7833a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Mon, 16 Aug 2021 13:40:06 +0000 Subject: [PATCH] Accepting request 912413 from home:cvoegl:branches:graphics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Dropped python2 subpackages as the bindings are removed in 2.48 - Update to version 2.48.0 (changes since 2.47.1) * marginally more accurate computations in Smyrna sphere projection * Perl is no longer required to build Graphviz #2067 * nop more reliably returns success and failure exit statuses * implicit 63 character limit on plugin names is removed in GVC * remove Python 2 bindings #1992 * improved thread-safety in Graphviz bindings Makefile * the CMake build system now enables -Wextra when building C++ * some Cgraph functions that take char* arguments that they do not modify have been updated to take const char* arguments #634 * incorrectly using the layout attribute on anything other than a graph now results in a warning about this being invalid #2078 * edgepaint accepts more standard -- prefixed command line arguments and rejects invalid options #1971 * improved detection of Lefty dependencies in the Autotools build system * Fix: out of bounds read when attempting to load a plugin whose name is ≥63 characters * Fix: out of bounds read when examining a registered plugin whose name is ≥63 characters * Fix: do not fclose(NULL) in gvmap * Fix: Uninitialized variable read in delaunay_tri potentially mismatched format string in tclpkg * Fix: ortho's eqEndSeg incorrectly modifies its arguments #2047 * Fix: Autotools enables -Wtrampolines and -Wlogical-op for Clang #2066 * Fix: node_distinct_coloring failure due to out-of-memory now reported correctly instead of referring to a failure to open lab_gamut * Fix: a typo GD_LIBS to GDLIB_LIBS in tclpkg/tcldot/Makefile.am !2022 * Fix: Autotools build system sets libgd variables now instead of incorrectly setting GTK variables * Fix: HTML strings used as labels are distinguishable in GXL output by kind="HTML-like string" * Fix: a Bashism removed from the Autotools build system * Fix: when Criterion is available, the command_line test binary is no longer built and installed by default, but rather during make check * Fix: round-tripping a file through gv2gxl and then gxl2gv no longer causes HTML-like labels to become non-HTML like labels #517 * Fix: fix ODR violation by including the ortho object files in the gvc lib also for CMake and MSbuild #2096 OBS-URL: https://build.opensuse.org/request/show/912413 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=168 --- graphviz-2.20.2-interpreter_names.patch | 12 +------- graphviz-2.47.1.tar.bz2 | 3 -- graphviz-2.48.0.tar.bz2 | 3 ++ graphviz.changes | 39 +++++++++++++++++++++++++ graphviz.spec | 33 ++------------------- 5 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 graphviz-2.47.1.tar.bz2 create mode 100644 graphviz-2.48.0.tar.bz2 diff --git a/graphviz-2.20.2-interpreter_names.patch b/graphviz-2.20.2-interpreter_names.patch index 5bf4ca8..366cc35 100644 --- a/graphviz-2.20.2-interpreter_names.patch +++ b/graphviz-2.20.2-interpreter_names.patch @@ -7,14 +7,4 @@ Index: tclpkg/gv/demo/modgraph.lua +#!/usr/bin/lua5.1 -- display the kernel module dependencies - -Index: tclpkg/gv/demo/modgraph.py -=================================================================== ---- tclpkg/gv/demo/modgraph.py.orig -+++ tclpkg/gv/demo/modgraph.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - # display the kernel module dependencies - + \ No newline at end of file diff --git a/graphviz-2.47.1.tar.bz2 b/graphviz-2.47.1.tar.bz2 deleted file mode 100644 index 1613dc7..0000000 --- a/graphviz-2.47.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e151a039113a0f1ff871185ef760ec67fbc30144ea25a5024c3ee42d0aa9b01e -size 27711428 diff --git a/graphviz-2.48.0.tar.bz2 b/graphviz-2.48.0.tar.bz2 new file mode 100644 index 0000000..763a9c0 --- /dev/null +++ b/graphviz-2.48.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ba7b075c3820e7a40fbc8879ad25621f65a6f5fec79e41c7987650ac3f727ae +size 27345187 diff --git a/graphviz.changes b/graphviz.changes index 7bdddc7..bd23ca4 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Wed Aug 11 12:00:16 UTC 2021 - Christian Vögl +- Dropped python2 subpackages as the bindings are removed in 2.48 +- Update to version 2.48.0 (changes since 2.47.1) + * marginally more accurate computations in Smyrna sphere projection + * Perl is no longer required to build Graphviz #2067 + * nop more reliably returns success and failure exit statuses + * implicit 63 character limit on plugin names is removed in GVC + * remove Python 2 bindings #1992 + * improved thread-safety in Graphviz bindings Makefile + * the CMake build system now enables -Wextra when building C++ + * some Cgraph functions that take char* arguments that they do not modify have + been updated to take const char* arguments #634 + * incorrectly using the layout attribute on anything other than a graph now + results in a warning about this being invalid #2078 + * edgepaint accepts more standard -- prefixed command line arguments and + rejects invalid options #1971 + * improved detection of Lefty dependencies in the Autotools build system + * Fix: out of bounds read when attempting to load a plugin whose name is ≥63 characters + * Fix: out of bounds read when examining a registered plugin whose name is ≥63 characters + * Fix: do not fclose(NULL) in gvmap + * Fix: Uninitialized variable read in delaunay_tri + potentially mismatched format string in tclpkg + * Fix: ortho's eqEndSeg incorrectly modifies its arguments #2047 + * Fix: Autotools enables -Wtrampolines and -Wlogical-op for Clang #2066 + * Fix: node_distinct_coloring failure due to out-of-memory now reported correctly + instead of referring to a failure to open lab_gamut + * Fix: a typo GD_LIBS to GDLIB_LIBS in tclpkg/tcldot/Makefile.am !2022 + * Fix: Autotools build system sets libgd variables now instead of incorrectly setting + GTK variables + * Fix: HTML strings used as labels are distinguishable in GXL output by kind="HTML-like string" + * Fix: a Bashism removed from the Autotools build system + * Fix: when Criterion is available, the command_line test binary is no longer built + and installed by default, but rather during make check + * Fix: round-tripping a file through gv2gxl and then gxl2gv no longer causes + HTML-like labels to become non-HTML like labels #517 + * Fix: fix ODR violation by including the ortho object files in the gvc lib also for + CMake and MSbuild #2096 + ------------------------------------------------------------------- Mon Jun 28 06:30:57 UTC 2021 - Steve Kowalik diff --git a/graphviz.spec b/graphviz.spec index fa89794..03a2880 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package graphviz # # Copyright (c) 2021 SUSE LLC # @@ -52,9 +52,8 @@ %else %define sle12 0 %endif -%bcond_without python2 Name: graphviz%{psuffix} -Version: 2.47.1 +Version: 2.48.0 Release: 0 Summary: Graph Visualization Tools License: EPL-1.0 @@ -123,9 +122,6 @@ BuildRequires: pkgconfig(libglade-2.0) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pango) -%if %{with python2} -BuildRequires: pkgconfig(python) -%endif BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(tcl) @@ -254,15 +250,6 @@ Requires: php(zend-abi) = %{php_zend_api} The graphviz-php package contains the PHP extension for the graphviz tools. -%package -n python2-gv -Summary: Python Extension for Graphviz -Group: Productivity/Graphics/Visualization/Graph -Requires: graphviz = %{version} - -%description -n python2-gv -The package contains the Python extension for the -graphviz tools. - %package -n python3-gv Summary: Python 3 Extension for Graphviz Group: Productivity/Graphics/Visualization/Graph @@ -395,12 +382,6 @@ export LDFLAGS="-pie" --disable-io \ --without-visio \ %if "%{flavor}" == "addons" -%if %{with python2} - --enable-python2 \ -%else - --disable-python \ - --disable-python2 \ -%endif --with-x \ --with-qt \ --with-smyrna \ @@ -616,16 +597,6 @@ fi %{_mandir}/man3/gv.3php%{ext_man} %config(noreplace) %{phpconf_dir}/gv.ini -%if %{with python2} -%files -n python2-gv -%dir %{_libdir}/graphviz/python2 -%{python_sitearch}/_gv.so -%{python_sitearch}/gv.py -%{_libdir}/graphviz/python2/_gv.so -%{_libdir}/graphviz/python2/gv.py -%{_libdir}/graphviz/python2/libgv_python2.so -%endif - %files -n python3-gv %dir %{_libdir}/graphviz/python3 %{python3_sitearch}/_gv.so