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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=11

Browse Source
This commit is contained in:
OBS User unknown 2009-02-09 11:29:16 +00:00 committed by Git OBS Bridge
parent 837cfaa50c
commit 5eea6b4e5e
9 changed files with 212 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
doxygen-1.5.8-64archs.patch
View File

@ -1,26 +1,32 @@
--- qtools/qgdict.cpp ---
qtools/qgdict.cpp | 6 +++---
src/util.cpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- qtools/qgdict.cpp.orig
+++ qtools/qgdict.cpp +++ qtools/qgdict.cpp
@@ -996,7 +996,7 @@ @@ -996,15 +996,15 @@ QDataStream &QGDict::read( QDataStream &
break; break;
case IntKey: case IntKey:
{ {
- Q_UINT32 k; - Q_UINT32 k;
+ Q_UINT64 k; + unsigned long k;
s >> k; s >> k;
read( s, d ); read( s, d );
look_int( k, d, op_insert ); - look_int( k, d, op_insert );
@@ -1004,7 +1004,7 @@ + look_int( (long)k, d, op_insert );
}
break; break;
case PtrKey: case PtrKey:
{ {
- Q_UINT32 k; - Q_UINT32 k;
+ Q_UINT64 k; + unsigned long k;
s >> k; s >> k;
read( s, d ); read( s, d );
// ### cannot insert 0 - this renders the thing // ### cannot insert 0 - this renders the thing
--- src/util.cpp --- src/util.cpp.orig
+++ src/util.cpp +++ src/util.cpp
@@ -4539,10 +4539,10 @@ @@ -4774,10 +4774,10 @@ QCString convertNameToFile(const char *n
{ {
static QDict<int> usedNames(10007); static QDict<int> usedNames(10007);
usedNames.setAutoDelete(TRUE); usedNames.setAutoDelete(TRUE);
@ -33,7 +39,7 @@
if (value==0) if (value==0)
{ {
usedNames.insert(name,new int(count)); usedNames.insert(name,new int(count));
@@ -4552,7 +4552,7 @@ @@ -4787,7 +4787,7 @@ QCString convertNameToFile(const char *n
{ {
num = *value; num = *value;
} }

8
doxygen-1.5.8-arm.patch
View File

@ -1,6 +1,10 @@
--- qtools/qstring.h ---
qtools/qstring.h | 2 ++
1 file changed, 2 insertions(+)
--- qtools/qstring.h.orig
+++ qtools/qstring.h +++ qtools/qstring.h
@@ -163,8 +163,10 @@ @@ -163,8 +163,10 @@ public:
bool isLetterOrNumber() const; bool isLetterOrNumber() const;
bool isDigit() const; bool isDigit() const;

52
doxygen-1.5.8-libpng.patch
View File

@ -1,6 +1,16 @@
--- Makefile.in ---
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 +++ Makefile.in
@@ -7,7 +7,6 @@ @@ -9,7 +9,6 @@ clean: FORCE
cd doc ; $(MAKE) clean cd doc ; $(MAKE) clean
cd qtools ; $(MAKE) clean cd qtools ; $(MAKE) clean
cd src ; $(MAKE) clean cd src ; $(MAKE) clean
@ -8,7 +18,7 @@
cd libmd5 ; $(MAKE) clean cd libmd5 ; $(MAKE) clean
cd addon/doxywizard ; $(MAKE) clean cd addon/doxywizard ; $(MAKE) clean
cd addon/doxmlparser/src ; $(MAKE) clean cd addon/doxmlparser/src ; $(MAKE) clean
@@ -18,7 +17,6 @@ @@ -20,7 +19,6 @@ clean: FORCE
distclean: clean distclean: clean
cd src ; $(MAKE) distclean cd src ; $(MAKE) distclean
@ -16,7 +26,7 @@
cd libmd5 ; $(MAKE) distclean cd libmd5 ; $(MAKE) distclean
cd addon/doxywizard ; $(MAKE) distclean cd addon/doxywizard ; $(MAKE) distclean
cd addon/doxmlparser/src ; $(MAKE) distclean cd addon/doxmlparser/src ; $(MAKE) distclean
@@ -32,11 +30,10 @@ @@ -34,11 +32,10 @@ distclean: clean
-rm -f objects/*.o -rm -f objects/*.o
-rm -f src/Makefile.doxygen src/Makefile.libdoxygen -rm -f src/Makefile.doxygen src/Makefile.libdoxygen
-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
@ -28,8 +38,8 @@
+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.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 -f src/version.cpp
-rm -r addon/doxywizard/Makefile -rm -r addon/doxywizard/Makefile
-rm -f addon/doxywizard/Makefile.doxywizard -rm -f addon/doxywizard/doxywizard.pro
@@ -81,7 +78,7 @@ @@ -77,7 +74,7 @@ docs: FORCE
pdf: docs pdf: docs
cd latex ; $(MAKE) cd latex ; $(MAKE)
@ -38,9 +48,9 @@
qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \ Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
VERSION packages winbuild VERSION packages winbuild
--- configure --- configure.orig
+++ configure +++ configure
@@ -525,7 +525,7 @@ @@ -575,7 +575,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
EOF EOF
fi fi
@ -49,7 +59,7 @@
for i in $f_inmakefiles ; do for i in $f_inmakefiles ; do
SRC=$i SRC=$i
@@ -542,7 +542,6 @@ @@ -592,7 +592,6 @@ EOF
echo "" >> $DST echo "" >> $DST
echo "all: src/version.cpp " >> $DST echo "all: src/version.cpp " >> $DST
echo " \$(MAKE) -C qtools" >> $DST echo " \$(MAKE) -C qtools" >> $DST
@ -57,7 +67,7 @@
echo " \$(MAKE) -C libmd5" >> $DST echo " \$(MAKE) -C libmd5" >> $DST
echo " \$(MAKE) -C src" >> $DST echo " \$(MAKE) -C src" >> $DST
if test $f_wizard = YES; then if test $f_wizard = YES; then
@@ -562,7 +561,7 @@ @@ -616,7 +615,7 @@ EOF
echo " Created $DST from $SRC..." echo " Created $DST from $SRC..."
done done
@ -66,31 +76,31 @@
for i in $f_inprofiles ; do for i in $f_inprofiles ; do
SRC=$i SRC=$i
--- src/doxygen.pro --- src/doxygen.pro.orig
+++ src/doxygen.pro +++ src/doxygen.pro
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
win32:TMAKE_CXXFLAGS += -DQT_NODLL win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-INCLUDEPATH += ../qtools ../libpng ../libmd5 . -INCLUDEPATH += ../qtools ../libpng ../libmd5 .
+INCLUDEPATH += ../qtools ../libmd5 . +INCLUDEPATH += ../qtools ../libmd5 .
#win32-g++:INCLUDEPATH -= ../libpng #win32-g++:INCLUDEPATH -= ../libpng
DESTDIR = ../bin DESTDIR = ../bin
TARGET = doxygen TARGET = doxygen
--- src/doxygen.pro.in --- src/doxygen.pro.in.orig
+++ src/doxygen.pro.in +++ src/doxygen.pro.in
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
win32:TMAKE_CXXFLAGS += -DQT_NODLL win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-INCLUDEPATH += ../qtools ../libpng ../libmd5 . -INCLUDEPATH += ../qtools ../libpng ../libmd5 .
+INCLUDEPATH += ../qtools ../libmd5 . +INCLUDEPATH += ../qtools ../libmd5 .
#win32-g++:INCLUDEPATH -= ../libpng #win32-g++:INCLUDEPATH -= ../libpng
DESTDIR = ../bin DESTDIR = ../bin
TARGET = doxygen TARGET = doxygen
--- src/libdoxygen.pro --- src/libdoxygen.pro.orig
+++ src/libdoxygen.pro +++ src/libdoxygen.pro
@@ -211,7 +211,6 @@ @@ -239,7 +239,6 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
INCLUDEPATH += ../qtools INCLUDEPATH += ../qtools
@ -98,9 +108,9 @@
INCLUDEPATH += ../libmd5 INCLUDEPATH += ../libmd5
win32:INCLUDEPATH += . win32:INCLUDEPATH += .
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
--- src/libdoxygen.pro.in --- src/libdoxygen.pro.in.orig
+++ src/libdoxygen.pro.in +++ src/libdoxygen.pro.in
@@ -207,7 +207,6 @@ @@ -235,7 +235,6 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
INCLUDEPATH += ../qtools INCLUDEPATH += ../qtools
@ -108,7 +118,7 @@
INCLUDEPATH += ../libmd5 INCLUDEPATH += ../libmd5
win32:INCLUDEPATH += . win32:INCLUDEPATH += .
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
--- src/pngenc.cpp --- src/pngenc.cpp.orig
+++ src/pngenc.cpp +++ src/pngenc.cpp
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
#endif #endif

29
doxygen-1.5.8-man.patch
View File

@ -1,9 +1,26 @@
--- ./Makefile.in ---
+++ ./Makefile.in Makefile.in | 2 --
@@ -50,2 +49,0 @@ DATE=$(shell date "+%B %Y") configure | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
--- Makefile.in.orig
+++ Makefile.in
@@ -44,8 +44,6 @@ distclean: clean
DATE=$(shell date "+%B %Y")
-MAN1DIR = man/man1 -MAN1DIR = man/man1
- -
--- ./configure install: doxywizard_install
+++ ./configure $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
@@ -487,0 +488 @@ QTDIR = $QTDIR $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
--- configure.orig
+++ configure
@@ -485,6 +485,7 @@ INSTTOOL = $f_insttool
DOXYDOCS = ..
DOCDIR = $f_docdir
QTDIR = $QTDIR
+MAN1DIR = share/man/man1 +MAN1DIR = share/man/man1
EOF
if test "$f_dot" != NO; then

9
doxygen.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 9 10:00:00 CET 2009 - olh@suse.de
- compile with RPM_OPT_FLAGS again
- apply 64bit patch unconditionally
- fix compile warnings for string and signed char handling
- disable language support on ppc64
code size too large, -mminimal-toc does not help
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 6 13:31:44 CET 2009 - mseben@suse.cz Tue Jan 6 13:31:44 CET 2009 - mseben@suse.cz

17
doxygen.spec
View File

@ -21,7 +21,7 @@
Name: doxygen Name: doxygen
BuildRequires: bison flex gcc-c++ libpng-devel BuildRequires: bison flex gcc-c++ libpng-devel
Version: 1.5.8 Version: 1.5.8
Release: 1 Release: 2
AutoReqProv: on AutoReqProv: on
License: GPL v2 or later License: GPL v2 or later
Group: Development/Tools/Doc Generators Group: Development/Tools/Doc Generators
@ -36,6 +36,7 @@ Patch: %{name}-%{version}-64archs.patch
Patch1: %{name}-%{version}-libpng.patch Patch1: %{name}-%{version}-libpng.patch
Patch2: %{name}-%{version}-arm.patch Patch2: %{name}-%{version}-arm.patch
Patch3: %{name}-%{version}-man.patch Patch3: %{name}-%{version}-man.patch
Patch100: doxygen.warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -54,16 +55,20 @@ Authors:
%prep %prep
%setup -q -b 2 %setup -q -b 2
%ifarch s390x ia64 ppc64 x86_64
%patch %patch
%endif
%patch1 %patch1
%patch2 %patch2
%patch3 %patch3
%patch100
cp -v %{S:3} . cp -v %{S:3} .
bzip2 -d %{name}_manual-%{version}.pdf.bz2 bzip2 -d %{name}_manual-%{version}.pdf.bz2
%build %build
mintoc=
%ifarch ppc64
mintoc="-DENGLISH_ONLY"
%endif
sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS $mintoc@" tmake/lib/linux-g++/tmake.conf
./configure --prefix /usr --install /usr/bin/install ./configure --prefix /usr --install /usr/bin/install
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
@ -85,6 +90,12 @@ rm -rf %{buildroot}
%attr(755,root,root) /usr/bin/* %attr(755,root,root) /usr/bin/*
%changelog %changelog
* Mon Feb 09 2009 olh@suse.de
- compile with RPM_OPT_FLAGS again
- apply 64bit patch unconditionally
- fix compile warnings for string and signed char handling
- disable language support on ppc64
code size too large, -mminimal-toc does not help
* Tue Jan 06 2009 mseben@suse.cz * Tue Jan 06 2009 mseben@suse.cz
- updated to version 1.5.8 - updated to version 1.5.8
Changes: Changes:

89
doxygen.warnings.patch Normal file
View File

@ -0,0 +1,89 @@
---
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:

9
doxywizard.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 9 10:00:00 CET 2009 - olh@suse.de
- compile with RPM_OPT_FLAGS again
- apply 64bit patch unconditionally
- fix compile warnings for string and signed char handling
- disable language support on ppc64
code size too large, -mminimal-toc does not help
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 6 13:39:49 CET 2009 - mseben@suse.cz Tue Jan 6 13:39:49 CET 2009 - mseben@suse.cz

17
doxywizard.spec
View File

@ -21,7 +21,7 @@
Name: doxywizard Name: doxywizard
BuildRequires: bison flex libdrm-devel libjpeg-devel libqt4-devel update-desktop-files BuildRequires: bison flex libdrm-devel libjpeg-devel libqt4-devel update-desktop-files
Version: 1.5.8 Version: 1.5.8
Release: 1 Release: 2
AutoReqProv: on AutoReqProv: on
Requires: doxygen = %{version} Requires: doxygen = %{version}
License: GPL v2 or later License: GPL v2 or later
@ -36,6 +36,7 @@ Patch2: %{name}-%{version}-flex.patch
Patch4: doxygen-%{version}-arm.patch Patch4: doxygen-%{version}-arm.patch
Patch5: doxygen-%{version}-man.patch Patch5: doxygen-%{version}-man.patch
Patch6: doxygen-%{version}-qtdir.patch Patch6: doxygen-%{version}-qtdir.patch
Patch100: doxygen.warnings.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -50,16 +51,20 @@ Authors:
%prep %prep
%setup -q -n doxygen-%{version} %setup -q -n doxygen-%{version}
%ifarch s390x ia64 ppc64 x86_64
%patch %patch
%endif
%patch1 %patch1
%patch2 %patch2
%patch4 %patch4
%patch5 %patch5
%patch6 %patch6
%patch100
%build %build
mintoc=
%ifarch ppc64
mintoc="-DENGLISH_ONLY"
%endif
sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS $mintoc@" tmake/lib/linux-g++/tmake.conf
./configure --with-doxywizard ./configure --with-doxywizard
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
@ -79,6 +84,12 @@ rm -rf %{buildroot}
%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.gz %attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.gz
%changelog %changelog
* Mon Feb 09 2009 olh@suse.de
- compile with RPM_OPT_FLAGS again
- apply 64bit patch unconditionally
- fix compile warnings for string and signed char handling
- disable language support on ppc64
code size too large, -mminimal-toc does not help
* Tue Jan 06 2009 mseben@suse.cz * Tue Jan 06 2009 mseben@suse.cz
- updated to version 1.5.8 - updated to version 1.5.8
Changes Changes