Skip to Content.
Sympa Menu

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

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 (38aa3a8e5f418c778cd8fafc688ee91824cf8bf6)
  • Date: Thu, 12 Jul 2007 11:58:25 -0500

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

science/qtiplot/DEPENDS | 4 +++-
science/qtiplot/DETAILS | 4 ++--
science/qtiplot/HISTORY | 6 ++++++
science/qtiplot/PRE_BUILD | 7 ++++++-
science/qtiplot/conf.patch | 38 +++++++++++---------------------------
5 files changed, 28 insertions(+), 31 deletions(-)

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

qtiplot: 0.9rc3

diff --git a/science/qtiplot/DEPENDS b/science/qtiplot/DEPENDS
index 0eb0ffb..f969a56 100755
--- a/science/qtiplot/DEPENDS
+++ b/science/qtiplot/DEPENDS
@@ -1,4 +1,6 @@
depends qt4 &&
depends qwt5 &&
depends qwtplot3d &&
-depends gsl
+depends gsl &&
+
+optional_depends pyqt4 "" "" "for python scripting support"
diff --git a/science/qtiplot/DETAILS b/science/qtiplot/DETAILS
index 1f6a400..087f750 100755
--- a/science/qtiplot/DETAILS
+++ b/science/qtiplot/DETAILS
@@ -1,8 +1,8 @@
SPELL=qtiplot
- VERSION=0.9-rc1
+ VERSION=0.9rc3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://soft.proindependent.com/src/${SOURCE}
-
SOURCE_HASH=sha512:ab049f9b95388ee00aa3a51349383d0457d81f34c265c5235702bf6c00a8b37f2bf542ddff2b060263fec17d84b52a19a73fd3de1205772e732156010341c8c9
+
SOURCE_HASH=sha512:d6407fd3cfd0e87f32b19aae13a0cdfff620c032bd52d54123f22cdc497366d850536c09e77fe3a83aea5c77289f412cc698c63b70c04bd08d7d6f43a163051d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://soft.proindependent.com/qtiplot.html "
LICENSE[0]=GPL
diff --git a/science/qtiplot/HISTORY b/science/qtiplot/HISTORY
index 26ce3ce..126d481 100644
--- a/science/qtiplot/HISTORY
+++ b/science/qtiplot/HISTORY
@@ -1,2 +1,8 @@
+2007-07-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: enable python, disable when dependency not met
+ * DEPENDS: added optional pyqt4
+ * DETAILS: updated spell to 0.9rc3
+ * conf.patch: updated
+
2007-04-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: created spell
diff --git a/science/qtiplot/PRE_BUILD b/science/qtiplot/PRE_BUILD
index 0f9731e..19a146c 100755
--- a/science/qtiplot/PRE_BUILD
+++ b/science/qtiplot/PRE_BUILD
@@ -1,3 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/conf.patch
+patch -p0 < $SPELL_DIRECTORY/conf.patch &&
+sed -i '/^LIBS/d; s,^#unix,unix,p' fitPlugins/fitRational?/fitRational?.pro
&&
+
+if ! is_depends_enabled $SPELL pyqt4; then
+ sed -i '/^SCRIPT.*Python/d' $SOURCE_DIRECTORY/qtiplot/qtiplot.pro
+fi
diff --git a/science/qtiplot/conf.patch b/science/qtiplot/conf.patch
index 1539598..95257e2 100644
--- a/science/qtiplot/conf.patch
+++ b/science/qtiplot/conf.patch
@@ -1,41 +1,27 @@
---- qtiplot/qtiplot.pro.orig 2007-04-21 23:23:49.000000000 +0200
-+++ qtiplot/qtiplot.pro 2007-04-21 23:25:01.000000000 +0200
-@@ -4,7 +4,7 @@
-
- # building without muParser doesn't work yet
- SCRIPTING_LANGS += muParser
--SCRIPTING_LANGS += Python
-+#SCRIPTING_LANGS += Python
-
- # a console displaying output of scripts; particularly useful on Windows
- # where running QtiPlot from a terminal is inconvenient
-@@ -27,13 +27,13 @@
+--- qtiplot/qtiplot.pro.orig 2007-07-12 17:42:26.000000000 +0200
++++ qtiplot/qtiplot.pro 2007-07-12 17:45:40.000000000 +0200
+@@ -26,11 +26,12 @@
+
#############################################################################

INCLUDEPATH += ../3rdparty/muParser
-
-INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
--#INCLUDEPATH += /usr/include/qwtplot3d
--#INCLUDEPATH += /usr/include/qwt5
-+#INCLUDEPATH += ../3rdparty/qwtplot3d/include
-+#INCLUDEPATH += ../3rdparty/qwt/src
-+INCLUDEPATH += /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt
-
INCLUDEPATH += ../3rdparty/liborigin
-INCLUDEPATH += ../3rdparty/gsl/include
-+INCLUDEPATH += /usr/include/gsl
INCLUDEPATH += ../3rdparty/zlib123/include
++INCLUDEPATH += /usr/include/qwtplot3d
++INCLUDEPATH += /usr/include/qwt
++INCLUDEPATH += /usr/include/gsl
++

##################### 3rd PARTY LIBRARIES SECTION
###########################
-@@ -47,18 +47,18 @@
+ #!!! Warning: You must modify these paths according to your computer
settings
+@@ -43,18 +44,14 @@
unix:LIBS += -L /usr/lib$${libsuff}

# statically link against Qwt(3D) in 3rdparty
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
-+#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
# dynamically link against Qwt(3D) installed system-wide
# WARNING: make sure they are compiled against Qt4
-#unix:LIBS += -lqwtplot3d
@@ -46,11 +32,9 @@
# statically link against GSL in 3rdparty
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
-+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
#dynamically link against GSL installed system-wide
-#unix:LIBS += -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas

-
##################### Windows
###############################################
+



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (38aa3a8e5f418c778cd8fafc688ee91824cf8bf6), Jaka Kranjc, 07/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page