summaryrefslogtreecommitdiff
path: root/math/octave/patches/patch-libgui_src_octave-gui.cc
diff options
context:
space:
mode:
Diffstat (limited to 'math/octave/patches/patch-libgui_src_octave-gui.cc')
-rw-r--r--math/octave/patches/patch-libgui_src_octave-gui.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/math/octave/patches/patch-libgui_src_octave-gui.cc b/math/octave/patches/patch-libgui_src_octave-gui.cc
index 49df51558e3..64f721cdfa2 100644
--- a/math/octave/patches/patch-libgui_src_octave-gui.cc
+++ b/math/octave/patches/patch-libgui_src_octave-gui.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-libgui_src_octave-gui.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $
+$NetBSD: patch-libgui_src_octave-gui.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $
Changes for compiling with Qt5 instead of Qt4
---- libgui/src/octave-gui.cc.orig 2015-05-23 14:21:54.000000000 +0000
+--- libgui/src/octave-gui.cc.orig 2016-04-20 18:23:57.000000000 +0000
+++ libgui/src/octave-gui.cc
@@ -92,7 +92,7 @@ private:
// Disable all Qt messages by default.
@@ -22,15 +22,12 @@ Changes for compiling with Qt5 instead of Qt4
install___init_qt___functions ();
-@@ -117,11 +117,6 @@ octave_start_gui (int argc, char *argv[]
- QApplication application (argc, argv);
- QTranslator gui_tr, qt_tr, qsci_tr;
+@@ -119,7 +119,7 @@ octave_start_gui (int argc, char *argv[]
-- // Set the codec for all strings (before wizard)
--#if ! defined (Q_OS_WIN32)
+ // Set the codec for all strings (before wizard)
+ #if ! defined (Q_OS_WIN32)
- QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8"));
--#endif
--
- if (start_gui)
- {
- // show wizard if this is the first run
++ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
+ #endif
+
+ // show wizard if this is the first run