From bf952b35a98b53f7798567e0c2b6277967d145cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Sep 2023 14:40:15 +0200 Subject: [PATCH] Doxygen fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- graphviz-9.0.0-doxygen-fix.patch | 60 ++++++++++++++++++++++++++++++++ graphviz.spec | 2 ++ 2 files changed, 62 insertions(+) create mode 100644 graphviz-9.0.0-doxygen-fix.patch diff --git a/graphviz-9.0.0-doxygen-fix.patch b/graphviz-9.0.0-doxygen-fix.patch new file mode 100644 index 0000000..03bffb4 --- /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.spec b/graphviz.spec index cc15f0c..f9f7c95 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -207,6 +207,8 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig # rhbz#1838679 Patch0: graphviz-4.0.0-gvpack-neato-static.patch +# https://gitlab.com/graphviz/graphviz/-/issues/2448 +Patch1: graphviz-9.0.0-doxygen-fix.patch %if ! %{JAVA} Obsoletes: graphviz-java < %{version}-%{release}