Source Mage code commit list

[Eric Sandall <eric AT sandall.us>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Treeve Jelbert wrote:
> GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
<snip>
>  x11-toolkits/qt4/CONFLICTS       |    1 +
>  x11-toolkits/qt4/DEPENDS         |   12 ++++++++++++
<snip>
> New commits:
> commit bbbb10a1edc254f1a69502d821ecb947a80bf429
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
> 
>     qt4 - actually delete diles
> 
> commit 7eea9e6325f33116e9400655ffb843a34f5d3dc7
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
> 
>     strigi - forgotten file
> 
> commit 39200e14d560355d0eecfbaba5311ec78801f252
> Author: Treeve Jelbert <treeve AT sourcemage.org>
> Commit: Treeve Jelbert <treeve AT sourcemage.org>
> 
>     qt4 - multiple version support and build fixes
<snip>
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 283c38d..5778e8a 100755
- --- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
<snip>
> +config_query_option  QT_QT3     'build qt3 support?' y                     
> \
> +                                '-qt3support'                              
> \
> +                                '-no-qt3support'                           
> &&
> +
<snip>

Does QT3 support overwrite parts of the qt-x11 package or is it entirely
contained in qt4's install path? How can other spells use the built-in
QT3 support and phase out qt-x11?

> diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
> new file mode 100755
> index 0000000..ddbffc6
> --- /dev/null
> +++ b/x11-toolkits/qt4/CONFLICTS
> @@ -0,0 +1 @@
> +conflicts qt4
<snip>

That should be:
  conflicts  qt4  y

So that it will remove itself without requiring user intervention,
otherwise it will default to 'n' and qt4 will not cast.

- -sandalle

- --
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.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGO16qHXt9dKjv3WERAgUjAKCVQnA7w+wT3f2Fu31iWylVKo+wRwCgq5VS
1U97Fqx+KBa/VY/qsBXt2J4=
=p99Y
-----END PGP SIGNATURE-----