- added qtstyle and qt-dirs patches, now doxywizard builds

Changed files:
    doxygen-qt-dirs.patch -> 1.1
    doxygen-qtstyle.patch -> 1.1
    doxygen.spec -> 1.48

diff --git a/doxygen-qt-dirs.patch b/doxygen-qt-dirs.patch
new file mode 100644 (file)
index 0000000..ea6becc
--- /dev/null
+++ b/doxygen-qt-dirs.patch
@@ -0,0 +1,13 @@
+--- doxygen-1.3.2/tmake/lib/linux-g++/tmake.conf.orig  2002-08-01 09:29:09.000000000 +0200
++++ doxygen-1.3.2/tmake/lib/linux-g++/tmake.conf       2003-06-16 21:30:46.000000000 +0200
+@@ -29,8 +29,8 @@
+ TMAKE_LIBDIR          =
+ TMAKE_INCDIR_X11      = /usr/X11R6/include
+ TMAKE_LIBDIR_X11      = /usr/X11R6/lib
+-TMAKE_INCDIR_QT               = $(QTDIR)/include
+-TMAKE_LIBDIR_QT               = $(QTDIR)/lib
++TMAKE_INCDIR_QT               = /usr/include/qt
++TMAKE_LIBDIR_QT               = /usr/lib
+ TMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+ TMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+ 

diff --git a/doxygen-qtstyle.patch b/doxygen-qtstyle.patch
new file mode 100644 (file)
index 0000000..2f829ed
--- /dev/null
+++ b/doxygen-qtstyle.patch
@@ -0,0 +1,21 @@
+--- doxygen-1.3.2/addon/doxywizard/inputbool.cpp.orig  2003-01-11 20:24:12.000000000 +0100
++++ doxygen-1.3.2/addon/doxywizard/inputbool.cpp       2003-06-16 20:54:39.000000000 +0200
+@@ -14,7 +14,6 @@
+ 
+ #include "inputbool.h"
+ #include "pagewidget.h"
+-#include <qwindowsstyle.h>
+ #include <qlayout.h>
+ 
+ InputBool::InputBool( const QString & text, PageWidget * parent, bool &flag )
+@@ -25,9 +24,8 @@
+   layout->addWidget(cb);
+   layout->addStretch(10);
+ 
+-  QWindowsStyle *winStyle = new QWindowsStyle();
+   cb->setChecked( flag );
+-  cb->setStyle( winStyle );
++  cb->setStyle( "Windows" );
+   cb->setMinimumSize( sizeHint() );
+ 
+   connect( cb, SIGNAL(toggled(bool)), SLOT(setState(bool)) );

diff --git a/doxygen.spec b/doxygen.spec
index ceeabbe04a2f78061116b7360fa0f1f386aa8034..196635acbef8075d687fa656cf0cb4da40986b91 100644 (file)
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -1,4 +1,7 @@
-
+#
+# Conditional build:
+# _without_qt  - without doxywizard (qt-based)
+#
 Summary:       Doxygen is the documentation system for C/C++
 Summary(pl):   System dokumentowania dla C/C++
 Summary(pt_BR):        Um sistema de documentação para C/C++
@@ -13,17 +16,23 @@ Group:              Development/Tools
 Source0:       ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 # Source0-md5: d331ae38761ef9d8ce9f51988f01dcb8
 Patch0:                %{name}-system-libpng.patch
+Patch1:                %{name}-qtstyle.patch
+Patch2:                %{name}-qt-dirs.patch
 URL:           http://www.doxygen.org/
 BuildRequires: flex
 BuildRequires: ghostscript
 BuildRequires: ghostscript-fonts-std
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
+%{!?_without_qt:BuildRequires: qt-devel >= 2.1.0}
 BuildRequires: tetex-format-latex
 BuildRequires: tetex-format-pdflatex
 BuildRequires: tetex-plain-misc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# because of qt
+%define                _noautoreqdep   libGL.so.1 libGLU.so.1
+
 %description
 Doxygen is a documentation system for C, C++ and IDL. It can generate
 an on-line class browser (in HTML) and/or an off-line reference manual
@@ -84,7 +93,7 @@ Summary(pl):  GUI do tworzenia i edycji plik
 Summary(pt_BR):        Wizard gráfico para o Doxygen
 Group:         X11/Applications
 Requires:      %{name} = %{version}
-Requires:      qt >= 2.2
+Requires:      qt >= 2.1.0
 
 %description doxywizard
 Doxywizard is a GUI front-end for creating and editing configuration
@@ -98,19 +107,21 @@ plik
 Wizard gráfico para o Doxygen
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 rm -rf libpng
 
 %build
 export QTDIR=%{_prefix}
-## don't change it to %%configure!!!
+# don't change it to %%configure, not autoconf-generated!
 ./configure \
        --prefix %{_prefix} \
        --perl %{_bindir}/perl \
-       --install %{_bindir}/install
-#      --with-doxywizard
+       --install %{_bindir}/install \
+       %{!?_without_qt:--with-doxywizard}
 
 %{__make} \
        CFLAGS="%{rpmcflags}" \
@@ -136,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/doxytag
 %attr(755,root,root) %{_bindir}/doxysearch
 
-#%files doxywizard
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/doxywizard
+%if 0%{!?_without_qt:1}
+%files doxywizard
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/doxywizard
+%endif