rpms/doxygen/F-9 doxygen-1.5.5-system-png.patch, 1.1, 1.2 doxygen.spec, 1.55, 1.56 sources, 1.28, 1.29 doxygen-1.2.18-libdir.patch, 1.3, NONE doxygen-1.2.18-libdir64.patch, 1.1, NONE doxygen-1.5.6-config.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Fri Jul 3 11:03:41 UTC 2009
Author: than
Update of /cvs/extras/rpms/doxygen/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31727
Modified Files:
doxygen-1.5.5-system-png.patch doxygen.spec sources
Removed Files:
doxygen-1.2.18-libdir.patch doxygen-1.2.18-libdir64.patch
doxygen-1.5.6-config.patch
Log Message:
1.5.9
doxygen-1.5.5-system-png.patch:
Index: doxygen-1.5.5-system-png.patch
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-9/doxygen-1.5.5-system-png.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- doxygen-1.5.5-system-png.patch 20 Feb 2008 13:59:11 -0000 1.1
+++ doxygen-1.5.5-system-png.patch 3 Jul 2009 11:03:40 -0000 1.2
@@ -1,7 +1,36 @@
-diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
---- doxygen-1.5.5/Makefile.in.me 2008-02-20 14:36:50.000000000 +0100
-+++ doxygen-1.5.5/Makefile.in 2008-02-20 14:37:12.000000000 +0100
-@@ -7,7 +7,6 @@ clean: FORCE
+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
@@ -9,7 +38,7 @@ diff -up doxygen-1.5.5/Makefile.in.me do
cd libmd5 ; $(MAKE) clean
cd addon/doxywizard ; $(MAKE) clean
cd addon/doxmlparser/src ; $(MAKE) clean
-@@ -18,7 +17,6 @@ clean: FORCE
+@@ -20,7 +19,6 @@ clean: FORCE
distclean: clean
cd src ; $(MAKE) distclean
@@ -17,7 +46,7 @@ diff -up doxygen-1.5.5/Makefile.in.me do
cd libmd5 ; $(MAKE) distclean
cd addon/doxywizard ; $(MAKE) distclean
cd addon/doxmlparser/src ; $(MAKE) distclean
-@@ -32,11 +30,10 @@ distclean: clean
+@@ -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
@@ -29,8 +58,8 @@ diff -up doxygen-1.5.5/Makefile.in.me do
+ -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
-@@ -83,7 +80,7 @@ docs: FORCE
+ -rm -f addon/doxywizard/doxywizard.pro
+@@ -75,7 +72,7 @@ docs: FORCE
pdf: docs
cd latex ; $(MAKE)
@@ -39,61 +68,9 @@ diff -up doxygen-1.5.5/Makefile.in.me do
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.5/configure.me doxygen-1.5.5/configure
---- doxygen-1.5.5/configure.me 2008-02-20 14:35:56.000000000 +0100
-+++ doxygen-1.5.5/configure 2008-02-20 14:36:42.000000000 +0100
-@@ -540,7 +540,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
-@@ -557,7 +557,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
-@@ -577,7 +576,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.5/src/pngenc.cpp.me doxygen-1.5.5/src/pngenc.cpp
---- doxygen-1.5.5/src/pngenc.cpp.me 2008-02-20 14:38:46.000000000 +0100
-+++ doxygen-1.5.5/src/pngenc.cpp 2008-02-20 14:39:11.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>
-diff -up doxygen-1.5.5/src/libdoxygen.pro.in.me doxygen-1.5.5/src/libdoxygen.pro.in
---- doxygen-1.5.5/src/libdoxygen.pro.in.me 2008-02-20 14:38:08.000000000 +0100
-+++ doxygen-1.5.5/src/libdoxygen.pro.in 2008-02-20 14:38:29.000000000 +0100
-@@ -224,7 +224,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
-diff -up doxygen-1.5.5/src/doxygen.pro.in.me doxygen-1.5.5/src/doxygen.pro.in
---- doxygen-1.5.5/src/doxygen.pro.in.me 2008-02-20 14:37:34.000000000 +0100
-+++ doxygen-1.5.5/src/doxygen.pro.in 2008-02-20 14:37:54.000000000 +0100
+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
@@ -103,3 +80,29 @@ diff -up doxygen-1.5.5/src/doxygen.pro.i
#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>
Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-9/doxygen.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- doxygen.spec 26 Nov 2008 13:11:18 -0000 1.55
+++ doxygen.spec 3 Jul 2009 11:03:41 -0000 1.56
@@ -1,20 +1,17 @@
%define _default_patch_fuzz 2
-%define qt_version 3.3.8
+%define qt_version 4.4
%{!?with_qt:%define with_qt 1}
Summary: A documentation system for C/C++.
Name: doxygen
-Version: 1.5.7.1
+Version: 1.5.9
Release: 1%{?dist}
Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-
-Patch0: doxygen-1.5.6-config.patch
-Patch2: doxygen-1.2.18-libdir.patch
-Patch3: doxygen-1.2.18-libdir64.patch
-Patch4: doxygen-1.5.5-system-png.patch
-
+Patch1: doxygen-1.5.8-config.patch
+Patch2: doxygen-1.5.8-qt4.patch
+Patch3: doxygen-1.5.5-system-png.patch
Group: Development/Tools
# No version is specified.
License: GPL+
@@ -43,7 +40,7 @@ source files.
Summary: A GUI for creating and editing configuration files.
Group: User Interface/X
Requires: %{name} = %{epoch}:%{version}
-BuildRequires: qt3-devel => %{qt_version}
+BuildRequires: qt-devel => %{qt_version}
%description doxywizard
Doxywizard is a GUI for creating and editing configuration files that
@@ -52,28 +49,27 @@ are used by doxygen.
%prep
%setup -q
-%patch0 -p1 -b .config
-%if "%{_lib}" != "lib"
-%patch3 -p1 -b .libdir
-%else
-%patch2 -p1 -b .libdir
-%endif
-%patch4 -p1 -b .system-png
+%patch1 -p1 -b .config
+%patch2 -p1 -b .qt4
+%patch3 -p1 -b .system-png
%build
-%if %{with_qt}
-QTDIR="" && . /etc/profile.d/qt.sh
-%endif
+unset QTDIR
./configure \
--prefix %{_prefix} \
--shared \
- --release \
%if %{with_qt}
--with-doxywizard \
%endif
- --install %{_bindir}/install
+ --release
+
+# workaround for "Error: operand out of range", language.cpp needs to be splitted
+%ifarch ppc64
+make -C src Makefile.libdoxygen
+sed -i -e "s|-o ../objects/language.o|-fno-merge-constants -fsection-anchors -o ../objects/language.o|" src/Makefile.libdoxygen
+%endif
make %{?_smp_mflags} all
make docs
@@ -81,7 +77,7 @@ make docs
%install
rm -rf %{buildroot}
-make install INSTALL=%{buildroot}%{_prefix}
+make install DESTDIR=%{buildroot}
%if !%{with_qt}
rm -rf %{buildroot}%{_mandir}/man1/doxywizard*
@@ -107,6 +103,15 @@ rm -rf %{buildroot}
%endif
%changelog
+* Fri Jul 03 2009 Than Ngo <than at redhat.com> - 1.5.9-1
+- 1.5.9
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 05 2009 Than Ngo <than at redhat.com> 1.5.8-1
+- 1.5.8
+
* Mon Oct 06 2008 Than Ngo <than at redhat.com> 1.5.7.1-1
- 1.5.7.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources 26 Nov 2008 13:11:18 -0000 1.28
+++ sources 3 Jul 2009 11:03:41 -0000 1.29
@@ -1 +1 @@
-bc35dfd52bdae0247b862e67e0cbe7d7 doxygen-1.5.7.1.src.tar.gz
+33c5598fa6d24cbc55849eaf89652557 doxygen-1.5.9.src.tar.gz
--- doxygen-1.2.18-libdir.patch DELETED ---
--- doxygen-1.2.18-libdir64.patch DELETED ---
--- doxygen-1.5.6-config.patch DELETED ---
More information about the fedora-extras-commits
mailing list