fix SDK doc generation with doxygen 1.8.7

f41
David Tardon 11 years ago
parent a3c19a0c60
commit fbdda849d9

@ -0,0 +1,41 @@
From 2e9a77aa2d8e83f6296cd9204759d18b0ec5f0b5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 15 May 2014 13:41:16 +0200
Subject: [PATCH] fix for doxygen 1.8.7
Earlier versions apparently used HTML as default if no output format was
specified. 1.8.7 no longer does that.
Change-Id: Ia8f908f54b344530e1b50e8800c032f782fb36e9
---
odk/docs/cpp/Doxyfile | 1 +
odk/docs/idl/Doxyfile | 1 +
2 files changed, 2 insertions(+)
diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
index 30346e0..2519f1b 100644
--- a/odk/docs/cpp/Doxyfile
+++ b/odk/docs/cpp/Doxyfile
@@ -24,6 +24,7 @@ WARN_FORMAT = "$file:$line: $text"
INPUT = %
RECURSIVE = YES
+GENERATE_HTML = YES
HTML_OUTPUT = .
GENERATE_LATEX = NO
diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
index 6eead54..c065b33 100644
--- a/odk/docs/idl/Doxyfile
+++ b/odk/docs/idl/Doxyfile
@@ -13,6 +13,7 @@ STRIP_FROM_PATH = %
INPUT = %
RECURSIVE = YES
+GENERATE_HTML = YES
HTML_OUTPUT = .
GENERATE_LATEX = NO
--
1.9.0

@ -37,7 +37,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.2 Version: %{libo_version}.2
Release: 12%{?libo_prerelease}%{?dist} Release: 13%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.libreoffice.org/ URL: http://www.libreoffice.org/
@ -310,6 +310,7 @@ Patch49: 0001-Resolves-rhbz-1096295-hard-to-distinguish-selected-f.patch
Patch50: 0001-fdo-78119-find-the-longest-match-for-month-name.patch Patch50: 0001-fdo-78119-find-the-longest-match-for-month-name.patch
Patch51: 0001-fdo-77242-fix-crash.patch Patch51: 0001-fdo-77242-fix-crash.patch
Patch52: 0001-update-libxmlsec-config.-to-support-ppc64le.patch Patch52: 0001-update-libxmlsec-config.-to-support-ppc64le.patch
Patch53: 0001-fix-for-doxygen-1.8.7.patch
%define instdir %{_libdir} %define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice %define baseinstdir %{instdir}/libreoffice
@ -2273,6 +2274,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Thu May 15 2014 David Tardon <dtardon@redhat.com> - 1:4.2.4.2-13
- fix SDK doc generation with doxygen 1.8.7
* Wed May 14 2014 David Tardon <dtardon@redhat.com> - 1:4.2.4.2-12 * Wed May 14 2014 David Tardon <dtardon@redhat.com> - 1:4.2.4.2-12
- rebuild for new poppler - rebuild for new poppler

Loading…
Cancel
Save