[Lunar-commits] <moonbase> doxygen: add a patch to make it compile without qt4.

[Florin Braescu]

commit ec6611269a67e82f66361a0a60d9868e9e2ff237
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Oct 10 18:11:45 2010 +0300

    doxygen: add a patch to make it compile without qt4.
---
 doc-tools/doxygen/BUILD   |   17 ++++++++++-------
 doc-tools/doxygen/DEPENDS |   10 +++-------
 doc-tools/doxygen/DETAILS |    3 +++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/doc-tools/doxygen/BUILD b/doc-tools/doxygen/BUILD
index fbd62dd..ad2f995 100644
--- a/doc-tools/doxygen/BUILD
+++ b/doc-tools/doxygen/BUILD
@@ -1,9 +1,11 @@
 (
 
   if module_installed qt4; then
-    . /etc/profile.d/qt4.rc &&
-    OPTS+=" --with-doxywizard"
-  fi &&
+    . /etc/profile.d/qt4.rc  &&
+      OPTS+=" --with-doxywizard"
+    else
+      patch_it $SOURCE_CACHE/$SOURCE2 1
+  fi  &&
 
   OPTS+=" --prefix /usr "  &&
 
@@ -11,15 +13,16 @@
     message "${MESSAGE_COLOR}Makefile's detected, doing make distclean before compiling${DEFAULT_COLOR}"  &&
     ./configure $OPTS
     make distclean
-  fi &&
-
-  ./configure $OPTS &&
+  fi  &&
 
-  default_make &&
+  ./configure $OPTS  &&
 
+  make  &&
+  prepare_install  &&
   if which python 2> /dev/null 1>&2; then
      make docs
   fi  &&
+  make install  &&
 
 # I have notice with some apps notice during make
 # the /usr/share/doc/apr/docs/doxygen.conf needs to be updated. This takes
diff --git a/doc-tools/doxygen/DEPENDS b/doc-tools/doxygen/DEPENDS
index fc387db..67cb46e 100644
--- a/doc-tools/doxygen/DEPENDS
+++ b/doc-tools/doxygen/DEPENDS
@@ -2,10 +2,6 @@ depends  sed
 depends  ghostscript
 depends  %TEX
 
-optional_depends  "qt4"                \
-                  "--with-doxywizard"  \
-                  ""                   \
-                  "Qt 4.x GUI support"
-
-optional_depends "Python"   ""  "" "Build the doc files"
-optional_depends "graphviz" ""  "" "Dot support"
+optional_depends "qt4"      ""  ""  "Qt 4.x GUI support"
+optional_depends "Python"   ""  ""  "Build the doc files"
+optional_depends "graphviz" ""  ""  "Dot support"
diff --git a/doc-tools/doxygen/DETAILS b/doc-tools/doxygen/DETAILS
index ca861cf..1488d73 100644
--- a/doc-tools/doxygen/DETAILS
+++ b/doc-tools/doxygen/DETAILS
@@ -1,8 +1,11 @@
           MODULE=doxygen
          VERSION=1.7.2
           SOURCE=$MODULE-$VERSION.src.tar.gz
+         SOURCE2=$MODULE-without-qt4.patch.bz2
       SOURCE_URL=ftp://ftp.stack.nl/pub/users/dimitri
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:48e86c20c3a25ea9ee895e6214e3d54b4a9e689b
+     SOURCE2_VFY=sha1:bc3c707b9f2b80c854e49a888096d81089fc07ec
         WEB_SITE=http://www.stack.nl/~dimitri/$MODULE
          ENTERED=20020529
          UPDATED=20101010