Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (379a3bf79542afd4196c779483adaac7c57cf40d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (379a3bf79542afd4196c779483adaac7c57cf40d)
  • Date: Fri, 4 Jan 2019 04:47:16 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch | 25 -------------
utils/gnuplot/DEPENDS | 9 ++++
utils/gnuplot/DETAILS | 13 +++----
utils/gnuplot/HISTORY | 6 +++
utils/gnuplot/PRE_BUILD | 6 ---
utils/gnuplot/crossbuild.patch | 14 -------
utils/gnuplot/gtk3.patch | 29
----------------
7 files changed, 21 insertions(+), 81 deletions(-)

New commits:
commit 379a3bf79542afd4196c779483adaac7c57cf40d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/gnuplot: version 5.2.6

diff --git a/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
b/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
deleted file mode 100644
index 79b5ef7..0000000
--- a/utils/gnuplot/0001-fix-compatibility-with-lua-5.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f3f6fecea7b93934d107cea0710e95c7afc55a27 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Fri, 25 Mar 2016 10:13:17 +0100
-Subject: [PATCH] fix compatibility with lua >= 5.2
-
----
- term/lua/gnuplot-tikz.lua | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/term/lua/gnuplot-tikz.lua b/term/lua/gnuplot-tikz.lua
-index a2cb684..967345c 100644
---- a/term/lua/gnuplot-tikz.lua
-+++ b/term/lua/gnuplot-tikz.lua
-@@ -1754,7 +1754,7 @@ term.options = function(opt_str, initial, t_count)
- o_next = string.sub(opt_str, s_start+1, s_end-1)
- if next_char == '"' then
- -- Wow! this is to resolve all string escapes, kind of "unescape
string"
-- o_next = assert(loadstring("return(\""..o_next.."\")"))()
-+ o_next = assert(load("return(\""..o_next.."\")"))()
- end
- o_type = "string"
- else
---
-2.7.4
-
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index f107e84..00013a0 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -1,5 +1,8 @@
depends -sub CXX gcc &&
depends JPEG &&
+if [[ "${GNUPLOT_BRANCH}" == "scm" ]]; then
+ depends git
+fi &&

# gnuplot uses gd for rendering pngs, even with true type fonts...
optional_depends "gd" \
@@ -30,9 +33,15 @@ optional_depends cairo "--with-cairo" "--without-cairo" \
optional_depends qtbase "--with-qt=qt5" "--without-qt" \
"Qt-based interactive terminal" &&

+optional_depends libcaca "--with-caca" "--without-caca" \
+ "for Caca output" &&
+
optional_depends libcerf "--with-libcerf" "--without-libcerf" \
"for special functions from libcerf" &&

+optional_depends texlive "--with-latex" "--without-latex" \
+ "for LaTeX support" &&
+
if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
depends pango
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 0b48505..d50b77e 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -2,22 +2,21 @@
SPELL=gnuplot
if [[ $GNUPLOT_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
- SOURCE=$SPELL-cvs.tar.bz2
+ SOURCE=$SPELL-scm.tar.bz2
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
+
SOURCE_URL[0]="git://git.code.sf.net/p/${SPELL}/${SPELL}-main:${SPELL}-scm"
SOURCE_IGNORE=volatile
else
- VERSION=5.0.6
+ VERSION=5.2.6
+
SOURCE_HASH=sha512:557c0d00c951055ca03ef0f2b262e96b8013da4fedeb64dc5325fabd94772144fd2fe7bfa9d159fa47ab76695109cb4d3f01fc5bfa996df4576aee0eebe36a90
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d
fi
- PATCHLEVEL=1
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
-
LICENSE[0]=http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright?view=markup
+
LICENSE[0]="https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright";
KEYWORDS="utils"
SHORT="a mathematical function plotting tool"
cat << EOF
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 895e7ef..b612f1c 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,9 @@
+2019-01-03 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 5.2.6, updated urls, cvs -> git
+ * DEPENDS: added git for scm branch, libcaca & texlive are options now
+ * PRE_BUILD, 0001-fix-compatibility-with-lua-5.2.patch, gtk3.patch,
+ crossbuild.patch: removed obsolete patches
+
2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS, BUILD: wxwidgets and qtbase now, also fixup
* DETAILS: PATCHLEVEL++
diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index e30362f..e97d2d0 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -1,13 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# Fix build that thinks we are cross-compiling.
-# Hopefully fixed in gnuplot 4.7 .
-patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" &&
-patch -Np1 < "$SPELL_DIRECTORY/0001-fix-compatibility-with-lua-5.2.patch" &&
-patch -Np0 < "$SPELL_DIRECTORY/gtk3.patch" &&

if [[ $GNUPLOT_BRANCH == scm ]]; then
- cd "$SOURCE_DIRECTORY" &&
./prepare
fi

diff --git a/utils/gnuplot/crossbuild.patch b/utils/gnuplot/crossbuild.patch
deleted file mode 100644
index 2235abe..0000000
--- a/utils/gnuplot/crossbuild.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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}
diff --git a/utils/gnuplot/gtk3.patch b/utils/gnuplot/gtk3.patch
deleted file mode 100644
index 89240f7..0000000
--- a/utils/gnuplot/gtk3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/wxterminal/wxt_gui.cpp 2015/09/01 00:02:44 1.151
-+++ src/wxterminal/wxt_gui.cpp 2016/01/04 22:47:18 1.152
-@@ -1466,7 +1466,7 @@
- * to prevent focus stealing) and is inconsistent with global bindings
mechanism ) */
- void wxtPanel::RaiseConsoleWindow()
- {
--#ifdef USE_GTK
-+#if defined(USE_GTK) && (GTK_MAJOR_VERSION == 2)
- char *window_env;
- unsigned long windowid = 0;
- /* retrieve XID of gnuplot window */
-@@ -3167,7 +3167,7 @@
- * Refresh() also must be called, otherwise
- * the raise won't happen immediately */
- window->frame->panel->Refresh(false);
-- gdk_window_raise(window->frame->GetHandle()->window);
-+
gdk_window_raise(gtk_widget_get_window(window->frame->GetHandle()));
- #else
- window->frame->Restore();
- window->frame->Raise();
-@@ -3180,7 +3180,7 @@
- {
- #ifdef USE_GTK
- window->frame->panel->Refresh(false);
-- gdk_window_lower(window->frame->GetHandle()->window);
-+ gdk_window_lower(gtk_widget_get_window(window->frame->GetHandle()));
- #else
- window->frame->Lower();
- #endif /* USE_GTK */



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (379a3bf79542afd4196c779483adaac7c57cf40d), Pavel Vinogradov, 01/03/2019

Archive powered by MHonArc 2.6.24.

Top of Page