Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (cf23d7ed3a2f1ed87fa18329e4af79f824c561a1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (cf23d7ed3a2f1ed87fa18329e4af79f824c561a1)
  • Date: Tue, 13 Sep 2011 11:46:37 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

utils/gnuplot/BUILD | 6 ------
utils/gnuplot/DEPENDS | 10 ++++++----
utils/gnuplot/DETAILS | 5 -----
utils/gnuplot/HISTORY | 6 ++++++
utils/gnuplot/PREPARE | 4 +---
5 files changed, 13 insertions(+), 18 deletions(-)

New commits:
commit cf23d7ed3a2f1ed87fa18329e4af79f824c561a1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

gnuplot: added lua and cairo as optional dependency

DETAILS,PREPARE,BUILD: removed support for lua 3rd party addon (fixes
#138)

diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index caba3fc..cee2fd3 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -3,10 +3,4 @@ OPTS="--without-tutorial $OPTS" &&
if [[ $GNUPLOT_SCM == "y" ]]; then
./prepare
fi &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- LIBS="-llua $LIBS"
- cd $SOURCE_DIRECTORY/gnuplot_lua_terminal &&
- lua gnuplot.lua style &&
- cd $SOURCE_DIRECTORY
-fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index fe25f6a..8c560a1 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -20,10 +20,12 @@ optional_depends svgalib \
"--with-linux-vga" \
"--without-linux-vga" \
"Linux SVGA console driver?" &&
-if ! [[ $GNUPLOT_LUA == "n" ]]; then
- depends texlive &&
- depends lua
-fi &&
+
+optional_depends lua "--with-lua" "--without-lua" \
+ "lua/TikZ terminal" &&
+
+optional_depends cairo "--with-cairo" "--without-cairo" \
+ "cairo-based terminals" &&

if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index d2a23c7..32583e5 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -17,11 +17,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:dc520e8074e00f8ba346451ca9e229c31907735185f0ed4ae066ad5f2caa799db04c28181729bef1af467af7341f3b721eba8a0d5ecd6988c5740351fe002fd6
fi
-if [[ $GNUPLOT_LUA == "y" ]]; then
- SOURCE2=${SPELL}_lua_terminal.tgz
- SOURCE2_URL[0]=http://peter.affenbande.org/$SPELL/$SOURCE2
- SOURCE2_IGNORE=unversioned
-fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210

LICENSE[0]=http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright?view=markup
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 41a758b..c6b3247 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,9 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added lua and cairo as optional dependency
+ * DETAILS: removed SOURCE & SOURCE_URL for lua 3rd party addon (fixes
#138)
+ * PREPARE: removed query about lua 3rd party addon
+ * BUILD: removed code for building lua 3rd party addon
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/gnuplot/PREPARE b/utils/gnuplot/PREPARE
index 6528253..8f59be9 100755
--- a/utils/gnuplot/PREPARE
+++ b/utils/gnuplot/PREPARE
@@ -3,7 +3,5 @@ config_query GNUPLOT_SCM "Do you want to use the development
version from CVS?"
if [[ $GNUPLOT_SCM == "y" ]]; then
config_query GNUPLOT_AUTOUPDATE \
"Automatically update on every system update?" n
-fi &&
-
-config_query GNUPLOT_LUA "Do you want to enable the lua terminal (3rd party
addon)?" n
+fi




  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (cf23d7ed3a2f1ed87fa18329e4af79f824c561a1), Bor Kraljič, 09/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page