From 5eea6b4e5eb112fb7e0c976ce5fab28e73b7d5a4c8faea127783f44b6c9b47f6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 9 Feb 2009 11:29:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=11 --- doxygen-1.5.8-64archs.patch | 26 ++++++----- doxygen-1.5.8-arm.patch | 8 +++- doxygen-1.5.8-libpng.patch | 54 +++++++++++++--------- doxygen-1.5.8-man.patch | 29 +++++++++--- doxygen.changes | 9 ++++ doxygen.spec | 17 +++++-- doxygen.warnings.patch | 89 +++++++++++++++++++++++++++++++++++++ doxywizard.changes | 9 ++++ doxywizard.spec | 17 +++++-- 9 files changed, 212 insertions(+), 46 deletions(-) create mode 100644 doxygen.warnings.patch diff --git a/doxygen-1.5.8-64archs.patch b/doxygen-1.5.8-64archs.patch index baf71bc..885a280 100644 --- a/doxygen-1.5.8-64archs.patch +++ b/doxygen-1.5.8-64archs.patch @@ -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 -@@ -996,7 +996,7 @@ +@@ -996,15 +996,15 @@ QDataStream &QGDict::read( QDataStream & break; case IntKey: { - Q_UINT32 k; -+ Q_UINT64 k; ++ unsigned long k; s >> k; read( s, d ); - look_int( k, d, op_insert ); -@@ -1004,7 +1004,7 @@ +- look_int( k, d, op_insert ); ++ look_int( (long)k, d, op_insert ); + } break; case PtrKey: { - Q_UINT32 k; -+ Q_UINT64 k; ++ unsigned long k; s >> k; read( s, d ); // ### cannot insert 0 - this renders the thing ---- src/util.cpp +--- src/util.cpp.orig +++ src/util.cpp -@@ -4539,10 +4539,10 @@ +@@ -4774,10 +4774,10 @@ QCString convertNameToFile(const char *n { static QDict usedNames(10007); usedNames.setAutoDelete(TRUE); @@ -33,12 +39,12 @@ if (value==0) { usedNames.insert(name,new int(count)); -@@ -4552,7 +4552,7 @@ +@@ -4787,7 +4787,7 @@ QCString convertNameToFile(const char *n { num = *value; } - result.sprintf("a%05d",num); -+ result.sprintf("a%05ld",num); ++ result.sprintf("a%05ld",num); } else // long names { diff --git a/doxygen-1.5.8-arm.patch b/doxygen-1.5.8-arm.patch index 0c85757..3ed66bd 100644 --- a/doxygen-1.5.8-arm.patch +++ b/doxygen-1.5.8-arm.patch @@ -1,6 +1,10 @@ ---- qtools/qstring.h +--- + qtools/qstring.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- qtools/qstring.h.orig +++ qtools/qstring.h -@@ -163,8 +163,10 @@ +@@ -163,8 +163,10 @@ public: bool isLetterOrNumber() const; bool isDigit() const; diff --git a/doxygen-1.5.8-libpng.patch b/doxygen-1.5.8-libpng.patch index b25b30f..e5912f1 100644 --- a/doxygen-1.5.8-libpng.patch +++ b/doxygen-1.5.8-libpng.patch @@ -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 -@@ -7,7 +7,6 @@ +@@ -9,7 +9,6 @@ clean: FORCE cd doc ; $(MAKE) clean cd qtools ; $(MAKE) clean cd src ; $(MAKE) clean @@ -8,7 +18,7 @@ cd libmd5 ; $(MAKE) clean cd addon/doxywizard ; $(MAKE) clean cd addon/doxmlparser/src ; $(MAKE) clean -@@ -18,7 +17,6 @@ +@@ -20,7 +19,6 @@ clean: FORCE distclean: clean cd src ; $(MAKE) distclean @@ -16,7 +26,7 @@ cd libmd5 ; $(MAKE) distclean cd addon/doxywizard ; $(MAKE) distclean cd addon/doxmlparser/src ; $(MAKE) distclean -@@ -32,11 +30,10 @@ +@@ -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 @@ -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/version.cpp -rm -r addon/doxywizard/Makefile - -rm -f addon/doxywizard/Makefile.doxywizard -@@ -81,7 +78,7 @@ + -rm -f addon/doxywizard/doxywizard.pro +@@ -77,7 +74,7 @@ docs: FORCE pdf: docs cd latex ; $(MAKE) @@ -38,9 +48,9 @@ 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 +--- configure.orig +++ configure -@@ -525,7 +525,7 @@ +@@ -575,7 +575,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY EOF fi @@ -49,7 +59,7 @@ for i in $f_inmakefiles ; do SRC=$i -@@ -542,7 +542,6 @@ +@@ -592,7 +592,6 @@ EOF echo "" >> $DST echo "all: src/version.cpp " >> $DST echo " \$(MAKE) -C qtools" >> $DST @@ -57,40 +67,40 @@ echo " \$(MAKE) -C libmd5" >> $DST echo " \$(MAKE) -C src" >> $DST if test $f_wizard = YES; then -@@ -562,7 +561,7 @@ +@@ -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" ++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 +--- src/doxygen.pro.orig +++ src/doxygen.pro -@@ -32,7 +32,7 @@ +@@ -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 + 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 +--- src/doxygen.pro.in.orig +++ src/doxygen.pro.in -@@ -28,7 +28,7 @@ +@@ -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 + 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 +--- src/libdoxygen.pro.orig +++ src/libdoxygen.pro -@@ -211,7 +211,6 @@ +@@ -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 @@ -98,9 +108,9 @@ INCLUDEPATH += ../libmd5 win32:INCLUDEPATH += . win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 ---- src/libdoxygen.pro.in +--- src/libdoxygen.pro.in.orig +++ 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 linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti INCLUDEPATH += ../qtools @@ -108,7 +118,7 @@ INCLUDEPATH += ../libmd5 win32:INCLUDEPATH += . win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 ---- src/pngenc.cpp +--- src/pngenc.cpp.orig +++ src/pngenc.cpp @@ -25,7 +25,7 @@ #endif diff --git a/doxygen-1.5.8-man.patch b/doxygen-1.5.8-man.patch index 8740c30..358668b 100644 --- a/doxygen-1.5.8-man.patch +++ b/doxygen-1.5.8-man.patch @@ -1,9 +1,26 @@ ---- ./Makefile.in -+++ ./Makefile.in -@@ -50,2 +49,0 @@ DATE=$(shell date "+%B %Y") +--- + Makefile.in | 2 -- + 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 - ---- ./configure -+++ ./configure -@@ -487,0 +488 @@ QTDIR = $QTDIR + install: doxywizard_install + $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin + $(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 + EOF + + if test "$f_dot" != NO; then diff --git a/doxygen.changes b/doxygen.changes index 9149aed..e5eced8 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -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 diff --git a/doxygen.spec b/doxygen.spec index 12b18d6..3531b8d 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -21,7 +21,7 @@ Name: doxygen BuildRequires: bison flex gcc-c++ libpng-devel Version: 1.5.8 -Release: 1 +Release: 2 AutoReqProv: on License: GPL v2 or later Group: Development/Tools/Doc Generators @@ -36,6 +36,7 @@ Patch: %{name}-%{version}-64archs.patch Patch1: %{name}-%{version}-libpng.patch Patch2: %{name}-%{version}-arm.patch Patch3: %{name}-%{version}-man.patch +Patch100: doxygen.warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,16 +55,20 @@ Authors: %prep %setup -q -b 2 -%ifarch s390x ia64 ppc64 x86_64 %patch -%endif %patch1 %patch2 %patch3 +%patch100 cp -v %{S:3} . bzip2 -d %{name}_manual-%{version}.pdf.bz2 %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 make %{?jobs:-j%jobs} @@ -85,6 +90,12 @@ rm -rf %{buildroot} %attr(755,root,root) /usr/bin/* %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 - updated to version 1.5.8 Changes: diff --git a/doxygen.warnings.patch b/doxygen.warnings.patch new file mode 100644 index 0000000..cad7461 --- /dev/null +++ b/doxygen.warnings.patch @@ -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