[gazebo] Disable latex documentation

rmattes rmattes at fedoraproject.org
Fri Jul 18 00:56:57 UTC 2014


commit 50d99537470a5d4307a476814069e0feadb5b2b3
Author: Rich Mattes <richmattes at gmail.com>
Date:   Thu Jul 17 20:57:16 2014 -0400

    Disable latex documentation

 gazebo-2.1.0-latex.patch |   27 --------------------------
 gazebo-3.0.0-latex.patch |   47 ++++++++++++++++++++++++++++++++++++++++++++++
 gazebo.spec              |   17 +--------------
 3 files changed, 49 insertions(+), 42 deletions(-)
---
diff --git a/gazebo-3.0.0-latex.patch b/gazebo-3.0.0-latex.patch
new file mode 100644
index 0000000..5190d83
--- /dev/null
+++ b/gazebo-3.0.0-latex.patch
@@ -0,0 +1,47 @@
+diff -up ./doc/CMakeLists.txt.latex ./doc/CMakeLists.txt
+--- ./doc/CMakeLists.txt.latex	2014-04-12 07:21:03.000000000 -0400
++++ ./doc/CMakeLists.txt	2014-07-17 18:41:17.652653181 -0400
+@@ -10,21 +10,23 @@ if (DOXYGEN_FOUND)
+   add_custom_target(doc
+ 
+     # Generate the API documentation
+-    ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/gazebo.dox
++    ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/gazebo.dox || /bin/true
+     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+     COMMAND cp ${CMAKE_SOURCE_DIR}/doc/gazebo_logo.png
+             ${CMAKE_BINARY_DIR}/doxygen/html
+     COMMAND cp ${CMAKE_SOURCE_DIR}/doc/search.js
+             ${CMAKE_BINARY_DIR}/doxygen/html/search
+-    COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen/latex
+-    COMMAND mv ${CMAKE_BINARY_DIR}/doxygen/latex/refman.pdf
+-            ${CMAKE_BINARY_DIR}/doxygen/latex/gazebo-${GAZEBO_VERSION_FULL}.pdf
++#    COMMAND sed -i "s|latex_count=5|latex_count=25|"  ${CMAKE_BINARY_DIR}/doxygen/latex/Makefile
++#    COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen/latex 
++#    COMMAND mv ${CMAKE_BINARY_DIR}/doxygen/latex/refman.pdf
++#            ${CMAKE_BINARY_DIR}/doxygen/latex/gazebo-${GAZEBO_VERSION_FULL}.pdf
+ 
+     # Generate the messages documentation
+-    COMMAND doxygen ${CMAKE_BINARY_DIR}/gazebo_messages.dox
+-    COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen_msgs/latex
+-    COMMAND mv ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/refman.pdf
+-            ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/gazebo-msgs-${GAZEBO_VERSION_FULL}.pdf
++    COMMAND doxygen ${CMAKE_BINARY_DIR}/gazebo_messages.dox || /bin/true
++#    COMMAND sed -i "s|latex_count=5|latex_count=25|" ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/Makefile
++#    COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen_msgs/latex
++#    COMMAND mv ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/refman.pdf
++#            ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/gazebo-msgs-${GAZEBO_VERSION_FULL}.pdf
+ 
+     COMMENT "Generating API documentation with Doxygen" VERBATIM)
+ endif()
+diff -up ./doc/gazebo.in.latex ./doc/gazebo.in
+--- ./doc/gazebo.in.latex	2014-07-17 18:41:41.416767906 -0400
++++ ./doc/gazebo.in	2014-07-17 18:41:53.664244134 -0400
+@@ -1241,7 +1241,7 @@ SERVER_BASED_SEARCH    = NO
+ # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+ # generate Latex output.
+ 
+-GENERATE_LATEX         = YES
++GENERATE_LATEX         = NO 
+ 
+ # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/gazebo.spec b/gazebo.spec
index d1236ef..fb2b8a5 100644
--- a/gazebo.spec
+++ b/gazebo.spec
@@ -14,10 +14,8 @@ Source1:        gazebo.desktop
 # not being found when ffmpeg is, and fixes the freeimage pkg-config
 # version being used
 Patch0:         %{name}-3.0.0-fedora.patch
-# Patch to work around latex failing: catches error on first run of doxygen
-# and increases the number of times latex will be run until all cross references
-# are resolved.  Not submitted upstream.
-Patch1:         %{name}-2.1.0-latex.patch
+# Patch to disable latex doxygen generation.  Consistent with upstream issue 1141
+Patch1:         %{name}-3.0.0-latex.patch
 # Remove rpath in pkgconfig files
 # Not submitted upstream
 Patch2:         %{name}-3.0.0-rpath.patch
@@ -35,7 +33,6 @@ BuildRequires:  cmake
 BuildRequires:  console-bridge-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
-BuildRequires:  doxygen-latex
 BuildRequires:  freeimage-devel
 BuildRequires:  gdal-devel
 BuildRequires:  gperftools-devel
@@ -59,14 +56,6 @@ BuildRequires:  tbb-devel
 BuildRequires:  tinyxml-devel
 BuildRequires:  urdfdom-headers-devel
 BuildRequires:  urdfdom-devel
-# tex was split up in f18
-%if 0%{?fedora}
-BuildRequires:  texlive-latex
-BuildRequires:  texlive-multirow
-BuildRequires:  texlive-sectsty
-BuildRequires:  texlive-tocloft
-BuildRequires:  texlive-xtab
-%endif
 
 Requires: %{name}-media = %{version}-%{release}
 
@@ -321,8 +310,6 @@ fi
 %{_includedir}/%{name}-%{abiversion}/%{name}/ode
 
 %files doc
-%doc build/doxygen/latex/*.pdf
-%doc build/doxygen_msgs/latex/*.pdf
 %doc build/doxygen/html
 %doc build/doxygen_msgs/html_msgs
 


More information about the scm-commits mailing list