From a3b55fd7f9ea7aeca93dbd8ece421aea1ffec7f949acc371b339dff0c500a4c8 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 26 Aug 2013 08:51:56 +0000 Subject: [PATCH] - 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 --- doxygen-1.4.8-endless-loop.patch | 27 --------------------------- doxygen-1.7.0-modify_footer.patch | 17 ++++++++++------- doxygen-1.8.4-html.tar.bz2 | 3 --- doxygen-1.8.4.src.tar.gz | 3 --- doxygen-1.8.5-html.tar.bz2 | 3 +++ doxygen-1.8.5.src.tar.gz | 3 +++ doxygen.changes | 8 ++++++++ doxygen.spec | 6 ++---- doxygen_manual-1.8.4.pdf.zip | 3 --- doxygen_manual-1.8.5.pdf.zip | 3 +++ doxywizard.changes | 8 ++++++++ doxywizard.spec | 2 +- 12 files changed, 38 insertions(+), 48 deletions(-) delete mode 100644 doxygen-1.4.8-endless-loop.patch delete mode 100644 doxygen-1.8.4-html.tar.bz2 delete mode 100644 doxygen-1.8.4.src.tar.gz create mode 100644 doxygen-1.8.5-html.tar.bz2 create mode 100644 doxygen-1.8.5.src.tar.gz delete mode 100644 doxygen_manual-1.8.4.pdf.zip create mode 100644 doxygen_manual-1.8.5.pdf.zip diff --git a/doxygen-1.4.8-endless-loop.patch b/doxygen-1.4.8-endless-loop.patch deleted file mode 100644 index a6b4024..0000000 --- a/doxygen-1.4.8-endless-loop.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 5e056236c9ef3b3675d014cab43480700027d60b -Author: Dimitri van Heesch -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 - { diff --git a/doxygen-1.7.0-modify_footer.patch b/doxygen-1.7.0-modify_footer.patch index b15d026..91620b6 100644 --- a/doxygen-1.7.0-modify_footer.patch +++ b/doxygen-1.7.0-modify_footer.patch @@ -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"); //---- diff --git a/doxygen-1.8.4-html.tar.bz2 b/doxygen-1.8.4-html.tar.bz2 deleted file mode 100644 index 5cefced..0000000 --- a/doxygen-1.8.4-html.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:870b96a9e44a856127fa7086b4c6014bbf350e5d721f16b6a470fc0d5f3ecb73 -size 701866 diff --git a/doxygen-1.8.4.src.tar.gz b/doxygen-1.8.4.src.tar.gz deleted file mode 100644 index 301e7b2..0000000 --- a/doxygen-1.8.4.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e -size 6456090 diff --git a/doxygen-1.8.5-html.tar.bz2 b/doxygen-1.8.5-html.tar.bz2 new file mode 100644 index 0000000..6164150 --- /dev/null +++ b/doxygen-1.8.5-html.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ae5c406e9864c8a35a60e3e3ca4f21a209d979082d59bb8b3fb7a493298a8d9 +size 697923 diff --git a/doxygen-1.8.5.src.tar.gz b/doxygen-1.8.5.src.tar.gz new file mode 100644 index 0000000..a7e67be --- /dev/null +++ b/doxygen-1.8.5.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 +size 6511944 diff --git a/doxygen.changes b/doxygen.changes index b1799dd..f92c8ad 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -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 diff --git a/doxygen.spec b/doxygen.spec index 059fd62..da0a02e 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -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 diff --git a/doxygen_manual-1.8.4.pdf.zip b/doxygen_manual-1.8.4.pdf.zip deleted file mode 100644 index d60b257..0000000 --- a/doxygen_manual-1.8.4.pdf.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95764d9fa97baf2f925ef5a060d9080ecd0c38c220e15bd8954f5b583980f0c4 -size 751798 diff --git a/doxygen_manual-1.8.5.pdf.zip b/doxygen_manual-1.8.5.pdf.zip new file mode 100644 index 0000000..3124def --- /dev/null +++ b/doxygen_manual-1.8.5.pdf.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5273404f56e6956ef946376d350474ed468868f17a3582f4489c259b789d502f +size 985013 diff --git a/doxywizard.changes b/doxywizard.changes index 164312e..a80abe9 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -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 diff --git a/doxywizard.spec b/doxywizard.spec index 9cff2df..d1f37c3 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -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