- updated to 1.8.5:

* Added SOURCE_TOOLTIPS option for advanced tooltip support while 
    source browsing. 
  * bugfixes

- updated to 1.8.5:
  * Added SOURCE_TOOLTIPS option for advanced tooltip support while
    source browsing.
  * bugfixes

OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=67
This commit is contained in:
Petr Gajdos 2013-08-26 08:51:56 +00:00 committed by Git OBS Bridge
parent 8636afea54
commit a3b55fd7f9
12 changed files with 38 additions and 48 deletions

View File

@ -1,27 +0,0 @@
commit 5e056236c9ef3b3675d014cab43480700027d60b
Author: Dimitri van Heesch <dimitri@stack.nl>
Date: Thu May 30 20:01:15 2013 +0200
Bug 701295 - Doxygen 1.8.4 goes into an endless loop
diff --git a/src/util.cpp b/src/util.cpp
index 0d70d43..0c36fc0 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name)
++templateDepth;
pos=nextOpenPos-1;
}
- else
+ else if (nextClosePos!=-1)
{
--templateDepth;
pos=nextClosePos-1;
}
+ else // more >'s than <'s, see bug701295
+ {
+ return -1;
+ }
}
else
{

View File

@ -2,12 +2,15 @@ Index: src/configoptions.cpp
===================================================================
--- src/configoptions.cpp.orig
+++ src/configoptions.cpp
@@ -1146,7 +1155,7 @@ void addConfigOptions(Config *cfg)
"If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML\n"
"page will contain the date and time when the page was generated. Setting\n"
"this to NO can help when comparing the output of multiple runs.",
- TRUE
+ FALSE
);
@@ -1497,9 +1497,9 @@ void addConfigOptions(Config *cfg)
"If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML\n"
"page will contain the date and time when the page was generated. Setting this\n"
"to NO can help when comparing the output of multiple runs.\n"
- "The default value is: YES.\n"
+ "The default value is: NO.\n"
"This tag requires that the tag GENERATE_HTML is set to YES.",
- TRUE
+ FALSE
);
cb->addDependency("GENERATE_HTML");
//----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:870b96a9e44a856127fa7086b4c6014bbf350e5d721f16b6a470fc0d5f3ecb73
size 701866

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e
size 6456090

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ae5c406e9864c8a35a60e3e3ca4f21a209d979082d59bb8b3fb7a493298a8d9
size 697923

3
doxygen-1.8.5.src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25
size 6511944

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Aug 26 08:50:57 UTC 2013 - pgajdos@suse.com
- updated to 1.8.5:
* Added SOURCE_TOOLTIPS option for advanced tooltip support while
source browsing.
* bugfixes
-------------------------------------------------------------------
Wed Jul 3 15:36:53 UTC 2013 - dvaleev@suse.com

View File

@ -22,7 +22,7 @@ BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: libpng-devel
BuildRequires: unzip
Version: 1.8.4
Version: 1.8.5
Release: 0
Summary: Automated C, C++, and Java Documentation Generator
License: GPL-2.0+
@ -37,7 +37,6 @@ Patch: %{name}-1.5.9-64archs.patch
Patch3: %{name}-1.5.9-man.patch
Patch4: %{name}-1.7.0-modify_footer.patch
Patch5: %{name}-no-lowercase-man-names.patch
Patch6: %{name}-1.4.8-endless-loop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#########################################################################################
# SuSE, openSUSE
@ -72,7 +71,6 @@ as well. An executable for Windows 95/NT is also available.
%patch3
%patch4
%patch5 -p1
%patch6 -p1
cp -v %{S:3} .
/usr/bin/unzip %{S:3}
@ -89,7 +87,7 @@ make %{?_smp_mflags}
%install
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/doxygen
make install INSTALL=$RPM_BUILD_ROOT/usr DOCDIR=$RPM_BUILD_ROOT%{_docdir}/doxygen
install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README VERSION $RPM_BUILD_ROOT%{_docdir}/doxygen
install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README.md VERSION $RPM_BUILD_ROOT%{_docdir}/doxygen
cp -a html $RPM_BUILD_ROOT%{_docdir}/doxygen
cp doxygen_manual-%{version}.pdf $RPM_BUILD_ROOT%{_docdir}/doxygen

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95764d9fa97baf2f925ef5a060d9080ecd0c38c220e15bd8954f5b583980f0c4
size 751798

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5273404f56e6956ef946376d350474ed468868f17a3582f4489c259b789d502f
size 985013

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Aug 26 08:51:31 UTC 2013 - pgajdos@suse.com
- updated to 1.8.5:
* Added SOURCE_TOOLTIPS option for advanced tooltip support while
source browsing.
* bugfixes
-------------------------------------------------------------------
Mon May 20 16:37:04 UTC 2013 - pgajdos@suse.com

View File

@ -21,7 +21,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
Version: 1.8.4
Version: 1.8.5
Release: 0
Requires: doxygen = %{version}
Summary: Graphical User Interface for Doxygen