SHA256
1
0
forked from pool/doxygen
Pascal Bleser 2010-06-15 15:01:06 +00:00 committed by Git OBS Bridge
parent 3a0cc5ee21
commit 9a8c06e3fb
14 changed files with 101 additions and 91 deletions

View File

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

View File

@ -1,58 +0,0 @@
diff -U 3 -H -d -r -N -- doxygen-1.6.3/src/config.xml doxygen-1.6.3.modify_footer/src/config.xml
--- doxygen-1.6.3/src/config.xml 2010-02-13 15:19:31.000000000 +0100
+++ doxygen-1.6.3.modify_footer/src/config.xml 2010-02-21 15:52:16.000000000 +0100
@@ -741,6 +741,10 @@
If the GENERATE_HTML tag is set to YES (the default) Doxygen will
generate HTML output.
' defval='1'/>
+ <option type='bool' id='HTML_FOOTER_DESCRIPTION' docs='
+The HTML_FOOTER_DATE_AND_PROJECT_NAME tag can be used to add build date,
+project name and Doxygen version to HTML footer.
+' defval='0' depends='GENERATE_HTML'/>
<option type='string' id='HTML_OUTPUT' format='dir' docs='
The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff -U 3 -H -d -r -N -- doxygen-1.6.3/src/configoptions.cpp doxygen-1.6.3.modify_footer/src/configoptions.cpp
--- doxygen-1.6.3/src/configoptions.cpp 2010-02-13 15:19:33.000000000 +0100
+++ doxygen-1.6.3.modify_footer/src/configoptions.cpp 2010-02-21 15:52:16.000000000 +0100
@@ -1051,6 +1051,15 @@
TRUE
);
//----
+ cb = cfg->addBool(
+ "HTML_FOOTER_DESCRIPTION",
+ "If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will \n"
+ "add generated date, project name and doxygen version to HTML footer.",
+ FALSE
+ );
+ //cs->setDefaultValue("FALSE");
+ cs->addDependency("GENERATE_HTML");
+ //----
cs = cfg->addString(
"HTML_OUTPUT",
"The HTML_OUTPUT tag is used to specify where the HTML docs will be put.\n"
diff -U 3 -H -d -r -N -- doxygen-1.6.3/src/htmlgen.cpp doxygen-1.6.3.modify_footer/src/htmlgen.cpp
--- doxygen-1.6.3/src/htmlgen.cpp 2010-01-04 22:22:05.000000000 +0100
+++ doxygen-1.6.3.modify_footer/src/htmlgen.cpp 2010-02-21 15:56:21.000000000 +0100
@@ -787,10 +787,18 @@
{
QTextStream t(&file);
t << "<hr class=\"footer\"/><address style=\"text-align: right;\"><small>\n";
- t << theTranslator->trGeneratedAt( "$datetime", "$projectname" );
- t << "&nbsp;<a href=\"http://www.doxygen.org/index.html\">"
+ if (Config_getBool("HTML_FOOTER_DESCRIPTION"))
+ {
+ t << theTranslator->trGeneratedAt( "$datetime", "$projectname" );
+ t << "&nbsp";
+ }
+ t << "<a href=\"http://www.doxygen.org/index.html\">"
<< "<img class=\"footer\" src=\"doxygen.png\" alt=\"doxygen\"/>"
- << "</a> $doxygenversion";
+ << "</a>";
+ if (Config_getBool("HTML_FOOTER_DESCRIPTION"))
+ {
+ t << " $doxygenversion";
+ }
t << "</small></address>\n"
<< "</body>\n"
<< "</html>\n";

View File

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

View File

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

View File

@ -0,0 +1,53 @@
--- src/config.xml.orig 2010-06-15 15:12:20.000000000 +0200
+++ src/config.xml 2010-06-15 15:13:33.000000000 +0200
@@ -761,6 +761,11 @@
each generated HTML page. If it is left blank doxygen will generate a
standard footer.
' defval='' depends='GENERATE_HTML'/>
+ <option type='bool' id='HTML_FOOTER_DESCRIPTION' docs='
+The HTML_FOOTER_DATE_AND_PROJECT_NAME tag can be used to add build date,
+project name and Doxygen version to HTML footer.
+standard footer.
+' defval='' depends='GENERATE_HTML'/>
<option type='string' id='HTML_STYLESHEET' format='file' docs='
The HTML_STYLESHEET tag can be used to specify a user-defined cascading
style sheet that is used by each HTML page. It can be used to
--- src/htmlgen.cpp.orig 2010-06-15 15:14:40.000000000 +0200
+++ src/htmlgen.cpp 2010-06-15 15:16:10.000000000 +0200
@@ -952,10 +952,16 @@
QTextStream t(&file);
t.setEncoding(QTextStream::UnicodeUTF8);
t << "<hr class=\"footer\"/><address class=\"footer\"><small>\n";
+ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) {
t << theTranslator->trGeneratedAt( "$datetime", "$projectname" );
- t << "&nbsp;<a href=\"http://www.doxygen.org/index.html\">"
+ t << "&nbsp;";
+ }
+ t << "<a href=\"http://www.doxygen.org/index.html\">"
<< "<img class=\"footer\" src=\"$relpath$doxygen.png\" alt=\"doxygen\"/>"
- << "</a> $doxygenversion";
+ << "</a>";
+ if (Config_getBool("HTML_FOOTER_DESCRIPTION")) {
+ t << " $doxygenversion";
+ }
t << "</small></address>\n"
<< "</body>\n"
<< "</html>\n";
--- src/configoptions.cpp.orig 2010-06-15 15:13:45.000000000 +0200
+++ src/configoptions.cpp 2010-06-15 15:14:28.000000000 +0200
@@ -1095,6 +1095,15 @@
cs->setWidgetType(ConfigString::File);
cs->addDependency("GENERATE_HTML");
//----
+ cb = cfg->addBool(
+ "HTML_FOOTER_DESCRIPTION",
+ "If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will \n"
+ "add generated date, project name and doxygen version to HTML footer.",
+ FALSE
+ );
+ //cs->setDefaultValue("FALSE");
+ cs->addDependency("GENERATE_HTML");
+ //----
cs = cfg->addString(
"HTML_STYLESHEET",
"The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"

View File

@ -1,11 +1,11 @@
--- ./configure
+++ ./configure
--- configure.orig 2010-06-15 15:50:14.000000000 +0200
+++ configure 2010-06-15 15:50:28.000000000 +0200
@@ -268,7 +268,7 @@
if test -z "$QTDIR"; then
echo " QTDIR environment variable not set!"
echo -n " Checking for Qt..."
- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+ for d in /usr; do
- for d in /usr /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
+ for d in /usr ; do
if test -x "$d/bin/qmake"; then
QTDIR=$d
fi

View File

@ -1,10 +1,9 @@
diff -U 3 -H -d -r -N -- doxygen-1.6.0/src/util.cpp doxygen-1.6.0-warnings/src/util.cpp
--- doxygen-1.6.0/src/util.cpp 2009-08-20 14:13:51.000000000 +0200
+++ doxygen-1.6.0-warnings/src/util.cpp 2009-08-21 15:07:16.000000000 +0200
@@ -4760,9 +4760,9 @@
{
--- src/util.cpp.orig 2010-06-15 15:51:48.000000000 +0200
+++ src/util.cpp 2010-06-15 15:52:27.000000000 +0200
@@ -4794,9 +4794,9 @@
static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES");
QCString result;
static StrBuf strBuf;
strBuf.clear();
- char c;
+ unsigned char c;
const char *p=name;
@ -13,9 +12,9 @@ diff -U 3 -H -d -r -N -- doxygen-1.6.0/src/util.cpp doxygen-1.6.0-warnings/src/u
{
switch(c)
{
@@ -4789,11 +4789,11 @@
case '+': result+="_09"; break;
case '=': result+="_0A"; break;
@@ -4823,11 +4823,11 @@
case '+': strBuf.addStr("_09"); break;
case '=': strBuf.addStr("_0A"); break;
default:
- if (c<0)
+ if (c>0x7f)

View File

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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Jun 15 13:04:46 UTC 2010 - pascal.bleser@opensuse.org
- update to 1.7.0:
* the look of the HTML output was changed
* the color of HTML output can now be changed easily
* several performance enhancements were included:
+ ability to run multiple instances of dot in parallel for
faster graph generation
* many bugs have been fixed
-------------------------------------------------------------------
Sun Feb 21 15:08:52 UTC 2010 - Nico.Laus.2001@gmx.de

View File

@ -1,5 +1,5 @@
#
# spec file for package doxygen (Version 1.6.3)
# spec file for package doxygen (Version 1.7.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -20,7 +20,7 @@
Name: doxygen
BuildRequires: bison flex gcc-c++ libpng-devel
Version: 1.6.3
Version: 1.7.0
Release: 1
AutoReqProv: on
License: GPLv2+
@ -37,7 +37,7 @@ Source3: %{name}_manual-%{version}.pdf.bz2
Patch: %{name}-1.5.9-64archs.patch
Patch2: %{name}-1.5.9-arm.patch
Patch3: %{name}-1.5.9-man.patch
Patch4: %{name}-1.6.3-modify_footer.patch
Patch4: %{name}-1.7.0-modify_footer.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#########################################################################################
# SuSE, openSUSE
@ -77,7 +77,7 @@ Authors:
%patch
%patch2
%patch3
%patch4 -p1
%patch4
cp -v %{S:3} .
bzip2 -d %{name}_manual-%{version}.pdf.bz2

View File

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

View File

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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 15 13:05:30 UTC 2010 - pascal.bleser@opensuse.org
- update to 1.7.0
-------------------------------------------------------------------
Sun Feb 21 15:09:35 UTC 2010 - Nico.Laus.2001@gmx.de

View File

@ -1,5 +1,5 @@
#
# spec file for package doxywizard (Version 1.6.3)
# spec file for package doxywizard (Version 1.7.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -20,7 +20,7 @@
Name: doxywizard
BuildRequires: bison flex gcc-c++ libdrm-devel libjpeg-devel
Version: 1.6.3
Version: 1.7.0
Release: 1
AutoReqProv: on
Requires: doxygen = %{version}
@ -34,8 +34,8 @@ Patch: doxygen-1.5.9-64archs.patch
Patch2: %{name}-1.5.9-flex.patch
Patch4: doxygen-1.5.9-arm.patch
Patch5: doxygen-1.5.9-man.patch
Patch6: doxygen-1.5.9-qtdir.patch
Patch100: doxygen-1.6.0-warnings.patch
Patch6: doxygen-1.7.0-qtdir.patch
Patch100: doxygen-1.7.0-warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#########################################################################################
# SuSE, openSUSE
@ -82,7 +82,7 @@ Authors:
%if 0%{?suse_version}
%patch6
%endif
%patch100 -p1
%patch100
%build
%if 0%{?suse_version}
@ -130,14 +130,14 @@ rm -rf %{buildroot}
%{_datadir}/applications/doxywizard.desktop
%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.%{man_ext}
%post
%if 0%{?mandriva_version} || 0%{?mdkversion}
%post
%update_menus
%{update_desktop_database}
%endif
%postun
%if 0%{?mandriva_version} || 0%{?mdkversion}
%postun
%clean_menus
%{clean_desktop_database}
%endif