diff --git a/doxygen-1.5.0-dont-exit-on-warning.patch b/doxygen-1.5.0-dont-exit-on-warning.patch deleted file mode 100644 index 4db1cb6..0000000 --- a/doxygen-1.5.0-dont-exit-on-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -# the warning migh suggest a bug in doxygen, but let's not abort because -# of it (1.5.1 has the same change) ---- src/memberdef.cpp -+++ src/memberdef.cpp -@@ -818,7 +818,6 @@ QCString MemberDef::getOutputFileBase() - "Warning: Internal inconsistency: member %s does not belong to any" - " container!",name().data() - ); -- exit(1); - return "dummy"; - } - else if (separateMemberPages) diff --git a/doxygen-1.5.0-html.tar.bz2 b/doxygen-1.5.0-html.tar.bz2 deleted file mode 100644 index 3a546ba..0000000 --- a/doxygen-1.5.0-html.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:230b0299e0ff0d6a3486b63ef88061c4a5982d8242ef33151edd2f6b3b9dbac8 -size 460700 diff --git a/doxygen-1.5.0.src.tar.bz2 b/doxygen-1.5.0.src.tar.bz2 deleted file mode 100644 index cc1dddb..0000000 --- a/doxygen-1.5.0.src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9960fc21f1a90d30fa88ddf59cc079680b357e08ef0d7469547c3cb0c43f1d6 -size 2390284 diff --git a/doxygen-1.5.0-arm.patch b/doxygen-1.5.1-arm.patch similarity index 92% rename from doxygen-1.5.0-arm.patch rename to doxygen-1.5.1-arm.patch index 42a622e..0c85757 100644 --- a/doxygen-1.5.0-arm.patch +++ b/doxygen-1.5.1-arm.patch @@ -1,6 +1,6 @@ --- qtools/qstring.h +++ qtools/qstring.h -@@ -163,8 +165,10 @@ +@@ -163,8 +163,10 @@ bool isLetterOrNumber() const; bool isDigit() const; diff --git a/doxygen-1.5.0-disable-rtf-debug.patch b/doxygen-1.5.1-disable-rtf-debug.patch similarity index 100% rename from doxygen-1.5.0-disable-rtf-debug.patch rename to doxygen-1.5.1-disable-rtf-debug.patch diff --git a/doxygen-1.5.1-html.tar.bz2 b/doxygen-1.5.1-html.tar.bz2 new file mode 100644 index 0000000..a2bb9ef --- /dev/null +++ b/doxygen-1.5.1-html.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eaa2dc9c6593c1929c501d321211437891302d9256b6a75d754c0cb3133ee0f +size 460780 diff --git a/doxygen-1.5.0-libpng.diff b/doxygen-1.5.1-libpng.diff similarity index 100% rename from doxygen-1.5.0-libpng.diff rename to doxygen-1.5.1-libpng.diff diff --git a/doxygen-1.5.0-man.patch b/doxygen-1.5.1-man.patch similarity index 90% rename from doxygen-1.5.0-man.patch rename to doxygen-1.5.1-man.patch index 82751c1..0251e57 100644 --- a/doxygen-1.5.0-man.patch +++ b/doxygen-1.5.1-man.patch @@ -1,6 +1,6 @@ --- Makefile.in +++ Makefile.in -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ DATE=$(shell date "+%B %Y") diff --git a/doxygen-1.5.1.src.tar.bz2 b/doxygen-1.5.1.src.tar.bz2 new file mode 100644 index 0000000..015dce5 --- /dev/null +++ b/doxygen-1.5.1.src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d77b3620e06e818828782e2c12b8dd73404dffc5aec6db37b3416c2072d9a6ff +size 2255678 diff --git a/doxygen.changes b/doxygen.changes index 3b2c68a..a979d3d 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Feb 5 15:56:24 CET 2007 - anosek@suse.cz + +-updated to version 1.5.1, bugfixes: + * id 148567: @todo at the end of a comment block caused problem + when copied by @copydoc + * id 352420: Fixed bug in LaTeX output (missing space after \bf). + * id 363227: missing output for instance variables defined + in a Python function that has a doc string + * id 363397: Member groups did not appear in a class when + SUBGROUPING was set to YES. + * id 364341: Parsing could become really slow if often included + header files contained using statements. + * id 364673: The values of two enums with the same name + (both in difference scopes) where merged. + * Running 2 instances of doxygen on the same output directory + caused corruption of the temporary files generated by doxygen. + ------------------------------------------------------------------- Thu Nov 16 12:56:20 CET 2006 - mmarek@suse.cz diff --git a/doxygen.spec b/doxygen.spec index eaa1648..3ecb507 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,7 +1,7 @@ # -# spec file for package doxygen (Version 1.5.0) +# spec file for package doxygen (Version 1.5.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,8 +12,8 @@ Name: doxygen BuildRequires: gcc-c++ libpng-devel -Version: 1.5.0 -Release: 10 +Version: 1.5.1 +Release: 1 Autoreqprov: on License: GNU General Public License (GPL) Group: Development/Tools/Doc Generators @@ -29,7 +29,6 @@ Patch1: %{name}-%{version}-libpng.diff Patch2: %{name}-%{version}-arm.patch Patch3: %{name}-%{version}-man.patch Patch4: %{name}-%{version}-disable-rtf-debug.patch -Patch5: %{name}-%{version}-dont-exit-on-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,7 +54,6 @@ Authors: %patch2 %patch3 %patch4 -%patch5 cp -v %{S:3} . bzip2 -d %{name}_manual-%{version}.pdf.bz2 @@ -87,6 +85,21 @@ rm -rf %{buildroot} %attr(755,root,root) /usr/bin/* %changelog -n doxygen +* Mon Feb 05 2007 - anosek@suse.cz +-updated to version 1.5.1, bugfixes: + * id 148567: @todo at the end of a comment block caused problem + when copied by @copydoc + * id 352420: Fixed bug in LaTeX output (missing space after \bf). + * id 363227: missing output for instance variables defined + in a Python function that has a doc string + * id 363397: Member groups did not appear in a class when + SUBGROUPING was set to YES. + * id 364341: Parsing could become really slow if often included + header files contained using statements. + * id 364673: The values of two enums with the same name + (both in difference scopes) where merged. + * Running 2 instances of doxygen on the same output directory + caused corruption of the temporary files generated by doxygen. * Thu Nov 16 2006 - mmarek@suse.cz - don't abort just because of a warning (fixes yast2-core build) (dont-exit-on-warning.patch) diff --git a/doxygen_manual-1.5.0.pdf.bz2 b/doxygen_manual-1.5.0.pdf.bz2 deleted file mode 100644 index 7cb0cd9..0000000 --- a/doxygen_manual-1.5.0.pdf.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6131378adefb183ba1ed543707ea5fddfc11963b857c5ce70b640c2110236fa -size 468456 diff --git a/doxygen_manual-1.5.1.pdf.bz2 b/doxygen_manual-1.5.1.pdf.bz2 new file mode 100644 index 0000000..4afc20e --- /dev/null +++ b/doxygen_manual-1.5.1.pdf.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:358aa99a8b14d25d4d48015195f6f118fcd4dcd4a312d496b1b1095dd358fda3 +size 551619 diff --git a/doxywizard-1.5.0-flex.diff b/doxywizard-1.5.0-flex.diff deleted file mode 100644 index b5d8869..0000000 --- a/doxywizard-1.5.0-flex.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- addon/doxywizard/config.l 2004-07-21 18:37:13.000000000 +0200 -+++ addon/doxywizard/config.l 2004-08-23 17:45:44.000000000 +0200 -@@ -408,6 +408,7 @@ - - %} - -+%option never-interactive - %option nounput - %option noyywrap - diff --git a/doxywizard-1.5.1-flex.diff b/doxywizard-1.5.1-flex.diff new file mode 100644 index 0000000..46562e9 --- /dev/null +++ b/doxywizard-1.5.1-flex.diff @@ -0,0 +1,10 @@ +--- src/config.l ++++ src/config.l +@@ -409,6 +409,7 @@ + + %} + ++%option never-interactive + %option nounput + %option noyywrap + diff --git a/doxywizard-1.5.1-makefile.patch b/doxywizard-1.5.1-makefile.patch new file mode 100644 index 0000000..30ca007 --- /dev/null +++ b/doxywizard-1.5.1-makefile.patch @@ -0,0 +1,17 @@ +--- addon/doxywizard/Makefile.doxywizard ++++ addon/doxywizard/Makefile.doxywizard +@@ -20,11 +20,11 @@ + CC = cc + CXX = c++ + CFLAGS = -pipe -Wall -W -g +-CXXFLAGS= -pipe -D__FreeBSD__=6 -Wall -W -g ++CXXFLAGS= -pipe -Wall -W -g + INCPATH = -I../../src -I$(QTDIR)/include + LINK = c++ +-LFLAGS = -Wl,-search_paths_first +-LIBS = -framework CoreFoundation -framework ApplicationServices -L$(QTDIR)/lib -lqt ++LFLAGS = ++LIBS = -L$(QTDIR)/lib -lqt-mt + MOC = moc + + TAR = tar -cf diff --git a/doxywizard.changes b/doxywizard.changes index aa98d21..2a68f9a 100644 --- a/doxywizard.changes +++ b/doxywizard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 5 16:17:23 CET 2007 - anosek@suse.cz + +- updated to version 1.5.1 + * fixed build (makefile.patch) + ------------------------------------------------------------------- Wed Oct 18 10:47:51 CEST 2006 - anosek@suse.cz diff --git a/doxywizard.spec b/doxywizard.spec index 10d116b..0b97052 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -1,7 +1,7 @@ # -# spec file for package doxywizard (Version 1.5.0) +# spec file for package doxywizard (Version 1.5.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,8 +12,8 @@ Name: doxywizard BuildRequires: libdrm-devel libjpeg-devel qt3-devel update-desktop-files -Version: 1.5.0 -Release: 13 +Version: 1.5.1 +Release: 1 Autoreqprov: on Requires: doxygen = %{version} License: GNU General Public License (GPL) @@ -27,6 +27,7 @@ Patch1: doxygen-%{version}-libpng.diff Patch2: %{name}-%{version}-flex.diff Patch4: doxygen-%{version}-arm.patch Patch5: doxygen-%{version}-man.patch +Patch6: %{name}-%{version}-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +49,7 @@ Authors: %patch2 %patch4 %patch5 +%patch6 %build %{suse_update_libdir tmake/lib/linux-g++/tmake.conf} @@ -78,6 +80,9 @@ rm -rf %{buildroot} %attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.gz %changelog -n doxywizard +* Mon Feb 05 2007 - anosek@suse.cz +- updated to version 1.5.1 + * fixed build (makefile.patch) * Wed Oct 18 2006 - anosek@suse.cz - updated to version 1.5.0 * bugfixes