Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b862c485ac89556e7218e5e9876cd8d20b7648c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b862c485ac89556e7218e5e9876cd8d20b7648c7)
  • Date: Mon, 29 Oct 2007 13:40:04 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 ++
kde4/FUNCTIONS | 64
+++++++++++++++++++++++++++------------------------------
2 files changed, 34 insertions(+), 33 deletions(-)

New commits:
commit b862c485ac89556e7218e5e9876cd8d20b7648c7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kde4/FUNCTIONS: factorised common code, indented, fixed update_databases

diff --git a/ChangeLog b/ChangeLog
index 585a065..f70c7e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * kde4/FUNCTIONS: factorised common code, indented, fixed
update_databases
+
2007-10-27 Treeve Jelbert <treeve AT sourcemage.org>
* archive-libs/libzip: new spell, manipulate zip archives

diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index f9fb43a..80904c2 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -1,55 +1,53 @@
+prepare_environment() {
+ QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+ PATH="$QTDIR/bin/qt4:$PATH" &&
+
+ persistent_add KDE4DIR &&
+ KDE4DIR="$INSTALL_ROOT/opt" &&
+
+ PATH="$KDE4DIR/bin:$PATH" &&
+ LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
+ QT_PLUGIN_PATH="$KDE4DIR/lib/kde4/plugins"
+}
+
default_build() {
-QTDIR=$INSTALL_ROOT/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-
-persistent_add KDE4DIR &&
-KDE4DIR=$INSTALL_ROOT/opt &&
-
-PATH=$KDE4DIR/bin:$PATH &&
-LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
-QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins &&
-
-cd $SOURCE_DIRECTORY &&
-mkdir -p build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
- -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
- ../ &&
-make
+ prepare_environment &&
+
+ cd $SOURCE_DIRECTORY &&
+ mkdir -p build &&
+ cd build &&
+ cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR" \
+ -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ ../ &&
+ make
}

# kde4 also needs a special default_install,
# to maintain some environment variables
default_install() {
-QTDIR=$INSTALL_ROOT/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
+ prepare_environment &&

-KDE4DIR=$INSTALL_ROOT/opt &&
-
-PATH=$KDE4DIR/bin:$PATH &&
-LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
-QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins &&
-
-cd $SOURCE_DIRECTORY/build &&
-make install
+ cd $SOURCE_DIRECTORY/build &&
+ make install
}


# we need a default_final, default_post_remove
# so that the mime and desktop databases get updated
-
update_databases() {

-source /etc/profile.d/strigi.sh
-update-mime-database /opt/share/mime/
-update-desktop-database /opt/share/desktop-directories
+ source /etc/profile.d/strigi.sh
+ update-mime-database /opt/share/mime/
+ if [[ -e /opt/share/desktop-directories ]]; then
+ update-desktop-database /opt/share/desktop-directories
+ fi
}

default_final() {
-update_databases
+ update_databases
}


default_post_remove() {
-update_databases
+ update_databases
}



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b862c485ac89556e7218e5e9876cd8d20b7648c7), Jaka Kranjc, 10/29/2007

Archive powered by MHonArc 2.6.24.

Top of Page