Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (59126eee07df4adf8bcf914162b1fdc64d8c98b6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (59126eee07df4adf8bcf914162b1fdc64d8c98b6)
  • Date: Fri, 13 Jul 2007 04:37:01 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 27 +++++++++++++++++++++++++++
devel/qwtplot3d/BUILD | 7 +------
devel/qwtplot3d/DETAILS | 4 ++--
devel/qwtplot3d/HISTORY | 4 ++++
5 files changed, 37 insertions(+), 8 deletions(-)

New commits:
commit 59126eee07df4adf8bcf914162b1fdc64d8c98b6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qwtplot3d-0.2.7

commit 7c7a8e8374da433da67af45ffdee2280e9ce4a99
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS - extra functions

diff --git a/ChangeLog b/ChangeLog
index a86821a..1fd72de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-07-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: add check_if_qt4_provider and build_qt3_or_4
+
2007-07-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* latex/europecv: new spell, a LaTeX class for writing curricula vitae
* latex/unicode: new spell, unicode input support for latex
diff --git a/FUNCTIONS b/FUNCTIONS
index fd9661a..641f605 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -502,3 +502,30 @@ 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" ]]
+ then
+ return 0
+ fi
+ return 1
+}
+
+
+
+# build using qt3 or qt4
+# some spells an adapt the build process to either qt3 or qt4
+function build_qt3_or_4()
+{
+ QTDIR=$INSTALL_ROOT/usr
+ if [[ check_if_qt4_provider ]]
+ then
+ PATH=$QTDIR/bin/qt4:$PATH
+ fi &&
+ qmake &&
+ make
+}
diff --git a/devel/qwtplot3d/BUILD b/devel/qwtplot3d/BUILD
index 3d1f98f..b9755a6 100755
--- a/devel/qwtplot3d/BUILD
+++ b/devel/qwtplot3d/BUILD
@@ -1,6 +1 @@
-if [[ $(get_spell_provider $SPELL QT) == qt4 ]]; then
- "$INSTALL_ROOT/usr/bin/qt4/qmake" qwtplot3d.pro
-else
- "$INSTALL_ROOT/usr/bin/qmake" qwtplot3d.pro
-fi &&
-make
+build_qt3_or_4
diff --git a/devel/qwtplot3d/DETAILS b/devel/qwtplot3d/DETAILS
index 42a39d6..a92c727 100755
--- a/devel/qwtplot3d/DETAILS
+++ b/devel/qwtplot3d/DETAILS
@@ -1,8 +1,8 @@
SPELL=qwtplot3d
- VERSION=0.2.6
+ VERSION=0.2.7
+
SOURCE_HASH=sha512:88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c
SOURCE="$SPELL-$VERSION.tgz"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:42f23f7e031f793c8392b2e2985e78c20c20f1c375576ff52b4a76548294fd1cad753cd878afd3b4d49398b7ac1bab7cfe3b94c7c58dff8e50699c0fa284bdea
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
WEB_SITE="http://qwtplot3d.sourceforge.net/ "
LICENSE[0]=ZLIB
diff --git a/devel/qwtplot3d/HISTORY b/devel/qwtplot3d/HISTORY
index 7cf4d9b..fba012f 100644
--- a/devel/qwtplot3d/HISTORY
+++ b/devel/qwtplot3d/HISTORY
@@ -1,2 +1,6 @@
+2007-07-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.7
+ * BUILD: use new function build_qt3_or_4
+
2007-04-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell




Archive powered by MHonArc 2.6.24.

Top of Page