Skip to Content.
Sympa Menu

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

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 (0d88e7fe355c1e4ebc28508b8602faf67d3a3c04)
  • Date: Wed, 27 Sep 2017 19:32:21 +0000

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

utils/gnuplot/BUILD | 6 +++++-
utils/gnuplot/DEPENDS | 4 ++--
utils/gnuplot/DETAILS | 1 +
utils/gnuplot/HISTORY | 5 +++++
utils/gnuplot/PRE_BUILD | 1 +
utils/gnuplot/gtk3.patch | 29 +++++++++++++++++++++++++++++
6 files changed, 43 insertions(+), 3 deletions(-)

New commits:
commit 0d88e7fe355c1e4ebc28508b8602faf67d3a3c04
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gnuplot: move from qt4 to qtbase, fix up wxwidgets

diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index 280e7e7..c7b8b38 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,5 +1,9 @@
+if is_depends_enabled $SPELL qtbase; then
+ export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
+ export PATH+=":$QT5DIR/bin"
+fi &&
# disable-raise-console needed because of
# https://sourceforge.net/p/gnuplot/mailman/message/34739833/
# Gtk2 and gtk3 removed a function that is still used in the wxt code.
-OPTS="--without-tutorial --disable-raise-console OPTS" &&
+OPTS="--without-tutorial --disable-raise-console $OPTS" &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 5809a04..f107e84 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 WXWIDGET --enable-wxwidgets --disable-wxwidgets \
+optional_depends wxwidgets --enable-wxwidgets --disable-wxwidgets \
"wxWidgets interactive terminal" &&

optional_depends svgalib \
@@ -27,7 +27,7 @@ optional_depends lua "--with-lua" "--without-lua" \
optional_depends cairo "--with-cairo" "--without-cairo" \
"cairo-based terminals" &&

-optional_depends qt4 "--with-qt=qt4" "--without-qt" \
+optional_depends qtbase "--with-qt=qt5" "--without-qt" \
"Qt-based interactive terminal" &&

optional_depends libcerf "--with-libcerf" "--without-libcerf" \
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 3aa0ae5..0b48505 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -14,6 +14,7 @@ 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
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index f517938..895e7ef 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,8 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, BUILD: wxwidgets and qtbase now, also fixup
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, gtk3.patch: fix wxwidgets build
+
2017-06-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.0.6

diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
index 03342b3..e30362f 100755
--- a/utils/gnuplot/PRE_BUILD
+++ b/utils/gnuplot/PRE_BUILD
@@ -4,6 +4,7 @@ cd "$SOURCE_DIRECTORY" &&
# 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" &&
diff --git a/utils/gnuplot/gtk3.patch b/utils/gnuplot/gtk3.patch
new file mode 100644
index 0000000..89240f7
--- /dev/null
+++ b/utils/gnuplot/gtk3.patch
@@ -0,0 +1,29 @@
+--- 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 Thomas Orgis (0d88e7fe355c1e4ebc28508b8602faf67d3a3c04), Thomas Orgis, 09/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page