rpms/doxygen
5
0
Fork 0
Code Issues Pull Requests Releases Activity

1.6.0

Browse Source
This commit is contained in:
Than Ngo 2009-08-21 14:46:13 +00:00
parent c14f04d358
commit f680966a2b
6 changed files with 51 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -16,3 +16,4 @@ doxygen-1.5.6.src.tar.gz
doxygen-1.5.7.1.src.tar.gz doxygen-1.5.7.1.src.tar.gz
doxygen-1.5.8.src.tar.gz doxygen-1.5.8.src.tar.gz
doxygen-1.5.9.src.tar.gz doxygen-1.5.9.src.tar.gz
doxygen-1.6.0.src.tar.gz

108
doxygen-1.5.5-system-png.patch
View File

@ -1,108 +0,0 @@
diff -up doxygen-1.5.8/configure.system-png doxygen-1.5.8/configure
--- doxygen-1.5.8/configure.system-png 2009-02-06 17:17:34.000000000 +0100
+++ doxygen-1.5.8/configure 2009-02-06 17:17:34.000000000 +0100
@@ -576,7 +576,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
@@ -593,7 +593,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
@@ -617,7 +616,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
diff -up doxygen-1.5.8/Makefile.in.system-png doxygen-1.5.8/Makefile.in
--- doxygen-1.5.8/Makefile.in.system-png 2009-02-06 17:17:34.000000000 +0100
+++ doxygen-1.5.8/Makefile.in 2009-02-06 17:17:34.000000000 +0100
@@ -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
@@ -75,7 +72,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
diff -up doxygen-1.5.8/src/doxygen.pro.in.system-png doxygen-1.5.8/src/doxygen.pro.in
--- doxygen-1.5.8/src/doxygen.pro.in.system-png 2008-01-01 11:40:58.000000000 +0100
+++ doxygen-1.5.8/src/doxygen.pro.in 2009-02-06 17:17:34.000000000 +0100
@@ -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
diff -up doxygen-1.5.8/src/libdoxygen.pro.in.system-png doxygen-1.5.8/src/libdoxygen.pro.in
--- doxygen-1.5.8/src/libdoxygen.pro.in.system-png 2008-10-19 15:50:34.000000000 +0200
+++ doxygen-1.5.8/src/libdoxygen.pro.in 2009-02-06 18:15:08.000000000 +0100
@@ -233,9 +233,8 @@ SOURCES = ce_lex.cpp \
win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
-linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+linux-g++:TMAKE_CXXFLAGS +=
INCLUDEPATH += ../qtools
-INCLUDEPATH += ../libpng
INCLUDEPATH += ../libmd5
win32:INCLUDEPATH += .
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
diff -up doxygen-1.5.8/src/pngenc.cpp.system-png doxygen-1.5.8/src/pngenc.cpp
--- doxygen-1.5.8/src/pngenc.cpp.system-png 2008-01-01 11:41:08.000000000 +0100
+++ doxygen-1.5.8/src/pngenc.cpp 2009-02-06 17:17:34.000000000 +0100
@@ -25,7 +25,7 @@
#endif
#define ALL_STATIC
-#include <../libpng/png.h>
+#include <png.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

12
doxygen-1.5.8-qt4.patch
View File

@ -1,12 +0,0 @@
diff -up doxygen-1.5.8/configure.qt4 doxygen-1.5.8/configure
--- doxygen-1.5.8/configure.qt4 2008-12-26 20:22:39.000000000 +0100
+++ doxygen-1.5.8/configure 2009-02-06 11:00:44.000000000 +0100
@@ -268,7 +268,7 @@ if test "$f_wizard" = YES; then
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/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
if test -x "$d/bin/qmake"; then
QTDIR=$d
fi

63
doxygen-1.5.8-config.patch → doxygen-1.6.0-config.patch
View File

@ -1,18 +1,16 @@
diff -up doxygen-1.5.8/configure.orig doxygen-1.5.8/configure diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
--- doxygen-1.5.8/configure.orig 2008-12-26 20:22:39.000000000 +0100 --- doxygen-1.6.0/addon/doxywizard/Makefile.in.config 2009-07-13 22:09:03.000000000 +0200
+++ doxygen-1.5.8/configure 2009-02-06 11:00:44.000000000 +0100 +++ doxygen-1.6.0/addon/doxywizard/Makefile.in 2009-08-21 16:42:13.000000000 +0200
@@ -485,6 +485,7 @@ INSTTOOL = $f_insttool @@ -10,8 +10,6 @@
DOXYDOCS = .. # See the GNU General Public License for more details.
DOCDIR = $f_docdir #
QTDIR = $QTDIR
+MAN1DIR = share/man/man1
EOF
if test "$f_dot" != NO; then -QMAKE=qmake
diff -up doxygen-1.5.8/addon/doxywizard/Makefile.in.orig doxygen-1.5.8/addon/doxywizard/Makefile.in -
--- doxygen-1.5.8/addon/doxywizard/Makefile.in.orig 2009-02-06 14:55:30.000000000 +0100 all: Makefile.doxywizard
+++ doxygen-1.5.8/addon/doxywizard/Makefile.in 2009-02-06 14:56:08.000000000 +0100 $(MAKE) -f Makefile.doxywizard
@@ -29,11 +29,11 @@ distclean: Makefile.doxywizard
@@ -29,11 +27,11 @@ distclean: Makefile.doxywizard
$(RM) Makefile.doxywizard $(RM) Makefile.doxywizard
install: install:
@ -28,9 +26,33 @@ diff -up doxygen-1.5.8/addon/doxywizard/Makefile.in.orig doxygen-1.5.8/addon/dox
rm doxywizard.1 rm doxywizard.1
FORCE: FORCE:
diff -up doxygen-1.5.8/Makefile.in.orig doxygen-1.5.8/Makefile.in diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
--- doxygen-1.5.8/Makefile.in.orig 2009-02-06 15:00:41.000000000 +0100 --- doxygen-1.6.0/configure.config 2009-08-20 14:15:07.000000000 +0200
+++ doxygen-1.5.8/Makefile.in 2009-02-06 15:00:54.000000000 +0100 +++ doxygen-1.6.0/configure 2009-08-21 16:41:36.000000000 +0200
@@ -268,9 +268,10 @@ if test "$f_wizard" = YES; then
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/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
if test -x "$d/bin/qmake"; then
QTDIR=$d
+ QMAKE=$d/bin/qmake
fi
done
else
@@ -485,6 +486,8 @@ INSTTOOL = $f_insttool
DOXYDOCS = ..
DOCDIR = $f_docdir
QTDIR = $QTDIR
+QMAKE = $QMAKE
+MAN1DIR = share/man/man1
EOF
if test "$f_dot" != NO; then
diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
--- doxygen-1.6.0/Makefile.in.config 2009-08-14 15:58:42.000000000 +0200
+++ doxygen-1.6.0/Makefile.in 2009-08-21 16:34:02.000000000 +0200
@@ -44,8 +44,6 @@ distclean: clean @@ -44,8 +44,6 @@ distclean: clean
DATE=$(shell date "+%B %Y") DATE=$(shell date "+%B %Y")
@ -40,9 +62,9 @@ diff -up doxygen-1.5.8/Makefile.in.orig doxygen-1.5.8/Makefile.in
install: doxywizard_install install: doxywizard_install
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
$(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
diff -up doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf.orig doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf diff -up doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf.orig 2009-02-06 17:08:45.000000000 +0100 --- doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config 2008-12-06 14:16:20.000000000 +0100
+++ doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf 2009-02-06 17:12:16.000000000 +0100 +++ doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf 2009-08-21 16:34:02.000000000 +0200
@@ -11,7 +11,7 @@ TMAKE_CC = gcc @@ -11,7 +11,7 @@ TMAKE_CC = gcc
TMAKE_CFLAGS = -pipe TMAKE_CFLAGS = -pipe
TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions
@ -71,4 +93,3 @@ diff -up doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf.orig doxygen-1.5.8/tmake/l
TMAKE_LINK = g++ TMAKE_LINK = g++
TMAKE_LINK_SHLIB = g++ TMAKE_LINK_SHLIB = g++
diff -up doxygen-1.5.8/tmake/lib/macosx-uni-c++/tmake.conf.orig doxygen-1.5.8/tmake/lib/macosx-uni-c++/tmake.conf

15
doxygen.spec
View File

@ -5,17 +5,15 @@
Summary: A documentation system for C/C++. Summary: A documentation system for C/C++.
Name: doxygen Name: doxygen
Version: 1.5.9 Version: 1.6.0
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
Url: http://www.stack.nl/~dimitri/doxygen/index.html
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
Patch1: doxygen-1.5.8-config.patch Patch1: doxygen-1.6.0-config.patch
Patch2: doxygen-1.5.8-qt4.patch
Patch3: doxygen-1.5.5-system-png.patch
Group: Development/Tools Group: Development/Tools
# No version is specified. # No version is specified.
License: GPL+ License: GPL+
Url: http://www.stack.nl/~dimitri/doxygen/index.html
BuildRequires: perl BuildRequires: perl
BuildRequires: texlive-dvips BuildRequires: texlive-dvips
@ -51,8 +49,6 @@ are used by doxygen.
%setup -q %setup -q
%patch1 -p1 -b .config %patch1 -p1 -b .config
%patch2 -p1 -b .qt4
%patch3 -p1 -b .system-png
%build %build
unset QTDIR unset QTDIR
@ -103,6 +99,9 @@ rm -rf %{buildroot}
%endif %endif
%changelog %changelog
* Fri Aug 21 2009 Than Ngo <than@redhat.com> - 1.6.0-1
- 1.6.0
* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.9-3 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.9-3
- Convert specfile to UTF-8. - Convert specfile to UTF-8.

2
sources
View File

@ -1 +1 @@
33c5598fa6d24cbc55849eaf89652557 doxygen-1.5.9.src.tar.gz 54b2e1fe0de7071fe135bd0297d903ff doxygen-1.6.0.src.tar.gz