diff --git a/graphviz-9.0.0-doxygen-fix.patch b/graphviz-9.0.0-doxygen-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..03bffb4a78a76bd3cf202c431d0cd40f2636337b --- /dev/null +++ b/graphviz-9.0.0-doxygen-fix.patch @@ -0,0 +1,60 @@ +diff --git a/Doxyfile b/Doxyfile +index d9442cf..14c1015 100644 +--- a/Doxyfile ++++ b/Doxyfile +@@ -68,7 +68,7 @@ PROJECT_LOGO = + # entered, it will be relative to the location where doxygen was started. If + # left blank the current directory will be used. + +-OUTPUT_DIRECTORY = graphviz/public ++OUTPUT_DIRECTORY = ./public + + # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 + # sub-directories (in 2 levels) under the output directory of each output format +@@ -911,11 +911,11 @@ WARN_LOGFILE = + # because doxygen builds directory dependency graphs only for root children, + # but not for root directory itself. + +-INPUT = graphviz/cmd \ +- graphviz/lib \ +- graphviz/dot.demo \ +- graphviz/plugin \ +- graphviz/tclpkg ++INPUT = ./cmd \ ++ ./lib \ ++ ./dot.demo \ ++ ./plugin \ ++ ./tclpkg + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +diff --git a/Doxyfile.in b/Doxyfile.in +index 050f623..a86c859 100644 +--- a/Doxyfile.in ++++ b/Doxyfile.in +@@ -68,7 +68,7 @@ PROJECT_LOGO = + # entered, it will be relative to the location where doxygen was started. If + # left blank the current directory will be used. + +-OUTPUT_DIRECTORY = graphviz/public ++OUTPUT_DIRECTORY = ./public + + # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 + # sub-directories (in 2 levels) under the output directory of each output format +@@ -911,11 +911,11 @@ WARN_LOGFILE = + # because doxygen builds directory dependency graphs only for root children, + # but not for root directory itself. + +-INPUT = graphviz/cmd \ +- graphviz/lib \ +- graphviz/dot.demo \ +- graphviz/plugin \ +- graphviz/tclpkg ++INPUT = ./cmd \ ++ ./lib \ ++ ./dot.demo \ ++ ./plugin \ ++ ./tclpkg + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/graphviz-8.0.5.tar.xz b/graphviz-9.0.0.tar.xz similarity index 69% rename from graphviz-8.0.5.tar.xz rename to graphviz-9.0.0.tar.xz index c2506848874c388e164069250d7ad9c6966f179e..ad09336bc1e6b345fd9ef91c255839b9eef9dd08 100644 Binary files a/graphviz-8.0.5.tar.xz and b/graphviz-9.0.0.tar.xz differ diff --git a/graphviz.spec b/graphviz.spec index 7d8ad039d6ac73b1327273d02d9d6cf3246fd557..b907e04060f5462c14f175eb869d1f35f88f87d0 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 %undefine _package_note_flags # temporal drop of PHP support due to https://gitlab.com/graphviz/graphviz/-/issues/2277 %bcond_with php @@ -49,7 +49,7 @@ Name: graphviz Summary: Graph Visualization Tools -Version: 8.0.5 +Version: 9.0.0 Release: %{anolis_release}%{?dist} License: EPL-1.0 URL: http://www.graphviz.org/ @@ -146,6 +146,7 @@ Requires: xorg-x11-fonts-ISO8859-1-100dpi Patch0: graphviz-4.0.0-gvpack-neato-static.patch Patch1: add-loongarch64-support-for-graphviz.patch Patch2: graphviz-fix-CVE-2023-46045.patch +Patch3: graphviz-9.0.0-doxygen-fix.patch %if ! %{JAVA} Obsoletes: graphviz-java < %{version}-%{release} @@ -657,6 +658,12 @@ php --no-php-ini \ %endif %changelog +* Wed Mar 19 2025 mgb01105731 - 9.0.0-1 +- Update to 9.0.0 from 8.0.5 +- Add patches to fix build doxygen err + [Patches cherry-pick from c10s. Original changelog: + - Doxygen fix(9.0.0-1)] + * Fri Aug 02 2024 dash - 8.0.5-3 - fix CVE-2023-46045