Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (9a209d69711815b71dbee380e7d93f5bb86be6df)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (9a209d69711815b71dbee380e7d93f5bb86be6df)
  • Date: Thu, 4 Jan 2007 18:15:57 -0600

GIT changes to stable-rc-0.6 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

devel/doxygen/HISTORY | 5 +++++
devel/doxygen/PRE_BUILD | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 9a209d69711815b71dbee380e7d93f5bb86be6df
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Fix doxygen's compile with qt-x11 support when qt-x11 was just installed

Conflicts:

devel/doxygen/HISTORY

diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 5569934..95e2eff 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,8 @@
+2007-01-04 Eric Sandall <eric AT sandall.us>
+ * PRE_BUILD: For new installs, /etc/profile.d/qt.sh won't be sourced
+ until relogin, so we need to check for QTDIR and source qt.sh if
+ the user wants QT support.
+
2006-10-18 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: PATCHLEVEL++ (fixed sig)
* PRE_BUILD: do not use -O3, causes bugs in doxygen
diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 3f63912..8b4c273 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -4,4 +4,13 @@ sedit "s/grep fileutils/grep 'Free Soft
CFLAGS="${CFLAGS//-O3/-O2}"
&&
sedit "s/-O2/$CFLAGS/" 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
+sedit "s:man/man1:share/man/man1:" Makefile.in &&
+
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL qt-x11; then
+ if [[ -z $QTDIR ]]; then
+ echo QTDIR = $QTDIR > /tmp/doxy.qt
+ source $TRACK_ROOT/etc/profile.d/qt.sh
+ fi
+fi



  • [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Eric Sandall (9a209d69711815b71dbee380e7d93f5bb86be6df), Eric Sandall, 01/04/2007

Archive powered by MHonArc 2.6.24.

Top of Page