# HG changeset patch # User John W. Eaton # Date 1407952281 14400 # Node ID 5c5642ed209b6a212a2cda84cccfdd64c2bedb52 # Parent 259f15992a85f7df3dd1142ff11e8c8d250d7a17 update stable-octave to 3.8.2 diff -r 259f15992a85 -r 5c5642ed209b dist-files.mk --- a/dist-files.mk Tue Aug 12 22:11:34 2014 -0400 +++ b/dist-files.mk Wed Aug 13 13:51:21 2014 -0400 @@ -559,9 +559,6 @@ sqlite.mk \ stable-octave-1-docinstall.patch \ stable-octave-1-fixes.patch \ - stable-octave-1-xerror.patch \ - stable-octave-2-xerror.patch \ - stable-octave-3-termfocus.patch \ stable-octave.mk \ suitesparse-1.patch \ suitesparse.mk \ diff -r 259f15992a85 -r 5c5642ed209b src/stable-octave-1-xerror.patch --- a/src/stable-octave-1-xerror.patch Tue Aug 12 22:11:34 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -# HG changeset patch -# User John W. Eaton -# Date 1395159558 14400 -# Tue Mar 18 12:19:18 2014 -0400 -# Branch stable -# Node ID 90dbbafb0502e80f5855239bc18eacdab5d85a29 -# Parent c08776badd3d7d59b8c918a09710dfc1f18add3d -prevent X11 errors from appearing in GUI command window - -* octave-gui.cc (fdstderr): New file scope variable. -(octave_start_gui): Dup stderr. -(message_handler): Use fdstderr for messages. - -diff --git a/libgui/src/octave-gui.cc b/libgui/src/octave-gui.cc ---- a/libgui/src/octave-gui.cc -+++ b/libgui/src/octave-gui.cc -@@ -85,28 +85,37 @@ - int m_result; - }; - -+#if ! defined (__WIN32__) || defined (__CYGWIN__) -+static int fdstderr = -1; -+#endif - - // Custom message handler for filtering some messages from Qt. - --void message_handler (QtMsgType type, const char *msg) -+void -+message_handler (QtMsgType type, const char *msg) - { -+#if ! defined (__WIN32__) || defined (__CYGWIN__) -+ static FILE *errstream = fdopen (fdstderr, "a+"); -+#else -+ static FILE *errstream = stderr; -+#endif -+ - switch (type) - { - case QtDebugMsg: -- if (strncmp (msg, "QFileSystemWatcher: skipping native engine",42) != 0) -- std::cerr << "Debug: " << msg << std::endl; -+ gnulib::fprintf (errstream, "Debug: %s\n", msg); - break; - - case QtWarningMsg: -- std::cerr << "Warning: " << msg << std::endl; -+ gnulib::fprintf (errstream, "Warning: %s\n", msg); - break; - - case QtCriticalMsg: -- std::cerr << "Critical: " << msg << std::endl; -+ gnulib::fprintf (errstream, "Critical: %s\n", msg); - break; - - case QtFatalMsg: -- std::cerr << "Fatal: " << msg << std::endl; -+ gnulib::fprintf (errstream, "Fatal: %s\n", msg); - abort (); - - default: -@@ -122,6 +131,13 @@ - { - octave_thread_manager::block_interrupt_signal (); - -+#if ! defined (__WIN32__) || defined (__CYGWIN__) -+ // Store the file descriptor associated with the STDERR stream. Send -+ // Qt messages there instead of to the STDERR stream that will be -+ // associated with the GUI command window. -+ fdstderr = gnulib::dup (STDERR_FILENO); -+#endif -+ - qInstallMsgHandler (message_handler); - - if (start_gui) diff -r 259f15992a85 -r 5c5642ed209b src/stable-octave-2-xerror.patch --- a/src/stable-octave-2-xerror.patch Tue Aug 12 22:11:34 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -diff --git a/libgui/src/octave-gui.cc b/libgui/src/octave-gui.cc ---- a/libgui/src/octave-gui.cc -+++ b/libgui/src/octave-gui.cc -@@ -85,42 +85,11 @@ - int m_result; - }; - --#if ! defined (__WIN32__) || defined (__CYGWIN__) --static int fdstderr = -1; --#endif -+// Disable all Qt messages by default. - --// Custom message handler for filtering some messages from Qt. -- --void -+static void - message_handler (QtMsgType type, const char *msg) - { --#if ! defined (__WIN32__) || defined (__CYGWIN__) -- static FILE *errstream = fdopen (fdstderr, "a+"); --#else -- static FILE *errstream = stderr; --#endif -- -- switch (type) -- { -- case QtDebugMsg: -- gnulib::fprintf (errstream, "Debug: %s\n", msg); -- break; -- -- case QtWarningMsg: -- gnulib::fprintf (errstream, "Warning: %s\n", msg); -- break; -- -- case QtCriticalMsg: -- gnulib::fprintf (errstream, "Critical: %s\n", msg); -- break; -- -- case QtFatalMsg: -- gnulib::fprintf (errstream, "Fatal: %s\n", msg); -- abort (); -- -- default: -- break; -- } - } - - // If START_GUI is false, we still set up the QApplication so that we -@@ -131,14 +100,11 @@ - { - octave_thread_manager::block_interrupt_signal (); - --#if ! defined (__WIN32__) || defined (__CYGWIN__) -- // Store the file descriptor associated with the STDERR stream. Send -- // Qt messages there instead of to the STDERR stream that will be -- // associated with the GUI command window. -- fdstderr = gnulib::dup (STDERR_FILENO); --#endif -+ std::string show_gui_msgs = octave_env::getenv ("OCTAVE_SHOW_GUI_MESSAGES"); - -- qInstallMsgHandler (message_handler); -+ // Installing our handler suppresses the messages. -+ if (show_gui_msgs.empty ()) -+ qInstallMsgHandler (message_handler); - - if (start_gui) - { -diff --git a/libinterp/dldfcn/__init_fltk__.cc b/libinterp/dldfcn/__init_fltk__.cc ---- a/libinterp/dldfcn/__init_fltk__.cc -+++ b/libinterp/dldfcn/__init_fltk__.cc -@@ -42,6 +42,10 @@ - - #ifdef HAVE_FLTK - -+#if defined (HAVE_X_WINDOWS) -+#include -+#endif -+ - #include - #include - #include -@@ -73,6 +77,7 @@ - - #include "cmd-edit.h" - #include "lo-ieee.h" -+#include "oct-env.h" - - #include "display.h" - #include "file-ops.h" -@@ -674,6 +679,14 @@ - Fl_Menu_Bar* menubar; - }; - -+#if defined (HAVE_X_WINDOWS) -+static int -+xerror_handler (Display *, XErrorEvent *) -+{ -+ return 0; -+} -+#endif -+ - class plot_window : public Fl_Window - { - friend class fltk_uimenu; -@@ -762,7 +775,18 @@ - // Set WM_CLASS which allows window managers to properly group - // related windows. Otherwise, the class is just "FLTK" - xclass ("Octave"); -+ -+ std::string show_gui_msgs -+ = octave_env::getenv ("OCTAVE_SHOW_GUI_MESSAGES"); -+ -+#if defined (HAVE_X_WINDOWS) -+ // Installing our handler suppresses the messages. -+ if (show_gui_msgs.empty ()) -+ XSetErrorHandler (xerror_handler); -+#endif -+ - show (); -+ - if (fp.get_currentaxes ().ok ()) - show_canvas (); - else diff -r 259f15992a85 -r 5c5642ed209b src/stable-octave-3-termfocus.patch --- a/src/stable-octave-3-termfocus.patch Tue Aug 12 22:11:34 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -diff -r 3283ce934648 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp ---- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Fri Apr 04 11:40:40 2014 -0700 -+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Fri Apr 04 20:38:10 2014 -0400 -@@ -267,9 +267,9 @@ - ////////////////////////////////////////////////////////////////////////////// - - QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd) -- : q (parent), m_command (cmd), m_hasBlinkingCursor (true), -- m_cursorType (BlockCursor), m_beginSelection (0, 0), -- m_endSelection (0, 0), m_settingSelection (false), -+ : q (parent), m_command (cmd), m_cursorBlinking (false), -+ m_hasBlinkingCursor (true), m_cursorType (BlockCursor), -+ m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false), - m_process (NULL), m_inWheelEvent (false) - { - log (NULL); diff -r 259f15992a85 -r 5c5642ed209b src/stable-octave.mk --- a/src/stable-octave.mk Tue Aug 12 22:11:34 2014 -0400 +++ b/src/stable-octave.mk Wed Aug 13 13:51:21 2014 -0400 @@ -3,8 +3,8 @@ PKG := stable-octave $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1 -$(PKG)_CHECKSUM := 2951aeafe58d562672feb80dd8c3cfe0643a5087 +$(PKG)_VERSION := 3.8.2 +$(PKG)_CHECKSUM := 02c38e0f69bce4e6dd7be7d301898347085d9c2d $(PKG)_SUBDIR := octave-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)