Source Mage code commit list

["Bearcat M. Sandor" <sourcemage AT feline-soul.com>]

On Thursday 12 June 2008 08:52:36 Juuso Alasuutari wrote:

> GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

>

> kde4/FUNCTIONS | 20 ++++++++++++++++++--

> kde4/HISTORY | 8 ++++++++

> kde4/KDE_DEPENDS | 6 ++++--

> kde4/kdelibs4/HISTORY | 7 +++++--

> kde4/kdelibs4/INSTALL | 15 ---------------

> kde4/phonon/DEPENDS | 25 +++++++++++++++++--------

> kde4/phonon/DETAILS | 37 ++++++++++++++-----------------------

> kde4/phonon/HISTORY | 8 ++++++++

> kde4/phonon/PREPARE | 2 +-

> 9 files changed, 75 insertions(+), 53 deletions(-)

>

> New commits:

> commit b013fc3aa35f5ab9d55471090e154372ec6673a2

> Author: Juuso Alasuutari <iuso AT sourcemage.org>

> Commit: Juuso Alasuutari <iuso AT sourcemage.org>

>

> kde4/KDE_DEPENDS: Moved phonon dependency from kdebase4-runtime to

> kdelibs4 where it belongs, and made it only apply to non-stable builds.

>

> commit 94f2f1c9c7b4f6dc1d5113341bc233c0550a7f4a

> Author: Juuso Alasuutari <iuso AT sourcemage.org>

> Commit: Juuso Alasuutari <iuso AT sourcemage.org>

>

> phonon: Changed SOURCE_URL to point to the more stable 4.2 branch. The

> branch 4.2 is feature-frozen and will become the next stable phonon release

> targeted for KDE 4.1. The previous SOURCE_URL was for the development

> branch; the 4.2 branch was recommended on #kde-devel when I asked about it.

> Also fixed the spell in many places where it was necessary.

>

> commit 79c2e624ca7ac5080f5bc8ad1c9adce6c5c4ee19

> Author: Juuso Alasuutari <iuso AT sourcemage.org>

> Commit: Juuso Alasuutari <iuso AT sourcemage.org>

>

> kdelibs4: Deleted INSTALL, symlink creation code is now in the kde4

> section's default_install.

>

> commit fadddaf31c900d3433476d16a96d13e6f9a71633

> Author: Juuso Alasuutari <iuso AT sourcemage.org>

> Commit: Juuso Alasuutari <iuso AT sourcemage.org>

>

> kde4/FUNCTIONS: Added creation of dbus services dir symlink to

> default_install to make sure that all kde4 spells place their service files

> into the common system dir.

>

> diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS

> index 80904c2..6318469 100755

> --- a/kde4/FUNCTIONS

> +++ b/kde4/FUNCTIONS

> @@ -25,9 +25,25 @@ default_build() {

> # kde4 also needs a special default_install,

> # to maintain some environment variables

> default_install() {

> - prepare_environment &&

> + prepare_environment &&

> +

> + # make sure that kde4 spells install their D-Bus

> + # service files into the system D-Bus service dir

> +

> + local dir1 dir2 &&

> +

> + dir1=$(pkg-config --variable=session_bus_services_dir dbus-1 \

> + | cut -d/ -f-4) &&

> + dir2=$(echo $dir1 | cut -d/ -f3-) &&

> +

> + if [[ "$KDE4DIR" != "$INSTALL_ROOT/usr" ]] &&

> + [[ ! -s "$KDE4DIR/$dir2" ]]; then

> + mkdir -p "$KDE4DIR/share" &&

> + ln -sf "$INSTALL_ROOT/$dir1" \

> + "$KDE4DIR/share"

> + fi &&

>

> - cd $SOURCE_DIRECTORY/build &&

> + cd "$SOURCE_DIRECTORY/build" &&

> make install

> }

>

> diff --git a/kde4/HISTORY b/kde4/HISTORY

> index 6513b7f..2d09a99 100644

> --- a/kde4/HISTORY

> +++ b/kde4/HISTORY

> @@ -1,3 +1,11 @@

> +2008-06-12 Juuso Alasuutari <iuso AT sourcemage.org>

> + * FUNCTIONS: Added creation of dbus services dir symlink to

> + default_install to make sure that all kde4 spells place

> + their service files into the common system dir.

> + * KDE_DEPENDS: Moved phonon dependency from kdebase4-runtime

> + to kdelibs4 where it belongs, and made it only apply to

> + non-stable builds.

> +

> 2008-06-11 Treeve Jelbert <treeve AT sourcemage.org>

> * KDE_DEPENDS: add phonon

>

> diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS

> index b47d281..5da0bfb 100755

> --- a/kde4/KDE_DEPENDS

> +++ b/kde4/KDE_DEPENDS

> @@ -10,6 +10,9 @@ case $SPELL in

> depends libxtst &&

> depends libxext

> fi &&

> + if [[ $KDE_VER != stable ]]; then

> + depends phonon

> + fi &&

> depends desktop-file-utils &&

> depends dbus &&

> depends hal &&

> @@ -32,8 +35,7 @@ case $SPELL in

> ;;

>

> kdebase4-runtime)

> - depends kdelibs4 &&

> - depends phonon

> + depends kdelibs4

> ;;

>

> kdebase-workspace4)

> diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY

> index 5aa76a4..ecd3361 100644

> --- a/kde4/kdelibs4/HISTORY

> +++ b/kde4/kdelibs4/HISTORY

> @@ -1,10 +1,13 @@

> +2008-06-12 Juuso Alasuutari <iuso AT sourcemage.org>

> + * INSTALL: Deleted, symlink creation code is

> + now in the kde4 section's default_install.

> +

> 2008-06-11 Treeve Jelbert <treeve AT sourcemage.org>

> * DETAILS: version 4.0.82

>

> 2008-06-04 Treeve Jelbert <treeve AT sourcemage.org>

> * DETAILS: version 4.0.81

> - * CONFLICTS: added

> - to avoid problem linking libphonon.so

> + * CONFLICTS: added to avoid problem linking libphonon.so

>

> 2008-05-29 Juuso Alasuutari <iuso AT sourcemage.org>

> * DETAILS: Added FORCE_DOWNLOAD=on.

> diff --git a/kde4/kdelibs4/INSTALL b/kde4/kdelibs4/INSTALL

> deleted file mode 100755

> index 657aa5a..0000000

> --- a/kde4/kdelibs4/INSTALL

> +++ /dev/null

> @@ -1,15 +0,0 @@

> -# we need to put some data in the usual places,

> -# so that dbus can have its data in one place

> -

> -# get the location for dbus stuff

> -DBUSDIR=`pkg-config --variable=session_bus_services_dir dbus-1 \

> - | cut -d/ -f-4` &&

> -

> -if [[ $KDE4DIR != $INSTALL_ROOT/usr ]] ;then

> - if [[ ! -s $KDE4DIR/$DBUSDIR ]];then

> - mkdir -p $KDE4DIR/share &&

> - ln -sf $INSTALL_ROOT/$DBUSDIR $KDE4DIR/share

> - fi

> -fi &&

> -

> -default_install

> diff --git a/kde4/phonon/DEPENDS b/kde4/phonon/DEPENDS

> index 2268d67..b098d6d 100755

> --- a/kde4/phonon/DEPENDS

> +++ b/kde4/phonon/DEPENDS

> @@ -1,8 +1,17 @@

> -#depends -sub DBUS qt4 &&

> -depends g++ &&

> -depends cmake &&

> -#depends libxslt &&

> -#depends automoc &&

> -if [[ "${KDE_VER}" == "devel" ]];then

> -depends subversion

> -fi

> +depends subversion &&

> +depends cmake &&

> +depends automoc &&

> +depends g++ &&

> +

> +depends -sub DBUS qt4 &&

> +

> +if check_if_xorg_modular_libs qt4; then

> + depends libx11 &&

> + depends libice &&

> + depends libxext

> +fi &&

> +

> +optional_depends gst-plugins-base \

> + '' \

> + '' \

> + 'for the GStreamer media backend'

> diff --git a/kde4/phonon/DETAILS b/kde4/phonon/DETAILS

> index 2b3eefb..5455dd6 100755

> --- a/kde4/phonon/DETAILS

> +++ b/kde4/phonon/DETAILS

> @@ -1,33 +1,24 @@

> SPELL=phonon

> -persistent_read kdelibs4 KDE_VER KDE_VER

> -#if [[ "${KDE_VER}" == "unstable" ]];then

> -# VERSION=

> -# VX=

> -# SOURCE_HASH=sha512:

> -# SOURCE=$SPELL-$VERSION.tar.bz2

> -# SOURCE_URL[0]=$KDE_URL/${KDE_VER:-stable}/${VX}/support/$SOURCE

> -#else

> -if [[ $AKONADI_VCS_AUTOUPDATE == y ]]; then

> +if [[ $PHONON_VCS_AUTOUPDATE == y ]]; then

> VERSION=$(date +%Y%m%d)

> else

> VERSION=svn

> fi

> SOURCE_IGNORE=volatile

> FORCE_DOWNLOAD=on

> - SOURCE=$SPELL-$VERSION.tar.bz2

> -

> SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL

> -#fi

> -SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

> - WEB_SITE=http://pim.kde.org/akonadi

> + SOURCE=$SPELL-svn.tar.bz2

> + SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/branches/$SPELL/4.2:$SPELL

> +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"

> + WEB_SITE=http://phonon.kde.org/

> LICENSE[0]=LGPL

> - ENTERED=20080430

> - KEYWORDS=""

> - SHORT="PIM data library"

> + ENTERED=20080611

> + KEYWORDS="kde4 multimedia"

> + SHORT="A multimedia framework and API for KDE 4."

> cat << EOF

> -Akonadi is a PIM layer, which provides an asynchronous API to access all

> kind -of PIM data (e.g. mails, contacts, events, todos etc.).

> -

> -It consists of several processes (generally called the Akonadi server) and

> a -library (called client library) which encapsulates the communication

> -between the client and the server.

> +Phonon wants to fill in the gap and provide a multimedia API for KDE

> +developers while at the same time giving the users more choices. With

> +Phonon applications don't need to develop sound engines as Phonon

> +provides them for free. Applications are written saying what they want

> +and not how they want to do it. This leaves some room for the

> +user/administrator to customize things.

> EOF

> diff --git a/kde4/phonon/HISTORY b/kde4/phonon/HISTORY

> index a1f2627..968a466 100644

> --- a/kde4/phonon/HISTORY

> +++ b/kde4/phonon/HISTORY

> @@ -1,3 +1,11 @@

> +2008-06-12 Juuso Alasuutari <iuso AT sourcemage.org>

> + * DETAILS: Changed SOURCE_URL to point to the more stable 4.2

> + branch, corrected autoupdate var name, fixed wrong website

> + and descriptions, corrected SOURCE, SOURCE_DIRECTORY and ENTERED,

> + added keywords.

> + * PREPARE: Corrected autoupdate var name.

> + * DEPENDS: Added missing dependencies, removed bogus conditional.

> +

> 2008-06-11 Treeve Jelbert <treeve AT sourcemage.org>

> * DETAILS: version svn only

> * DEPENDS: subversion only need for devel version

> diff --git a/kde4/phonon/PREPARE b/kde4/phonon/PREPARE

> index 7e13b1c..f679955 100755

> --- a/kde4/phonon/PREPARE

> +++ b/kde4/phonon/PREPARE

> @@ -1,2 +1,2 @@

> -config_query AKONADI_VCS_AUTOUPDATE \

> +config_query PHONON_VCS_AUTOUPDATE \

> "Update automatically on every system update?" n

> _______________________________________________

> SM-Commit mailing list

> SM-Commit AT lists.ibiblio.org

> http://lists.ibiblio.org/mailman/listinfo/sm-commit

Hey Juuso,

Perhaps i just missed something but i didn't see any changes in the details file that would allow for anything but svn.

--

Bearcat M. Sandor

Bearcat AT feline-soul.net

Jabber: bearcat AT feline-soul.net

MSN: bearcatsandor AT hotmail.com

Yahoo: bearcatsandor

AIM: bearcatmsandor