Skip to Content.
Sympa Menu

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

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 (708f3e07686d1cbaca6611473accb56d635c5e98)
  • Date: Tue, 13 Nov 2007 12:33:34 -0600

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

FUNCTIONS | 44 ++++++++++++++++++++++++++------------------
kde-look/kbfx/BUILD | 4 ++++
kde-look/kbfx/DEPENDS | 4 ++--
kde-look/kbfx/DETAILS | 4 ++--
kde-look/kbfx/HISTORY | 8 ++++++++
kde-look/kbfx/PRE_BUILD | 5 +++++
6 files changed, 47 insertions(+), 22 deletions(-)

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

kbfx: updated spell to 0.4.9.3.1 and fixes

commit fc6e98fe18bdc17a5a2bd1d0486afcab6fea2e7d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

FUNCTIONS:
cmake flags use : which is an internal sorcery delimiter.
In order to facilitate the passing of depends flags, use % instead and
call
prepare_cmake_flags at the start of BUILD.

commit 585cceb713e18cc975d9aa6b1c97ce505f1b2d6c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

FUNCTIONS: fixed indentation

diff --git a/FUNCTIONS b/FUNCTIONS
index 6c73d4a..3e66ac4 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -465,9 +465,9 @@ function check_if_xorg_modular_server()
# CALL THIS BEFORE YOU DO THE INSTALLING. You can see the postfix spell for
an example.
declare -f note_config_files &>/dev/null ||
function note_config_files() {
-if check_if_modified "$1"; then
- mark_file_modified "$1"
-fi
+ if check_if_modified "$1"; then
+ mark_file_modified "$1"
+ fi
}

# Functions for default_build and default_install for waf based build systems
@@ -476,36 +476,33 @@ fi
# and waf is fast without it as well

function waf_build(){
-./waf configure \
+ ./waf configure \
--nocache \
--prefix=${INSTALL_ROOT}/usr \
$OPTS &&
-./waf build
+ ./waf build
}

function waf_install(){
-./waf install
+ ./waf install
}

# spells in several sections now need cmake or qt4
-#
cmake_build() {
-cd $SOURCE_DIRECTORY &&
-mkdir -p build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
-make
+ cd $SOURCE_DIRECTORY &&
+ mkdir -p build &&
+ cd build &&
+ cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+ make
}

qt4_build() {
-QTDIR=/usr
-PATH=$QTDIR/bin/qt4:$PATH
-cmake_build
+ QTDIR=/usr
+ PATH=$QTDIR/bin/qt4:$PATH
+ cmake_build
}

-
# check whether the QT provider is qt4
-
function check_if_qt4_provider()
{
if [[ "$(get_spell_provider ${1:-$SPELL} QT)" == "qt4" ]]
@@ -516,7 +513,6 @@ function check_if_qt4_provider()
}


-
# build using qt3 or qt4
# some spells an adapt the build process to either qt3 or qt4
function build_qt3_or_4()
@@ -530,6 +526,18 @@ function build_qt3_or_4()
make
}

+# cmake flags use : which is an internal sorcery delimiter.
+# In order to facilitate the passing of depends flags, use % instead and call
+# this function at the start of BUILD. Don't use it anywhere else.
+# Example:
+# DEPENDS: depends kdelibs4 -DCRUFT%BOOL=FALSE; ...
+# BUILD: prepare_cmake_flags; ...
+function prepare_cmake_flags()
+{
+ OPTS="${OPTS//%/:}"
+}
+
+
#-------------------------------------------------------------------------
## Print the version of the running kernel.
#-------------------------------------------------------------------------
diff --git a/kde-look/kbfx/BUILD b/kde-look/kbfx/BUILD
new file mode 100755
index 0000000..2c56838
--- /dev/null
+++ b/kde-look/kbfx/BUILD
@@ -0,0 +1,4 @@
+#cmake -DCMAKE_INSTALL_PREFIX:PATH= $OPTS build &&
+#make
+prepare_cmake_flags &&
+cmake_build
diff --git a/kde-look/kbfx/DEPENDS b/kde-look/kbfx/DEPENDS
index bebe59c..9afc55f 100755
--- a/kde-look/kbfx/DEPENDS
+++ b/kde-look/kbfx/DEPENDS
@@ -1,3 +1,3 @@
depends kdebase &&
-
-source $SECTION_DIRECTORY/KDE_DEPENDS
+depends cmake #&&
+#optional_depends strigi -DUSE_STRIGI%BOOL=TRUE -DUSE_STRIGI%BOOL=FALSE "for
search"
diff --git a/kde-look/kbfx/DETAILS b/kde-look/kbfx/DETAILS
index 66d9ff6..9a67a01 100755
--- a/kde-look/kbfx/DETAILS
+++ b/kde-look/kbfx/DETAILS
@@ -1,8 +1,8 @@
SPELL=kbfx
- VERSION=0.4.9.2rc2
+ VERSION=0.4.9.3.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:712577b75b8b5ec1c3bef09a2e163dfb054fc406956b08dcc44f641606b0e32d012c6095b92300b9398373df473fdb62c84165f7f81a26663bc9165fcae22ad8
+
SOURCE_HASH=sha512:483b7afa01e4a843826299a40ba4990c18dd039348e5752bea3efc877ea99bd7b17c2405a7d81b2deb93410cd0640613045ec629b729e8914283e62ea996d2df
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.kbfx.org
ENTERED=20060706
diff --git a/kde-look/kbfx/HISTORY b/kde-look/kbfx/HISTORY
index 4bb8f9a..83180b3 100644
--- a/kde-look/kbfx/HISTORY
+++ b/kde-look/kbfx/HISTORY
@@ -1,3 +1,11 @@
+2007-11-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD: cmake
+ * PRE_BUILD: added to fix various search paths
+ * DEPENDS: added cmake, removed KDE_DEPENDS, added disabled strigi -
broken
+
+2007-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.9.3.1
+
2006-10-27 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.4.9.2rc2, switched to bz2 tarball
* DEPENDS: removed depends on automake
diff --git a/kde-look/kbfx/PRE_BUILD b/kde-look/kbfx/PRE_BUILD
new file mode 100755
index 0000000..cfeedcd
--- /dev/null
+++ b/kde-look/kbfx/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+sed -i 's,^\s*/usr/include,&/qt,' $SOURCE_DIRECTORY/CMakeLists.txt &&
+sed -i 's,^\s*/usr/lib,&/qt,' $SOURCE_DIRECTORY/CMakeLists.txt &&
+sed -i '/^\s*\/opt\//d' $SOURCE_DIRECTORY/CMakeLists.txt &&
+sed -i '/^\s*$ENV{KDEDIR}\/[^b]/d' $SOURCE_DIRECTORY/CMakeLists.txt



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (708f3e07686d1cbaca6611473accb56d635c5e98), Jaka Kranjc, 11/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page