Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ac61e885afe0b745de4463860a1e044a04a6ece6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <eric AT sandall.us>
  • To: SM-Commit <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ac61e885afe0b745de4463860a1e044a04a6ece6)
  • Date: Fri, 05 Jan 2007 08:52:40 -0800

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Eric Sandall wrote:
> GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
>
> devel/doxygen/PRE_BUILD | 1 -
> net/wpa_supplicant/HISTORY | 5 +++++
> net/wpa_supplicant/PRE_BUILD | 8 ++++++++
> 3 files changed, 13 insertions(+), 1 deletion(-)
<snip>
> commit 58c7704d14133385b715e54fd5c473bde9867f14
> 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
>
> commit a73744058fd3f149a30d5b534d3d11555b3b01ab
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> Revert "Fix doxygen's compile with qt-x11 support when qt-x11 was just
> installed"
>
> This reverts commit 829318fc22ff11f4a9c1d9daaa8d802e78b4afa2.
>
> Left some debugging code in.
>
> diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
> index 8b4c273..975837f 100755
> --- a/devel/doxygen/PRE_BUILD
> +++ b/devel/doxygen/PRE_BUILD
> @@ -10,7 +10,6 @@ source "$GRIMOIRE/is_depends_enabled.fu
>
> 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
<snip>

I'm not sure why this says devel/doxygen/HISTORY was not edited, mine
shows it was:

$ git show 58c7704d14133385b715e54fd5c473bde9867f14
commit 58c7704d14133385b715e54fd5c473bde9867f14
Author: Eric Sandall <sandalle AT sourcemage.org>
Date: Thu Jan 4 17:12:10 2007 -0800

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

diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index bd0a2af..8797cee 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-31 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.5.1

diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 3f63912..975837f 100755
- --- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -4,4 +4,12 @@ sedit "s/grep fileutils/grep 'Free Software
Foundation'/" ./c
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++/tmak
- -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
+ source $TRACK_ROOT/etc/profile.d/qt.sh
+ fi
+fi

- --
Eric Sandall | Source Mage GNU/Linux Developer
eric at sandall.us PGP: 0xA8EFDD61 | http://www.sourcemage.org/
http://eric.sandall.us/ | http://counter.li.org/ #196285
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFnoJYHXt9dKjv3WERCknBAJ9lPSRudBcYvFggUUtgCJWkT11aOgCeMWYc
yifYpGbNvUUqFOjpT0INNGM=
=qGf8
-----END PGP SIGNATURE-----





Archive powered by MHonArc 2.6.24.

Top of Page