Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ee1b307165db54276645b09c382b2e3d1828411e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: Treeve Jelbert <treeve AT scarlet.be>
  • Cc: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ee1b307165db54276645b09c382b2e3d1828411e)
  • Date: Mon, 24 Jul 2006 17:55:34 +0200

On Mon, Jul 24, 2006 at 09:39:06AM -0500, Treeve Jelbert wrote:
> GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:
[...]
> diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
> index 010a66b..49c7246 100755
> --- a/utils/dbus/BUILD
> +++ b/utils/dbus/BUILD
> @@ -2,10 +2,6 @@ if [ "$DBUS_SELINUX" == "y" ]; then
> OPTS="--enable-selinux $OPTS"
> fi &&
>
> -OPTS="$DBUS_GTK2 \
> - $DBUS_PYREX \
> - $OPTS" &&
> -
> create_account messagebus &&
> make_single &&
> default_build &&
> diff --git a/utils/dbus/CONFIGURE b/utils/dbus/CONFIGURE
> index 50d8e8e..f803ba5 100755
> --- a/utils/dbus/CONFIGURE
> +++ b/utils/dbus/CONFIGURE
> @@ -1,17 +1 @@
> -config_query DBUS_SELINUX 'Enable SELinux support?' n &&
> -
> -if spell_ok gtk+2; then
> - config_query_option DBUS_GTK2 'Build GTK+2 binaries?' y \
> - '--enable-gtk' '--disable-gtk'
> -else
> - config_query_option DBUS_GTK2 'Build GTK+2 binaries?' n \
> - '--enable-gtk' '--disable-gtk'
> -fi
> -
> -if spell_ok pyrex; then
> - config_query_option DBUS_PYREX 'Build Python bindings?' y \
> - '--enable-python' '--disable-python'
> -else
> - config_query_option DBUS_PYREX 'Build Python bindings?' n \
> - '--enable-python' '--disable-python'
> -fi
> +config_query DBUS_SELINUX 'Enable SELinux support?' n
> diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
> index 3b4aa30..dde1d6c 100755
> --- a/utils/dbus/DEPENDS
> +++ b/utils/dbus/DEPENDS
> @@ -1,37 +1,9 @@
> -#depends gcc34 &&
> -
> if [ "$DBUS_XMLTYPE" == 'y' ]; then
> depends libxml2 '--with-xml=libxml'
> else
> depends expat '--with-xml=expat'
> fi &&
>
> -if [ "$DBUS_GTK2" == '--disable-gtk' ] &&
> - [ "$DBUS_PYREX" == '--disable-python' ]; then
> - optional_depends glib2 \
> - '--enable-glib' \
> - '--disable-glib' \
> - 'Enable GLib-friendly client library'
> -else
> - #
> - # GTK+2 bindings need glib2
> - # Bug #9538
> - #
> - if [ "$DBUS_GTK2" == '--enable-gtk' ]; then
> - depends glib2 '--enable-glib' &&
> - depends gtk+2
> - fi &&
> -
> - #
> - # Python bindings need glib2
> - # Bug #9538
> - #
> - if [ "$DBUS_PYREX" == '--enable-python' ]; then
> - depends glib2 '--enable-glib' &&
> - depends pyrex
> - fi
> -fi &&
> -
> optional_depends doxygen \
> '--enable-doxygen-docs' \
> '--disable-doxygen-docs' \
> @@ -40,25 +12,5 @@ optional_depends doxygen
> optional_depends xmlto \
> '--enable-xml-docs' \
> '--disable-xml-docs' \
> - 'Build XML Documentation' &&
> -
> -# should add a qt4 one aswell, once upstream fixes it
> -optional_depends qt-x11 \
> - '--disable-qt --enable-qt3' \
> - '--disable-qt --disable-qt3' \
> - 'Enable Qt-friendly client library' &&
> -
> -optional_depends mono \
> - '--enable-mono' \
> - '--disable-mono' \
> - 'Build mono bindings' &&
> -
> -optional_depends monodoc \
> - '--enable-mono-docs' \
> - '--disable-mono-docs' \
> - 'for mono binding documentation' #&&
> + 'Build XML Documentation'
>
> -#optional_depends gcj \
> -# '--enable-gcj' \
> -# '--disable-gcj' \
> -# 'for GNU Java bindings'
> diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
> index f24f71f..9af6880 100755
> --- a/utils/dbus/DETAILS
> +++ b/utils/dbus/DETAILS
> @@ -1,6 +1,6 @@
> SPELL=dbus
> - VERSION=0.62
> -
> SOURCE_HASH=sha512:8d54a0f2988c20893f5bd2087f549ea2ff2e19c161a78e6f47ecf0329eeed753eb62d04693be867e99d532ef1848429f20d285ea9cfa2a7592827d8c8e9b425a
> + VERSION=0.90
> +
> SOURCE_HASH=sha512:1d239b6087d8681b328645963e3ddb742053f277461c96fcb6c8fc254521c05cb2e00b3637e4e97ed752ef56d890d1796dedca6ec95b7a0a10b2a7b2f611dfb5
> SOURCE=$SPELL-$VERSION.tar.gz
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> SOURCE_URL[0]=http://dbus.freedesktop.org/releases/$SOURCE
> diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
> index b4517c2..c39e195 100644
> --- a/utils/dbus/HISTORY
> +++ b/utils/dbus/HISTORY
> @@ -1,3 +1,11 @@
> +2006-07-24 Treeve Jelbert <treeve01 AT pi.be>
> + * DETAILS: version 0.90
> + * DEPENDS: remove gtk, python and mono stuff
> + * PRE_BUILD: delete
> + * BUILD: delete redundant code
> + * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^0.61^PRE_SUB_DEPENDS: deleted
> + all the language bindings are now separate spells
> +

This is massively incomplete and breaks every single spell that uses one
of the language bindings. Never remove SUB_DEPENDS/PRE_SUB_DEPENDS
without changing all spells using them, all of them will now fail to
cast.

> 2006-06-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> * DEPENDS: pass more flags for qt3, effectively disabling qt4,
> as it doesn't work and is otherwise autodetected
> diff --git a/utils/dbus/PRE_BUILD b/utils/dbus/PRE_BUILD
> deleted file mode 100755
> index 883dc44..0000000
> --- a/utils/dbus/PRE_BUILD
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -default_pre_build &&
> -cd $SOURCE_DIRECTORY &&
> -# don't build mono example as that requires gtk-sharp
> -sedit 's/doc example/doc/' mono/Makefile.in
> diff --git a/utils/dbus/PRE_SUB_DEPENDS b/utils/dbus/PRE_SUB_DEPENDS
> deleted file mode 100755
> index 28e0063..0000000
> --- a/utils/dbus/PRE_SUB_DEPENDS
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -case $THIS_SUB_DEPENDS in
> -PYTHON) if [ "$DBUS_PYREX" = "--enable-python" ]; then return 0; fi;;
> -CSHARP) if is_depends_enabled dbus mono; then return 0; fi;;
> -esac
> -return 1
> diff --git a/utils/dbus/REPAIR^0.61^PRE_SUB_DEPENDS
> b/utils/dbus/REPAIR^0.61^PRE_SUB_DEPENDS
> deleted file mode 100755
> index 28e0063..0000000
> --- a/utils/dbus/REPAIR^0.61^PRE_SUB_DEPENDS
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -case $THIS_SUB_DEPENDS in
> -PYTHON) if [ "$DBUS_PYREX" = "--enable-python" ]; then return 0; fi;;
> -CSHARP) if is_depends_enabled dbus mono; then return 0; fi;;
> -esac
> -return 1
> diff --git a/utils/dbus/SUB_DEPENDS b/utils/dbus/SUB_DEPENDS
> deleted file mode 100755
> index 29c4452..0000000
> --- a/utils/dbus/SUB_DEPENDS
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -case $THIS_SUB_DEPENDS in
> -PYTHON) echo "python bindings requested, forcing them." &&
> - DBUS_PYREX="--enable-python" &&
> - depends glib2 '--enable-glib' &&
> - depends pyrex
> - ;;
> -CSHARP) echo "mono bindings requested, forcing them." &&
> - depends mono '--enable-mono'
> - ;;
> - *) echo "unknown sub-depends!"; return 1;;
> -esac

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page