Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package graphviz for openSUSE:Factory checked in at 2021-04-14 10:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/graphviz (Old) and /work/SRC/openSUSE:Factory/.graphviz.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "graphviz" Wed Apr 14 10:10:14 2021 rev:82 rq:883878 version:2.46.1 Changes: -------- --- /work/SRC/openSUSE:Factory/graphviz/graphviz.changes 2020-04-05 20:51:33.365068437 +0200 +++ /work/SRC/openSUSE:Factory/.graphviz.new.2401/graphviz.changes 2021-04-14 10:10:33.309450741 +0200 @@ -1,0 +2,164 @@ +Thu Apr 8 16:01:30 UTC 2021 - Christian V??gl <[email protected]> + +- Buildrequire full ghostscript in the addons package + to avoid a conflict betwen ghostcript-mini and ghostscript-devel + +------------------------------------------------------------------- +Tue Mar 16 10:56:53 UTC 2021 - Christian V??gl <[email protected]> + +- Replace ghostscript-mini dependency with ghostscript_any + +------------------------------------------------------------------- +Mon Mar 1 13:55:28 UTC 2021 - Christian V??gl <[email protected]> + +- Add graphviz-webp package to for webp image support + +------------------------------------------------------------------- +Tue Feb 23 16:10:57 UTC 2021 - Christian V??gl <[email protected]> + +- Reenable ghostscript, but require just ghostscript-mini + +------------------------------------------------------------------- +Thu Feb 18 18:04:09 UTC 2021 - Christian V??gl <[email protected]> + +- 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 +- Update source URLs + +------------------------------------------------------------------- +Thu Dec 31 16:07:29 UTC 2020 - Arjen de Korte <[email protected]> + +- Use _multibuild to build graphviz and graphviz-addons in a single + development project + - graphviz-addons.changes + - graphviz-addons.spec + +------------------------------------------------------------------- +Thu Dec 31 14:30:11 UTC 2020 - Arjen de Korte <[email protected]> + +- Update to new release 2.44.1 (changes since 2.42.3) + * applied RH patches (from graphviz-2.42.2-8.fc32.src.rpm) + * some allocation failures that could previously allow memory + corruption now exit + * lab_gamut.3.pdf is no longer included in release archives + * Fixed Neato's hier mode is broken since v2.44.0 + * Fixed segmentation fault (core dumped) + * New SGD mode in neato + * Add pkg-config files + * tred: add feature to output removed edges to stderr upon request + * Workaround: avoid creating a virtual edge loop. + * Add riscv64 to host_cpu configure.ac + * lib/cgraph: include empty malloc.h from subdir include + * lib/gvpr: compile mkdefs with $(HOSTCC) rather than $(CC) + * lib/vpsc: rename bcopy->b_copy + * Fixed the NativeCodeAnalysis task failed unexpectedly. + * Include all test files in distro + * host_cpu add mips64 platform + * Correct description of 'port' syntax in manual + * svg output displays TITLE of %3 if graph had no name + * XML errors in generated SVG when URL attribute contains + ampersand (&) + * Test files missing from source distributions + * SVG error for "g.transform.scale " in graphviz version 2.43 +- BuildRequires for ghostscript and groff (generate cdt documentation) +- Extension graphviz-php changes: + * Require php(api) and php(zend-abi) to guarantee ABI compatibility + * Don't pull in extra libraries from PHP + + graphviz-no_php_extra_libs.patch + * Remove argon2-devel from list of dependencies + * Automatically enable extension when installed by providing + /etc/php{5,7}/conf.d/gv.ini + +------------------------------------------------------------------- +Tue Mar 31 13:07:32 UTC 2020 - Tom???? Chv??tal <[email protected]> + +- Rename python*-graphviz to python*-gv, there is also normal + pypi graphviz package and we clash otherwise and override + each other + +------------------------------------------------------------------- Old: ---- graphviz-2.42.3.tar.gz graphviz-addons.changes graphviz-addons.spec New: ---- _multibuild graphviz-2.46-fix-shebang.patch graphviz-2.46.1.tar.gz graphviz-no_php_extra_libs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.yyexqh/_old 2021-04-14 10:10:34.497452748 +0200 +++ /var/tmp/diff_new_pack.yyexqh/_new 2021-04-14 10:10:34.501452754 +0200 @@ -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 @@ -16,24 +16,33 @@ # +%global flavor @BUILD_FLAVOR@%{nil} + +%if "%{flavor}" == "addons" +%define psuffix -%{flavor} +%else +%define psuffix %{nil} +%endif + #fixes build failure caused by new .debug files, not sure how to fix correctly %define mname graphviz %define libname libgraphviz6 # name of the plugin config file that dot creates %define config_file config6 -# Build with extras or not, determines pulling additional dependencies -# and breaks build cycle -%bcond_with extras # Java and ocaml are not in ring1, thus this gets overriden in staging %bcond_without java %bcond_with ocaml +%if "%{flavor}" == "addons" # PHP7 requires swig >= 3.0.11, not available on Leap 42.x %if 0%{?suse_version} >= 1500 %define php_version 7 %else %define php_version 5 %endif +%define phpconf_dir %{_sysconfdir}/php%{php_version}/conf.d +%define phpext_dir %(%{__php_config} --extension-dir) +%endif %define ruby_version $(pkg-config --variable=RUBY_API_VERSION %{_libdir}/pkgconfig/ruby-*.pc) @@ -43,15 +52,16 @@ %else %define sle12 0 %endif -Name: graphviz -Version: 2.42.3 +%bcond_without python2 +Name: graphviz%{psuffix} +Version: 2.46.1 Release: 0 Summary: Graph Visualization Tools License: EPL-1.0 Group: Productivity/Graphics/Visualization/Graph -URL: http://www.graphviz.org/ -Source: https://www2.graphviz.org/Packages/stable/portable_source/graphviz-%{version}.tar.gz -Source2: graphviz-rpmlintrc +URL: https://www.graphviz.org/ +Source0: https://gitlab.com/graphviz/graphviz/-/archive/2.46.1/graphviz-%{version}.tar.gz +Source1: graphviz-rpmlintrc #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL Patch1: graphviz-smyrna-link_against_glu.patch Patch2: graphviz-fix-pkgIndex.patch @@ -62,6 +72,8 @@ #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code 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 @@ -69,6 +81,7 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: groff BuildRequires: guile-devel BuildRequires: libstdc++-devel BuildRequires: libtool @@ -80,14 +93,14 @@ BuildRequires: pkgconfig(zlib) Requires: graphviz-plugins-core = %{version} Recommends: graphviz-gd = %{version} -%if %{with extras} -BuildRequires: argon2-devel +%if "%{flavor}" == "addons" BuildRequires: freeglut-devel +BuildRequires: ghostscript BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libwebp-devel BuildRequires: perl -BuildRequires: python3-devel %if 0%{?suse_version} >= 1500 BuildRequires: php7-devel BuildRequires: swig >= 3.0.11 @@ -112,7 +125,10 @@ 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) BuildRequires: pkgconfig(x11) @@ -124,6 +140,8 @@ %if %{with ocaml} BuildRequires: ocaml %endif +%else # if "{flavor}" == "addons" +BuildRequires: ghostscript_any %endif %description @@ -231,19 +249,31 @@ Group: Productivity/Graphics/Visualization/Graph Requires: graphviz = %{version} Requires: php%{php_version} +Requires: php(api) = %{php_core_api} +Requires: php(zend-abi) = %{php_zend_api} %description -n graphviz-php The graphviz-php package contains the PHP extension for the graphviz tools. -%package -n graphviz-python +%package -n python2-gv Summary: Python Extension for Graphviz Group: Productivity/Graphics/Visualization/Graph Requires: graphviz = %{version} -Requires: python -%description -n graphviz-python -The graphviz-python package contains the Python extension for the +%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 +Requires: graphviz = %{version} +Provides: graphviz-python +Obsoletes: graphviz-python + +%description -n python3-gv +The package contains the Python extension for the graphviz tools. %package -n graphviz-ruby @@ -267,6 +297,18 @@ The graphviz-tcl package contains the various tcl packages (extensions) for the graphviz tools. +%package -n graphviz-webp +Summary: WebP support for graphviz +Group: Productivity/Graphics/Visualization/Graph +Requires: graphviz = %{version} +Requires: graphviz-gnome = %{version} +Requires: libwebp7 + +%description -n graphviz-webp +The graphviz-webp package contains files needed for the support of WebP images + + + %package -n graphviz-doc Summary: Documentation for graphviz Group: Documentation/Howto @@ -316,7 +358,9 @@ %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 @@ -336,7 +380,7 @@ ./autogen.sh RUBY_VER=%{ruby_version} CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" -%if %{with extras} +%if "%{flavor}" == "addons" CFLAGS="$CFLAGS -I/usr/include/ruby-%{ruby_version}.0" #seems to be broken? gives -I/usr/lib64/ruby/2.6.0/x86_64-linux-gnu, ruby.h is in /usr/lib64/ruby/2.6.0 @@ -355,7 +399,13 @@ --without-ming \ --disable-io \ --without-visio \ -%if %{with extras} +%if "%{flavor}" == "addons" +%if %{with python2} + --enable-python2 \ +%else + --disable-python \ + --disable-python2 \ +%endif --with-x \ --with-qt \ --with-smyrna \ @@ -409,7 +459,13 @@ # There are no such binaries distributed by us rm -f %{buildroot}%{_mandir}/man1/mingle.1 -%if %{with extras} +%if "%{flavor}" == "addons" +mkdir -p %{buildroot}/%{phpconf_dir} +cat > %{buildroot}%{phpconf_dir}/gv.ini <<EOF +; comment out next line to disable gv extension in php +extension = gv.so +EOF + # Fix doc location cp -a %{buildroot}%{_datadir}/%{mname}/doc %{buildroot}%{_defaultdocdir}/%{mname}-doc %fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}-doc @@ -476,7 +532,7 @@ %postun -n %{libname} -p /sbin/ldconfig -%if %{with extras} +%if "%{flavor}" == "addons" %files -n graphviz-gvedit %license COPYING %{_bindir}/gvedit @@ -518,6 +574,12 @@ %post -n graphviz-tcl -p /sbin/ldconfig %postun -n graphviz-tcl -p /sbin/ldconfig +%post -n graphviz-webp +%{_bindir}/dot -c + +%postun -n graphviz-webp +%{_bindir}/dot -c 2>/dev/null + %files -n graphviz-guile %{_libdir}/graphviz/guile %{_mandir}/man3/gv.3guile%{ext_man} @@ -554,18 +616,23 @@ %{_mandir}/man3/gv.3perl%{ext_man} %files -n graphviz-php -%{_libdir}/php%{php_version}/extensions/gv.so +%{phpext_dir}/gv.so %{_datadir}/php%{php_version}/gv.php %{_mandir}/man3/gv.3php%{ext_man} +%config(noreplace) %{phpconf_dir}/gv.ini -%files -n graphviz-python +%if %{with python2} +%files -n python2-gv %dir %{_libdir}/graphviz/python2 -%dir %{_libdir}/graphviz/python3 %{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 %{python3_sitearch}/gv.py %{_libdir}/graphviz/python3/_gv.so @@ -587,6 +654,9 @@ %{_datadir}/tcl/%{mname}/pkgIndex.tcl %{_mandir}/man3/*.3tcl* +%files -n graphviz-webp +%{_libdir}/graphviz/libgvplugin_webp.so* + %files -n graphviz-doc %docdir %{_defaultdocdir}/%{mname}-doc %{_defaultdocdir}/%{mname}-doc ++++++ _multibuild ++++++ <multibuild> <package>addons</package> </multibuild> ++++++ graphviz-2.46-fix-shebang.patch ++++++ --- 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 ++++++ graphviz-2.42.3.tar.gz -> graphviz-2.46.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/graphviz/graphviz-2.42.3.tar.gz /work/SRC/openSUSE:Factory/.graphviz.new.2401/graphviz-2.46.1.tar.gz differ: char 5, line 1 ++++++ graphviz-no_php_extra_libs.patch ++++++ --- configure.ac 2019-07-13 05:14:04.000000000 +0200 +++ configure.ac 2020-12-31 13:46:52.374560516 +0100 @@ -1116,7 +1116,7 @@ else PHP_INCLUDES="`$PHPCONFIG --includes`" PHP_INSTALL_DIR="`$PHPCONFIG --extension-dir`" PHP_INSTALL_DATADIR="/usr/share/php" - PHP_LIBS="`$PHPCONFIG --ldflags` `$PHPCONFIG --libs`" + PHP_LIBS="`$PHPCONFIG --ldflags`" save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" AC_CHECK_HEADER(php.h,,[ ++++++ graphviz-no_strict_aliasing.patch ++++++ --- /var/tmp/diff_new_pack.yyexqh/_old 2021-04-14 10:10:34.569452869 +0200 +++ /var/tmp/diff_new_pack.yyexqh/_new 2021-04-14 10:10:34.569452869 +0200 @@ -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*
