rpm/doxygen
SHA256
1
0
Fork 0
forked from pool/doxygen
Code Pull Requests Activity

Accepting request 28036 from devel:tools

Browse Source 
Copy from devel:tools/doxygen based on submit request 28036 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/28036
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=15
This commit is contained in:
OBS User autobuild 2010-01-08 16:30:01 +00:00 committed by Git OBS Bridge
parent 1c4a87bc33
commit 1d757505cf
15 changed files with 412 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doxygen-1.5.9-html.tar.bz2
View File

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

131
doxygen-1.5.9-libpng.patch
View File

@ -1,131 +0,0 @@
---
Makefile.in | 7 ++-----
configure | 5 ++---
src/doxygen.pro | 2 +-
src/doxygen.pro.in | 2 +-
src/libdoxygen.pro | 1 -
src/libdoxygen.pro.in | 1 -
src/pngenc.cpp | 2 +-
7 files changed, 7 insertions(+), 13 deletions(-)
--- Makefile.in.orig
+++ Makefile.in
@@ -9,7 +9,6 @@ clean: FORCE
cd doc ; $(MAKE) clean
cd qtools ; $(MAKE) clean
cd src ; $(MAKE) clean
- cd libpng ; $(MAKE) clean
cd libmd5 ; $(MAKE) clean
cd addon/doxywizard ; $(MAKE) clean
cd addon/doxmlparser/src ; $(MAKE) clean
@@ -20,7 +19,6 @@ clean: FORCE
distclean: clean
cd src ; $(MAKE) distclean
- cd libpng ; $(MAKE) distclean
cd libmd5 ; $(MAKE) distclean
cd addon/doxywizard ; $(MAKE) distclean
cd addon/doxmlparser/src ; $(MAKE) distclean
@@ -34,11 +32,10 @@ distclean: clean
-rm -f objects/*.o
-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
- -rm -f libpng/Makefile.libpng
-rm -f libmd5/Makefile.libmd5
-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile
-rm -f .makeconfig .tmakeconfig
- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
-rm -f src/version.cpp
-rm -r addon/doxywizard/Makefile
-rm -f addon/doxywizard/doxywizard.pro
@@ -77,7 +74,7 @@ docs: FORCE
pdf: docs
cd latex ; $(MAKE)
-DISTFILES = Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \
+DISTFILES = Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \
qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
VERSION packages winbuild
--- configure.orig
+++ configure
@@ -575,7 +575,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
EOF
fi
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
for i in $f_inmakefiles ; do
SRC=$i
@@ -592,7 +592,6 @@ EOF
echo "" >> $DST
echo "all: src/version.cpp " >> $DST
echo " \$(MAKE) -C qtools" >> $DST
- echo " \$(MAKE) -C libpng" >> $DST
echo " \$(MAKE) -C libmd5" >> $DST
echo " \$(MAKE) -C src" >> $DST
if test $f_wizard = YES; then
@@ -616,7 +615,7 @@ EOF
echo " Created $DST from $SRC..."
done
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
for i in $f_inprofiles ; do
SRC=$i
--- src/doxygen.pro.orig
+++ src/doxygen.pro
@@ -32,7 +32,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-INCLUDEPATH += ../qtools ../libpng ../libmd5 .
+INCLUDEPATH += ../qtools ../libmd5 .
#win32-g++:INCLUDEPATH -= ../libpng
DESTDIR = ../bin
TARGET = doxygen
--- src/doxygen.pro.in.orig
+++ src/doxygen.pro.in
@@ -28,7 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-INCLUDEPATH += ../qtools ../libpng ../libmd5 .
+INCLUDEPATH += ../qtools ../libmd5 .
#win32-g++:INCLUDEPATH -= ../libpng
DESTDIR = ../bin
TARGET = doxygen
--- src/libdoxygen.pro.orig
+++ src/libdoxygen.pro
@@ -239,7 +239,6 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
INCLUDEPATH += ../qtools
-INCLUDEPATH += ../libpng
INCLUDEPATH += ../libmd5
win32:INCLUDEPATH += .
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
--- src/libdoxygen.pro.in.orig
+++ src/libdoxygen.pro.in
@@ -235,7 +235,6 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
INCLUDEPATH += ../qtools
-INCLUDEPATH += ../libpng
INCLUDEPATH += ../libmd5
win32:INCLUDEPATH += .
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
--- src/pngenc.cpp.orig
+++ src/pngenc.cpp
@@ -25,7 +25,7 @@
#endif
#define ALL_STATIC
-#include <../libpng/png.h>
+#include <libpng12/png.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

58
doxygen-1.5.9-modify_footer.patch
View File

@ -1,58 +0,0 @@
--- src/config.xml 2008-11-29 14:18:20.000000000 +0100
+++ src/config.xml 2009-04-09 14:04:34.000000000 +0200
@@ -743,6 +743,10 @@
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.
+' defval='0' 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/configoptions.cpp 2008-11-29 14:14:50.000000000 +0100
+++ src/configoptions.cpp 2009-04-09 14:07:41.000000000 +0200
@@ -1061,6 +1061,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_FOOTER",
"The HTML_FOOTER tag can be used to specify a personal HTML footer for \n"
--- src/htmlgen.cpp 2008-12-20 23:13:24.000000000 +0100
+++ src/htmlgen.cpp 2009-04-14 17:11:59.000000000 +0200
@@ -716,13 +716,21 @@
if (g_footer.isEmpty())
{
t << "<hr size=\"1\"><address style=\"text-align: right;\"><small>";
- t << theTranslator->trGeneratedAt(
+ if (Config_getBool("HTML_FOOTER_DESCRIPTION"))
+ {
+ t << theTranslator->trGeneratedAt(
dateToString(TRUE),
Config_getString("PROJECT_NAME")
);
- t << "&nbsp;" << endl << "<a href=\"http://www.doxygen.org/index.html\">";
+ t << "&nbsp;" << endl;
+ }
+ t << "<a href=\"http://www.doxygen.org/index.html\">";
t << endl << "<img src=\"" << relPath << "doxygen.png\" alt=\"doxygen\" "
- << "align=\"middle\" border=\"0\">" << "</a> " << versionString << " ";
+ << "align=\"middle\" border=\"0\">" << "</a> ";
+ if (Config_getBool("HTML_FOOTER_DESCRIPTION"))
+ {
+ t << versionString << " ";
+ }
t << "</small></address>";
if (Debug::isFlagSet(Debug::Validate))
{

3
doxygen-1.5.9.src.tar.bz2
View File

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

29
doxygen-1.6.0-warnings.patch Normal file
View File

@ -0,0 +1,29 @@
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 @@
{
static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES");
QCString result;
- char c;
+ unsigned char c;
const char *p=name;
- while ((c=*p++)!=0)
+ while ((c=(unsigned char)*p++)!=0)
{
switch(c)
{
@@ -4789,11 +4789,11 @@
case '+': result+="_09"; break;
case '=': result+="_0A"; break;
default:
- if (c<0)
+ if (c>0x7f)
{
static char map[] = "0123456789ABCDEF";
char ids[5];
- unsigned char id = (unsigned char)c;
+ unsigned char id = c;
ids[0]='_';
ids[1]='x';
ids[2]=map[id>>4];

3
doxygen-1.6.2-html.tar.bz2 Normal file
View File

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

3
doxygen-1.6.2.src.tar.bz2 Normal file
View File

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

55
doxygen-modify_footer.patch Normal file
View File

@ -0,0 +1,55 @@
--- src/config.xml.orig 2009-09-09 23:49:12.000000000 +0200
+++ src/config.xml 2009-09-09 23:50:15.000000000 +0200
@@ -736,6 +736,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
--- src/htmlgen.cpp.orig 2009-09-09 23:51:11.000000000 +0200
+++ src/htmlgen.cpp 2009-09-09 23:54:09.000000000 +0200
@@ -723,10 +723,18 @@
{
QTextStream t(&file);
t << "<hr size=\"1\"/><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";
--- src/configoptions.cpp.orig 2009-09-09 23:50:25.000000000 +0200
+++ src/configoptions.cpp 2009-09-09 23:50:58.000000000 +0200
@@ -1043,6 +1043,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"

121
doxygen.changes
View File

@ -1,3 +1,119 @@
-------------------------------------------------------------------
Wed Dec 30 14:16:55 UTC 2009 - pascal.bleser@opensuse.org
- update to 1.6.2:
* two new methods of searching through the HTML documentation:
were added:
+ via a PHP based Web server
+ via an Eclipse help plugin
* the \addindex command now also works for the HTML indices
* rendering of LaTeX formulas in the HTML output has been
improved (especially for non-white backgrounds)
* smaller improvements
* large number of bugfixes
-------------------------------------------------------------------
Mon Sep 7 12:30:49 UTC 2009 - pascal.bleser@opensuse.org
- update to 1.6.1:
* fixed file handle leak when parsing include files; also fixed
the logic that determines whether or not an include file need
to be parsed
* search result pages were not using UTF-8 character encoding
* search results pointing to external references were not linked
correctly
* multiline second argument of \ref caused unexpected " warning
* feeding invalid XML could crash doxygen's DBus XML parser
* include patch to fix problem with building rpms
* SHOW_USED_FILES now works again
* xrefitems (like @todo) did not appear in the list when found
in comments marked with @enum or @name.
-------------------------------------------------------------------
Fri Aug 21 14:16:00 CEST 2009 - nico.laus.2001@gmx.de
- updated to version 1.6.0
- Changes
* id 580924, 541234: Replaced the PHP based search engine by a
Javascript/DHTML based one. As a result the search feature no longer
requires a HTTP server with PHP enabled to be usable. Searching is limited
to symbols though, but it is now possible to filter on symbol type.
* id 519886: Make the HTML output XHTML 1.0 compliant.
* id 579950: Objective-C categories are now merged with their base class,
unless there is no base class.
* Member groups with the same header within the same scope are now merged.
This also works for Objective-C categories.
* Changed the LaTeX style sheet such that more of the markup is configurable.
Please update your style sheet if you use a custom one.
* id 584844: Treat \details inside a brief description as a new paragraph
command.
* Split GENERATE_TREEVIEW into two separate options: GENERATE_TREEVIEW and
USE_INLINE_TREES.
* Removed the dependencies on libpng and libz, doxygen now generates gifs
again for internal class diagrams (like it did 7 years ago ;-)
- New features
* Added option SORT_MEMBERS_CTORS_1ST, which when enabled places the
constructors and destructors first in an otherwise sorted list.
* id 581518: Applied patch by Tobias Hunger that adds support for
documenting DBus XML interface descriptions.
* Included QtHelp patch by Karsten Heimrich which adds missing reference
and keyword for methods.
* Included updates for the Korean and Polish translation.
- Bug fixes (ids refer to the gnome bugzilla database)
* id 131989: Fixed preprocessor handling for C# code.
* id 133418: -- was not rendered correctly for LaTeX output
* id 157485: Missing link in todo page.
* id 318061: Two template functions that only differed in the number of
template arguments were seen as the same function.
* id 443939: HIDE_UNDOC_CLASSES did not work properly.
* id 509348: Fixed problem with syncing the information of declaration and
definition in the presence of an extra forward declaration in the source
code.
* id 522193: For C# enum values were merged together if the same enum name
was used in different scopes.
* id 523167: Included patch to handle PROGRAM statement in Fortran as
subroutines/functions.
* id 554636: Remove spacing around brackets for Obj-C protocols.
* id 557026: Included patch for fixing wrongly labeled items in docsets.
* id 560512: Improved parser to better disambiguate nested templates ending
with >> from the bitshift right operator.
* id 570238: Fixed matching problem for method in nested class, where the
outer class is a template.
* id 581746: Segfault/realloc error when a very long path was used.
* id 582469: documented #define with guard caused wrong documentation.
* id 582276: Doxywizard could crash on exit in some cases.
* id 582676: Regression: a struct ivar in ObjC class screws up method
identification.
* id 583213: Included patch that avoids trailing spaces in the generated
Doxyfile template.
* id 584192: Included VHDL patch by Martin Klein
* id 585543: Fixed case where matching declaration and definition did not
work correctly.
* id 585260: The "more..." link for files was broken, since the anchor was
not generated.
* id 586925: Fixed parsing problem when an unpaired apostrophe appeared in
a Python comment.
* id 588291: Included fix for doxywizard makefile.
* id 588587: Added missing virtual destructor to CompAccept base class.
* id 588968: Fixed segmentation fault for specific case in PHP code.
* Fixed some issues building for Windows.
* id 589514: Fixed problem handling strings like a"\b" within a comment.
* id 589616: Fixed problem matching explicitly scoped parameter in a
template class.
* id 590712: A namespaced with name "internal" (C++/CLI keyword) could
confuse doxygen's C++ parser.
* id 591749: @optional/@required attributes for Objective-C were missing
from the XML output.
-------------------------------------------------------------------
Mon Jul 20 11:07:00 CEST 2009 - nico.laus.2001@gmx.de
- integrated patch from http://blog.dixo.net/2009/05/20/using-doxygen-help-in-qtcreator/
that allows doxygen-created .qch files to be used with the tooltips shown
in Qt Creator
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 22 11:36:08 CEST 2009 - mseben@suse.cz Mon Jun 22 11:36:08 CEST 2009 - mseben@suse.cz
@ -64,6 +180,11 @@ Mon Feb 9 10:00:00 CET 2009 - olh@suse.de
- disable language support on ppc64 - disable language support on ppc64
code size too large, -mminimal-toc does not help code size too large, -mminimal-toc does not help
-------------------------------------------------------------------
Wed Jan 14 12:00:00 CEST 2009 - nico.laus.2001@gmx.de
- updated to compile on Mandriva
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 6 13:31:44 CET 2009 - mseben@suse.cz Tue Jan 6 13:31:44 CET 2009 - mseben@suse.cz

50
doxygen.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package doxygen (Version 1.5.9) # spec file for package doxygen (Version 1.6.2)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,29 +20,43 @@
Name: doxygen Name: doxygen
BuildRequires: bison flex gcc-c++ libpng-devel BuildRequires: bison flex gcc-c++ libpng-devel
Version: 1.5.9 Version: 1.6.2
Release: 2 Release: 1
AutoReqProv: on AutoReqProv: on
License: GPL v2 or later License: GPLv2+
Group: Development/Tools/Doc Generators Group: Development/Tools/Doc Generators
Summary: Automated C, C++, and Java Documentation Generator Summary: Automated C, C++, and Java Documentation Generator
Url: http://www.stack.nl/~dimitri/doxygen/ Url: http://www.stack.nl/~dimitri/doxygen/
# http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
Source: %{name}-%{version}.src.tar.bz2 Source: %{name}-%{version}.src.tar.bz2
# script to get %%source2 # script to get %%source2
Source1: doxygen-html.sh Source1: doxygen-html.sh
Source2: %{name}-%{version}-html.tar.bz2 Source2: %{name}-%{version}-html.tar.bz2
# ftp://ftp.stack.nl/pub/users/dimitri/doxygen_manual-%{version}.pdf.zip
Source3: %{name}_manual-%{version}.pdf.bz2 Source3: %{name}_manual-%{version}.pdf.bz2
Patch: %{name}-%{version}-64archs.patch Patch: %{name}-1.5.9-64archs.patch
Patch1: %{name}-%{version}-libpng.patch Patch2: %{name}-1.5.9-arm.patch
Patch2: %{name}-%{version}-arm.patch Patch3: %{name}-1.5.9-man.patch
Patch3: %{name}-%{version}-man.patch Patch4: %{name}-modify_footer.patch
# This patch change default behavior of doxygen ! :
# PATCH-FIX-OPENSUSE disable text in footer by default, you could enable
# footer text with option.HTML_FOOTER_DESCRIPTION = YES, this feature was
# added due to increasing efficiency of build service see bnc#489947
Patch4: %{name}-%{version}-modify_footer.patch
Patch100: doxygen.warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#########################################################################################
# SuSE, openSUSE
#########################################################################################
%if 0%{?suse_version}
%define man_ext gz
%endif
#########################################################################################
# Fedora, RHEL or CentOS
#########################################################################################
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
%define man_ext gz
%endif
#########################################################################################
# Mandrake, Mandriva
#########################################################################################
%if 0%{?mandriva_version} || 0%{?mdkversion}
%define man_ext lzma
%endif
%description %description
Doxygen is a documentation system for C, C++, Java, and IDL. It can Doxygen is a documentation system for C, C++, Java, and IDL. It can
@ -61,11 +75,9 @@ Authors:
%prep %prep
%setup -q -b 2 %setup -q -b 2
%patch %patch
%patch1
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4
%patch100
cp -v %{S:3} . cp -v %{S:3} .
bzip2 -d %{name}_manual-%{version}.pdf.bz2 bzip2 -d %{name}_manual-%{version}.pdf.bz2
@ -91,8 +103,8 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_docdir}/doxygen %doc %{_docdir}/doxygen
%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.gz %attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.%{man_ext}
%attr(444,root,root) %doc %{_mandir}/man1/doxytag.1.gz %attr(444,root,root) %doc %{_mandir}/man1/doxytag.1.%{man_ext}
%attr(755,root,root) /usr/bin/* %attr(755,root,root) /usr/bin/*
%changelog %changelog

89
doxygen.warnings.patch
View File

@ -1,89 +0,0 @@
---
src/dot.cpp | 2 +-
src/pycode.l | 2 +-
src/util.cpp | 8 ++++----
src/vhdldocgen.cpp | 4 ++--
src/vhdldocgen.h | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
--- src/dot.cpp.orig
+++ src/dot.cpp
@@ -874,7 +874,7 @@ void DotNode::writeXML(QTextStream &t,bo
void DotNode::writeDEF(QTextStream &t)
{
- char* nodePrefix = " node-";
+ const char* nodePrefix = " node-";
t << " node = {" << endl;
t << nodePrefix << "id = " << m_number << ';' << endl;
--- src/pycode.l.orig
+++ src/pycode.l
@@ -391,7 +391,7 @@ static void startCodeLine()
}
}
-static void codify(char* text)
+static void codify(const char* text)
{
g_code->codify(text);
}
--- src/util.cpp.orig
+++ src/util.cpp
@@ -4705,9 +4705,9 @@ QCString escapeCharsInString(const char
{
static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES");
QCString result;
- char c;
+ unsigned char c;
const char *p=name;
- while ((c=*p++)!=0)
+ while ((c=(unsigned char)*p++)!=0)
{
switch(c)
{
@@ -4734,11 +4734,11 @@ QCString escapeCharsInString(const char
case '+': result+="_09"; break;
case '=': result+="_0A"; break;
default:
- if (c<0)
+ if (c>0x7f)
{
static char map[] = "0123456789ABCDEF";
char ids[5];
- unsigned char id = (unsigned char)c;
+ unsigned char id = c;
ids[0]='_';
ids[1]='x';
ids[2]=map[id>>4];
--- src/vhdldocgen.cpp.orig
+++ src/vhdldocgen.cpp
@@ -853,7 +853,7 @@ bool VhdlDocGen::getSigName(QList<QCStri
const char* str,QCString& buffer)
{
int j,ll,index;
- char *signal = "signal ";
+ const char *signal = "signal ";
QCString qmem;
QCString temp(str);
QCString st(str);
@@ -1356,7 +1356,7 @@ bool VhdlDocGen::isNumber(const QCString
#endif
}// isNumber
-void VhdlDocGen::startFonts(const QCString& q, char *keyword,OutputList& ol)
+void VhdlDocGen::startFonts(const QCString& q, const char *keyword,OutputList& ol)
{
ol.startFontClass(keyword);
ol.docify(q.data());
--- src/vhdldocgen.h.orig
+++ src/vhdldocgen.h
@@ -262,7 +262,7 @@ class VhdlDocGen
static void writeLink(const MemberDef* mdef,OutputList &ol);
static void adjustMemberName(QCString& nn);
static bool membersHaveSpecificType(MemberList *ml,int type);
- static void startFonts(const QCString& q, char *keyword,OutputList& ol);
+ static void startFonts(const QCString& q, const char *keyword,OutputList& ol);
static bool isNumber(const QCString& s);
private:

3
doxygen_manual-1.5.9.pdf.bz2
View File

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

3
doxygen_manual-1.6.2.pdf.bz2 Normal file
View File

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

90
doxywizard.changes
View File

@ -1,3 +1,88 @@
-------------------------------------------------------------------
Mon Sep 7 12:32:21 UTC 2009 - pascal.bleser@opensuse.org
- update to 1.6.1:
* include patch to fix problem with building rpms
* fix doxywizard problem with GENERATE_TREEVIEW
-------------------------------------------------------------------
Fri Aug 21 14:16:00 CEST 2009 - nico.laus.2001@gmx.de
- updated to version 1.6.0
- Changes
* id 580924, 541234: Replaced the PHP based search engine by a
Javascript/DHTML based one. As a result the search feature no longer
requires a HTTP server with PHP enabled to be usable. Searching is limited
to symbols though, but it is now possible to filter on symbol type.
* id 519886: Make the HTML output XHTML 1.0 compliant.
* id 579950: Objective-C categories are now merged with their base class,
unless there is no base class.
* Member groups with the same header within the same scope are now merged.
This also works for Objective-C categories.
* Changed the LaTeX style sheet such that more of the markup is configurable.
Please update your style sheet if you use a custom one.
* id 584844: Treat \details inside a brief description as a new paragraph
command.
* Split GENERATE_TREEVIEW into two separate options: GENERATE_TREEVIEW and
USE_INLINE_TREES.
* Removed the dependencies on libpng and libz, doxygen now generates gifs
again for internal class diagrams (like it did 7 years ago ;-)
- New features
* Added option SORT_MEMBERS_CTORS_1ST, which when enabled places the
constructors and destructors first in an otherwise sorted list.
* id 581518: Applied patch by Tobias Hunger that adds support for
documenting DBus XML interface descriptions.
* Included QtHelp patch by Karsten Heimrich which adds missing reference
and keyword for methods.
* Included updates for the Korean and Polish translation.
- Bug fixes (ids refer to the gnome bugzilla database)
* id 131989: Fixed preprocessor handling for C# code.
* id 133418: -- was not rendered correctly for LaTeX output
* id 157485: Missing link in todo page.
* id 318061: Two template functions that only differed in the number of
template arguments were seen as the same function.
* id 443939: HIDE_UNDOC_CLASSES did not work properly.
* id 509348: Fixed problem with syncing the information of declaration and
definition in the presence of an extra forward declaration in the source
code.
* id 522193: For C# enum values were merged together if the same enum name
was used in different scopes.
* id 523167: Included patch to handle PROGRAM statement in Fortran as
subroutines/functions.
* id 554636: Remove spacing around brackets for Obj-C protocols.
* id 557026: Included patch for fixing wrongly labeled items in docsets.
* id 560512: Improved parser to better disambiguate nested templates ending
with >> from the bitshift right operator.
* id 570238: Fixed matching problem for method in nested class, where the
outer class is a template.
* id 581746: Segfault/realloc error when a very long path was used.
* id 582469: documented #define with guard caused wrong documentation.
* id 582276: Doxywizard could crash on exit in some cases.
* id 582676: Regression: a struct ivar in ObjC class screws up method
identification.
* id 583213: Included patch that avoids trailing spaces in the generated
Doxyfile template.
* id 584192: Included VHDL patch by Martin Klein
* id 585543: Fixed case where matching declaration and definition did not
work correctly.
* id 585260: The "more..." link for files was broken, since the anchor was
not generated.
* id 586925: Fixed parsing problem when an unpaired apostrophe appeared in
a Python comment.
* id 588291: Included fix for doxywizard makefile.
* id 588587: Added missing virtual destructor to CompAccept base class.
* id 588968: Fixed segmentation fault for specific case in PHP code.
* Fixed some issues building for Windows.
* id 589514: Fixed problem handling strings like a"\b" within a comment.
* id 589616: Fixed problem matching explicitly scoped parameter in a
template class.
* id 590712: A namespaced with name "internal" (C++/CLI keyword) could
confuse doxygen's C++ parser.
* id 591749: @optional/@required attributes for Objective-C were missing
from the XML output.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 4 13:17:40 CEST 2009 - mseben@suse.cz Mon May 4 13:17:40 CEST 2009 - mseben@suse.cz
@ -55,6 +140,11 @@ Mon Feb 9 10:00:00 CET 2009 - olh@suse.de
- disable language support on ppc64 - disable language support on ppc64
code size too large, -mminimal-toc does not help code size too large, -mminimal-toc does not help
-------------------------------------------------------------------
Wed Jan 14 12:00:00 CEST 2009 - nico.laus.2001@gmx.de
- updated to compile on Fedora and Mandriva
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 6 13:39:49 CET 2009 - mseben@suse.cz Tue Jan 6 13:39:49 CET 2009 - mseben@suse.cz

95
doxywizard.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package doxywizard (Version 1.5.9) # spec file for package doxywizard (Version 1.6.2)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,25 +19,49 @@
Name: doxywizard Name: doxywizard
BuildRequires: bison flex libdrm-devel libjpeg-devel libqt4-devel update-desktop-files BuildRequires: bison flex gcc-c++ libdrm-devel libjpeg-devel
Version: 1.5.9 Version: 1.6.2
Release: 2 Release: 1
AutoReqProv: on AutoReqProv: on
Requires: doxygen = %{version} Requires: doxygen = %{version}
License: GPL v2 or later License: GPLv2+
Group: Development/Tools/Doc Generators Group: Development/Tools/Doc Generators
Summary: Graphical User Interface for Doxygen Summary: Graphical User Interface for Doxygen
Url: http://www.stack.nl/~dimitri/doxygen/ Url: http://www.stack.nl/~dimitri/doxygen/
Source: doxygen-%{version}.src.tar.bz2 Source: doxygen-%{version}.src.tar.bz2
Source1: doxywizard.desktop Source1: doxywizard.desktop
Patch: doxygen-%{version}-64archs.patch Patch: doxygen-1.5.9-64archs.patch
Patch1: doxygen-%{version}-libpng.patch Patch2: %{name}-1.5.9-flex.patch
Patch2: %{name}-%{version}-flex.patch Patch4: doxygen-1.5.9-arm.patch
Patch4: doxygen-%{version}-arm.patch Patch5: doxygen-1.5.9-man.patch
Patch5: doxygen-%{version}-man.patch Patch6: doxygen-1.5.9-qtdir.patch
Patch6: doxygen-%{version}-qtdir.patch Patch100: doxygen-1.6.0-warnings.patch
Patch100: doxygen.warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#########################################################################################
# SuSE, openSUSE
#########################################################################################
%if 0%{?suse_version}
BuildRequires: libqt4-devel >= 4.3
BuildRequires: update-desktop-files
%define man_ext gz
%endif
#########################################################################################
# Fedora, RHEL or CentOS
#########################################################################################
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: qt4-devel >= 4.3.0
BuildRequires: desktop-file-utils
%define man_ext gz
%endif
#########################################################################################
# Mandrake, Mandriva
#########################################################################################
%if 0%{?mandriva_version} || 0%{?mdkversion}
BuildRequires: libqt4-devel >= 4.3
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
%define man_ext lzma
%endif
%description %description
Doxywizard is a graphical front-end to read/edit/write doxygen Doxywizard is a graphical front-end to read/edit/write doxygen
@ -52,14 +76,28 @@ Authors:
%prep %prep
%setup -q -n doxygen-%{version} %setup -q -n doxygen-%{version}
%patch %patch
%patch1
%patch2 %patch2
%patch4 %patch4
%patch5 %patch5
%if 0%{?suse_version}
%patch6 %patch6
%patch100 %endif
%patch100 -p1
%build %build
%if 0%{?suse_version}
export QTDIR=/usr
%endif
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
export QTDIR=%{_libdir}/qt4/
export PATH=${QTDIR}/bin:${PATH}
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
export QTDIR=/usr/lib/qt4/
%if 0%{?mandriva_version} <= 2009 || 0%{?mdkversion} <= 200900
export PATH=${QTDIR}/bin:${PATH}
%endif
%endif
mintoc= mintoc=
%ifarch ppc64 %ifarch ppc64
mintoc="-DENGLISH_ONLY" mintoc="-DENGLISH_ONLY"
@ -71,7 +109,16 @@ make %{?jobs:-j%jobs}
%install %install
make install INSTALL=$RPM_BUILD_ROOT/usr make install INSTALL=$RPM_BUILD_ROOT/usr
rm -f $RPM_BUILD_ROOT/usr/bin/{doxygen,doxytag} rm -f $RPM_BUILD_ROOT/usr/bin/{doxygen,doxytag}
%suse_update_desktop_file -i doxywizard Development Documentation %if 0%{?suse_version}
%suse_update_desktop_file -i doxywizard Development Documentation
%endif
%if 0%{?fedora_version}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ --add-category Development --add-category Documentation %{SOURCE1}
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
install -d -m 755 %{buildroot}%{_datadir}/applications/
install %{SOURCE1} %{buildroot}%{_datadir}/applications/
%endif
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{doxygen,doxytag}.1 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{doxygen,doxytag}.1
%clean %clean
@ -80,7 +127,19 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%attr(755,root,root) /usr/bin/doxywizard %attr(755,root,root) /usr/bin/doxywizard
/usr/share/applications/doxywizard.desktop %{_datadir}/applications/doxywizard.desktop
%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.gz %attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.%{man_ext}
%post
%if 0%{?mandriva_version} || 0%{?mdkversion}
%update_menus
%{update_desktop_database}
%endif
%postun
%if 0%{?mandriva_version} || 0%{?mdkversion}
%clean_menus
%{clean_desktop_database}
%endif
%changelog %changelog