sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c02da29fdfe6f587e2bd5165fad98f8ded962f74)

From: Sukneet Basuta <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c02da29fdfe6f587e2bd5165fad98f8ded962f74)
Date: Mon, 30 Jul 2012 14:00:47 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

kde4-apps/FUNCTIONS | 2 ++
kde4-bindings/FUNCTIONS | 2 ++
kde4-edu/FUNCTIONS | 2 ++
kde4-graphics/FUNCTIONS | 2 ++
kde4-look/FUNCTIONS | 2 ++
kde4/FUNCTIONS | 2 ++
kde4/HISTORY | 5 +++++
kde4/kdesdk4/BUILD | 3 ---
kde4/kdesdk4/DEPENDS | 17 ++++++++---------
kde4/kdesdk4/HISTORY | 4 ++++
10 files changed, 29 insertions(+), 12 deletions(-)

New commits:
commit c02da29fdfe6f587e2bd5165fad98f8ded962f74
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kdesdk4: use % instead of @ to pass cmake flags, as prepare_cmake_flags
handles this.

commit bbe2c33fc69930f1e6dfb9eb09b16af4679d9474
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

kde4*/FUNCTIONS: added prepare_cmake_flags to default_build, to allow
passing cmake flags.
Added to default_build rather than each individual BUILD since all kde
spells use cmake.

diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 527e375..dfff5bc 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -18,6 +18,8 @@ default_build() {
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
cd build &&
+
+ prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR" \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
-DSYSCONF_INSTALL_DIR=$KDE4ETC \
diff --git a/kde4-bindings/FUNCTIONS b/kde4-bindings/FUNCTIONS
index 5950ddd..e1957bf 100755
--- a/kde4-bindings/FUNCTIONS
+++ b/kde4-bindings/FUNCTIONS
@@ -11,6 +11,8 @@ default_build() {
PATH+=:$KDE4DIR
fi &&
CMAKE_PREFIX_PATH=$KDE4DIR &&
+
+ prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
-DSYSCONF_INSTALL_DIR=$KDE4ETC \
diff --git a/kde4-edu/FUNCTIONS b/kde4-edu/FUNCTIONS
index 7a2f092..4d080ec 100755
--- a/kde4-edu/FUNCTIONS
+++ b/kde4-edu/FUNCTIONS
@@ -11,6 +11,8 @@ default_build() {
PATH+=:$KDE4DIR
fi &&
CMAKE_PREFIX_PATH=$KDE4DIR &&
+
+ prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
-DSYSCONF_INSTALL_DIR=$KDE4ETC \
diff --git a/kde4-graphics/FUNCTIONS b/kde4-graphics/FUNCTIONS
index b96cc7b..93871d4 100755
--- a/kde4-graphics/FUNCTIONS
+++ b/kde4-graphics/FUNCTIONS
@@ -11,6 +11,8 @@ default_build() {
PATH+=:$KDE4DIR
fi &&
CMAKE_PREFIX_PATH=$KDE4DIR &&
+
+ prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
-DSYSCONF_INSTALL_DIR=$KDE4ETC \
diff --git a/kde4-look/FUNCTIONS b/kde4-look/FUNCTIONS
index fa97070..0b23423 100755
--- a/kde4-look/FUNCTIONS
+++ b/kde4-look/FUNCTIONS
@@ -17,6 +17,8 @@ default_build() {
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
cd build &&
+
+ prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR" \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
-DSYSCONF_INSTALL_DIR=$KDE4ETC \
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 3d1f7a0..eec2829 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -11,6 +11,8 @@ default_build() {
PATH+=:$KDE4DIR
fi &&
CMAKE_PREFIX_PATH=$KDE4DIR &&
+
+ prepare_cmake_flags &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
-DSYSCONF_INSTALL_DIR=$KDE4ETC \
diff --git a/kde4/HISTORY b/kde4/HISTORY
index f5cab10..1adb665 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,8 @@
+2012-07-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * FUNCTIONS, ../kde4*/FUNCTIONS: added prepare_cmake_flags to
default_build, to allow
+ passing cmake flags.
+ Added to default_build rather than each individual BUILD since all
kde spells use cmake.
+
2010-05-20 Tommy Boatman <tboatman AT sourcemage.org>
* KDE_DEPENDS: kdebindings4 depends on attica

diff --git a/kde4/kdesdk4/BUILD b/kde4/kdesdk4/BUILD
index 730c158..c5267e1 100755
--- a/kde4/kdesdk4/BUILD
+++ b/kde4/kdesdk4/BUILD
@@ -1,6 +1,3 @@
-# replace @ with : for optional dependency flags
-OPTS=${OPTS//@/:} &&
-
if [[ "$KDESDK_SUBVERSION" == "y" ]]; then
OPTS="-DWITH_SVN:BOOL=on $OPTS"
else
diff --git a/kde4/kdesdk4/DEPENDS b/kde4/kdesdk4/DEPENDS
index de9d879..a583262 100755
--- a/kde4/kdesdk4/DEPENDS
+++ b/kde4/kdesdk4/DEPENDS
@@ -12,16 +12,15 @@ if [[ $UMBRELLO == "y" ]]; then
depends boost
fi &&

-# replace @ with : in BUILD
-optional_depends hunspell "-DWITH_HUNSPELL@BOOL=on" \
- "-DWITH_HUNSPELL@BOOL=off" \
+optional_depends hunspell "-DWITH_HUNSPELL%BOOL=on" \
+ "-DWITH_HUNSPELL%BOOL=off" \
"to build Lokalize localization tool" &&
-optional_depends qca2 "-DWITH_QCA2@BOOL=on" \
- "-DWITH_QCA2@BOOL=off" \
+optional_depends qca2 "-DWITH_QCA2%BOOL=on" \
+ "-DWITH_QCA2%BOOL=off" \
"for the checksum tool in Okteta hex
editor" &&
-optional_depends kdebase4 "-DWITH_LibKonq@BOOL=on" \
- "-DWITH_LibKonq@BOOL=off" \
+optional_depends kdebase4 "-DWITH_LibKonq%BOOL=on" \
+ "-DWITH_LibKonq%BOOL=off" \
"to build the Dolphin version control
plugins" &&
-optional_depends -sub JAVA antlr "-DWITH_Antlr2@BOOL=on" \
- "-DWITH_Antlr2@BOOL=off" \
+optional_depends -sub JAVA antlr "-DWITH_Antlr2%BOOL=on" \
+ "-DWITH_Antlr2%BOOL=off" \
"for support of po2xml and swappo tools"
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index 7c3193e..e33db5f 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,7 @@
+2012-07-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS, BUILD: use % instead of @ to pass cmake flags,
+ as prepare_cmake_flags handles this
+
2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 4.8.4
* CONFIGURE: added query for umbrello

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c02da29fdfe6f587e2bd5165fad98f8ded962f74), Sukneet Basuta, 07/30/2012