Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -0,0 +1,33 @@
$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 2016-04-20 18:23:57.000000000 +0000
+++ libgui/src/octave-gui.cc
@@ -92,7 +92,7 @@ private:
// Disable all Qt messages by default.
static void
-message_handler (QtMsgType, const char *)
+message_handler (QtMsgType, const QMessageLogContext &, const QString &)
{
}
@@ -108,7 +108,7 @@ octave_start_gui (int argc, char *argv[]
// Installing our handler suppresses the messages.
if (show_gui_msgs.empty ())
- qInstallMsgHandler (message_handler);
+ qInstallMessageHandler (message_handler);
install___init_qt___functions ();
@@ -119,7 +119,7 @@ octave_start_gui (int argc, char *argv[]
// Set the codec for all strings (before wizard)
#if ! defined (Q_OS_WIN32)
- QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8"));
+ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
#endif
// show wizard if this is the first run