[SM-Commit] GIT changes to master grimoire by George Sherwood (4db30d4c683bdc87ebc4c4d15ada6d109e7c6ceb)

George Sherwood scm at sourcemage.org
Mon Dec 29 14:31:02 EST 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 dev/null                                     |binary
 devel/doxygen/DEPENDS                        |    2 +-
 devel/doxygen/DETAILS                        |    2 +-
 devel/doxygen/HISTORY                        |    7 +++++++
 devel/doxygen/PRE_BUILD                      |    7 +++++--
 devel/doxygen/doxygen-1.5.7.1.src.tar.gz.sig |    0 
 devel/doxygen/doxygen-1.5.8.src.tar.gz.sig   |binary
 devel/doxygen/doxygen-qt4.patch              |   15 +++++++++++++++
 devel/doxygen/moc.patch                      |   11 +++++++++++
 9 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit 4db30d4c683bdc87ebc4c4d15ada6d109e7c6ceb
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    doxygen: Updated to version 1.5.8. wizard now depends on
    qt4.  Added patches to find our installation.

diff --git a/devel/doxygen/DEPENDS b/devel/doxygen/DEPENDS
index c64e193..a877942 100755
--- a/devel/doxygen/DEPENDS
+++ b/devel/doxygen/DEPENDS
@@ -13,7 +13,7 @@ optional_depends  tetex                                               \
                   ""                                                  \
                   "for generating LaTeX, Postscript, and PDF output"  &&
 
-optional_depends  qt-x11                \
+optional_depends  qt4                   \
                   "--with-doxywizard"   \
                   ""                    \
                   "for DoxyWizard GUI"  &&
diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index c1487f9..8aeaca6 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,5 +1,5 @@
            SPELL=doxygen
-         VERSION=1.5.7.1
+         VERSION=1.5.8
           SOURCE=$SPELL-$VERSION.src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.stack.nl/pub/users/dimitri/$SOURCE
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 23d461c..4b36ebf 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,10 @@
+2008-12-29 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.5.8
+	* DEPENDS: doxywizard now optonal_depends on qt4
+	* PRE_BUILD: Added two patches for qt4
+	* doxygen-qt4.patch: Added to find proper qmake
+	* moc.patch: Added to find proper moc
+
 2008-10-04 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.5.7.1
 
diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index f739461..53f2cd6 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -3,12 +3,15 @@ cd  ${SOURCE_DIRECTORY}
 sedit  "s/grep fileutils/grep 'Free Software Foundation'/"  ./configure                &&
 CFLAGS="${CFLAGS//-O3/-O2}"                                                            &&
 sedit  "s/-O2/$CFLAGS/"  tmake/lib/linux-g++/tmake.conf                                &&
+sedit  "s: = moc: = qt4/moc:" tmake/lib/linux-g++/tmake.conf &&
 sedit  "s/\$(QTDIR)\/include/\$(QTDIR)\/include\/qt/"  tmake/lib/linux-g++/tmake.conf  &&
 sedit  "s:man/man1:share/man/man1:"  Makefile.in  &&
 
 
-if  is_depends_enabled  $SPELL  qt-x11;  then
+if  is_depends_enabled  $SPELL  qt4;  then
   if  [[  -z  $QTDIR  ]];  then
     source  $INSTALL_ROOT/etc/profile.d/qt.sh
-  fi
+  fi &&
+  patch -p0 < $SCRIPT_DIRECTORY/moc.patch
+  patch -p0 < $SCRIPT_DIRECTORY/doxygen-qt4.patch
 fi
diff --git a/devel/doxygen/doxygen-1.5.7.1.src.tar.gz.sig b/devel/doxygen/doxygen-1.5.7.1.src.tar.gz.sig
deleted file mode 100644
index 692d12b..0000000
Binary files a/devel/doxygen/doxygen-1.5.7.1.src.tar.gz.sig and /dev/null differ
diff --git a/devel/doxygen/doxygen-1.5.8.src.tar.gz.sig b/devel/doxygen/doxygen-1.5.8.src.tar.gz.sig
new file mode 100644
index 0000000..88541ff
Binary files /dev/null and b/devel/doxygen/doxygen-1.5.8.src.tar.gz.sig differ
diff --git a/devel/doxygen/doxygen-qt4.patch b/devel/doxygen/doxygen-qt4.patch
new file mode 100644
index 0000000..7c27fab
--- /dev/null
+++ b/devel/doxygen/doxygen-qt4.patch
@@ -0,0 +1,15 @@
+--- addon/doxywizard/Makefile.in.orig	2008-12-29 08:15:15.000000000 -0600
++++ addon/doxywizard/Makefile.in	2008-12-29 08:15:52.000000000 -0600
+@@ -16,10 +16,10 @@
+ 	$(MAKE) -f Makefile.doxywizard 
+ 
+ Makefile.doxywizard: doxywizard.pro
+-	$(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
++	$(QTDIR)/bin/qt4/qmake doxywizard.pro -o Makefile.doxywizard
+ 
+ qmake: 
+-	$(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
++	$(QTDIR)/bin/qt4/qmake doxywizard.pro -o Makefile.doxywizard
+ 
+ clean: Makefile.doxywizard 
+ 	$(MAKE) -f Makefile.doxywizard clean 
diff --git a/devel/doxygen/moc.patch b/devel/doxygen/moc.patch
new file mode 100644
index 0000000..5298fb7
--- /dev/null
+++ b/devel/doxygen/moc.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2008-12-29 13:12:36.000000000 -0600
++++ configure	2008-12-29 13:13:03.000000000 -0600
+@@ -565,7 +565,7 @@
+ fi
+ if test "$f_wizard" = YES; then
+   cat >> .tmakeconfig <<EOF
+-TMAKE_MOC = $QTDIR/bin/moc
++TMAKE_MOC = $QTDIR/bin/qt4/moc
+ EOF
+ fi
+ 



More information about the SM-Commit mailing list