Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f5dfd74229b5507aa30ed1a5cfc551315abc7e32)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f5dfd74229b5507aa30ed1a5cfc551315abc7e32)
  • Date: Fri, 25 May 2012 03:26:25 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

utils/gnuplot/BUILD | 4 ----
utils/gnuplot/DEPENDS | 7 +++++--
utils/gnuplot/DETAILS | 4 ++--
utils/gnuplot/FINAL | 2 +-
utils/gnuplot/HISTORY | 6 ++++++
utils/gnuplot/INSTALL | 8 --------
utils/gnuplot/POST_REMOVE | 2 +-
utils/gnuplot/PRE_BUILD | 17 ++++++++++-------
utils/gnuplot/crossbuild.patch | 14 ++++++++++++++
9 files changed, 39 insertions(+), 25 deletions(-)

New commits:
commit 21f562a4a2be16207694ff57a4dd4e33cedf1481
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gnuplot: bump to 4.6 and fixup

diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index 95ff7a2..5937f40 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,6 +1,2 @@
OPTS="--without-tutorial $OPTS" &&
-
-if [[ $GNUPLOT_BRANCH == scm ]]; then
- ./prepare
-fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 2d36ccf..c84f63e 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -13,7 +13,7 @@ optional_depends "readline"
\
"use gnu readline instead of builtin readline" &&

optional_depends xorg-libs --with-x --without-x "X11 output" &&
-optional_depends wxgtk --enable-wxwidgets --disable-wxwidgets \
+optional_depends wxgtk --enable-wxt --disable-wxt \
"wxWidgets interactive terminal" &&

optional_depends svgalib \
@@ -21,12 +21,15 @@ optional_depends svgalib \
"--without-linux-vga" \
"Linux SVGA console driver?" &&

-optional_depends lua51 "--with-lua" "--without-lua" \
+optional_depends lua "--with-lua" "--without-lua" \
"lua/TikZ terminal" &&

optional_depends cairo "--with-cairo" "--without-cairo" \
"cairo-based terminals" &&

+optional_depends qt4 "--enable-qt" "--disable-qt" \
+ "Qt-based interactive terminal" &&
+
if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
depends pango
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 7b69eaf..7e4552b 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs

SOURCE_URL[0]=cvs://:pserver:anonymous AT gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
SOURCE_IGNORE=volatile
else
- VERSION=4.4.3
+ VERSION=4.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:dc520e8074e00f8ba346451ca9e229c31907735185f0ed4ae066ad5f2caa799db04c28181729bef1af467af7341f3b721eba8a0d5ecd6988c5740351fe002fd6
+
SOURCE_HASH=sha512:a4358c20577f978215a22db041f4d369ab69a88624b2fe831d2a1124fffb84d4dafa7f0f5a8bfdb388c663073570adb084949195c6eebd0f11f9b0ac4485debc
fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
diff --git a/utils/gnuplot/FINAL b/utils/gnuplot/FINAL
index ab6596a..39f9e3d 100755
--- a/utils/gnuplot/FINAL
+++ b/utils/gnuplot/FINAL
@@ -1,3 +1,3 @@
-if [[ $GNUPLOT_LUA == "y" ]]; then
+if is_depends_enabled $SPELL lua; then
texhash
fi
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index eeab61b..a13ecd9 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,9 @@
+2012-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 4.6
+ * PRE_BUILD, BUILD, crossbuild.patch, FINAL, INSTALL, POST_REMOVE:
+ fix build and clean up the mess for Lua terminals that are upstream
now
+ * DEPENDS: add qt4
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/utils/gnuplot/INSTALL b/utils/gnuplot/INSTALL
deleted file mode 100755
index 93b8063..0000000
--- a/utils/gnuplot/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-make install-strip &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/*.sty \
- $INSTALL_ROOT/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/gnuplot.lua \
- $INSTALL_ROOT/usr/libexec/gnuplot/4.2/gnuplot.lua
-fi
diff --git a/utils/gnuplot/POST_REMOVE b/utils/gnuplot/POST_REMOVE
index ab6596a..39f9e3d 100755
--- a/utils/gnuplot/POST_REMOVE
+++ b/utils/gnuplot/POST_REMOVE
@@ -1,3 +1,3 @@
-if [[ $GNUPLOT_LUA == "y" ]]; then
+if is_depends_enabled $SPELL lua; then
texhash
fi
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 6c01f68..af643b4 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -1,9 +1,12 @@
default_pre_build &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- cd $SOURCE_DIRECTORY &&
- unpack_file 2 &&
- cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/lua.trm \
- $SOURCE_DIRECTORY/term &&
- echo '#include "lua.trm"' >> $SOURCE_DIRECTORY/src/term.h &&
- sedit 's/^LIBS = /LIBS = -llua /' $SOURCE_DIRECTORY/src/Makefile.in
+cd "$SOURCE_DIRECTORY" &&
+# Fix build that thinks we are cross-compiling.
+# Hopefully fixed in gnuplot 4.7 .
+patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
+
+# remove the true when removing the patch above
+if true || [[ $GNUPLOT_BRANCH == scm ]]; then
+ cd "$SOURCE_DIRECTORY" &&
+ autoreconf -iv
fi
+
diff --git a/utils/gnuplot/crossbuild.patch b/utils/gnuplot/crossbuild.patch
new file mode 100644
index 0000000..2235abe
--- /dev/null
+++ b/utils/gnuplot/crossbuild.patch
@@ -0,0 +1,14 @@
+--- configure.in.orig 2012-05-25 09:37:33.000000000 +0200
++++ configure.in 2012-05-25 09:40:29.000000000 +0200
+@@ -31,6 +31,11 @@
+ AC_C_STRINGIZE
+ AC_PROG_LN_S
+
++# hack to avoid false alarm for cross build
++# should not be needed!
++test -z "${build}" && build="${host}"
++test -z "${host}" && host="${build}"
++
+ if test "${build}" != "${host}"
+ then
+ CC=${CC-${host_alias}-gcc}



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f5dfd74229b5507aa30ed1a5cfc551315abc7e32), Thomas Orgis, 05/25/2012

Archive powered by MHonArc 2.6.24.

Top of Page