diff options
Diffstat (limited to 'math/octave/patches')
7 files changed, 31 insertions, 96 deletions
diff --git a/math/octave/patches/patch-libgnu_stdio.in.h b/math/octave/patches/patch-libgnu_stdio.in.h index 124a0f8bce0..006b48b0af1 100644 --- a/math/octave/patches/patch-libgnu_stdio.in.h +++ b/math/octave/patches/patch-libgnu_stdio.in.h @@ -1,8 +1,8 @@ -$NetBSD: patch-libgnu_stdio.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgnu_stdio.in.h,v 1.3 2016/08/06 13:03:35 prlw1 Exp $ Do not re-define gets() on SunOS, incompatible prototype. ---- libgnu/stdio.in.h.orig 2015-05-23 14:36:17.000000000 +0000 +--- libgnu/stdio.in.h.orig 2016-07-01 18:43:45.000000000 +0000 +++ libgnu/stdio.in.h @@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is un /* It is very rare that the developer ever has full control of stdin, @@ -10,10 +10,10 @@ Do not re-define gets() on SunOS, incompatible prototype. removed it. */ +#ifndef __sun #undef gets - #if HAVE_RAW_DECL_GETS + #if HAVE_RAW_DECL_GETS && !defined __cplusplus _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif +#endif - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ + struct obstack; diff --git a/math/octave/patches/patch-libgnu_string.in.h b/math/octave/patches/patch-libgnu_string.in.h deleted file mode 100644 index 4a5bdf90ebe..00000000000 --- a/math/octave/patches/patch-libgnu_string.in.h +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-libgnu_string.in.h,v 1.3 2016/03/01 20:13:19 joerg Exp $ - -The "split" include guards fails miserable on NetBSD since by default -string.h will include strings.h, which goes back to string.h. Now due to -the lovely magic here, the rest of the file will be processed before the -real header. - ---- libgnu/string.in.h.orig 2015-05-23 14:36:17.000000000 +0000 -+++ libgnu/string.in.h -@@ -22,11 +22,8 @@ - #endif - @PRAGMA_COLUMNS@ - --/* The include_next requires a split double-inclusion guard. */ --#@INCLUDE_NEXT@ @NEXT_STRING_H@ -- --#ifndef _@GUARD_PREFIX@_STRING_H - #define _@GUARD_PREFIX@_STRING_H -+#@INCLUDE_NEXT@ @NEXT_STRING_H@ - - /* NetBSD 5.0 mis-defines NULL. */ - #include <stddef.h> -@@ -184,6 +181,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un - #endif - - /* Search backwards through a block for a byte (specified as an int). */ -+#if defined(__NetBSD__) -+#if defined(__cplusplus) -+extern "C" -+#endif -+void * memrchr(const void *b, int c, size_t len); -+#else - #if @GNULIB_MEMRCHR@ - # if ! @HAVE_DECL_MEMRCHR@ - _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) -@@ -210,6 +213,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un - "use gnulib module memrchr for portability"); - # endif - #endif -+#endif - - /* Find the first occurrence of C in S. More efficient than - memchr(S,C,N), at the expense of undefined behavior if C does not -@@ -1026,4 +1030,3 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp - - - #endif /* _@GUARD_PREFIX@_STRING_H */ --#endif /* _@GUARD_PREFIX@_STRING_H */ 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 diff --git a/math/octave/patches/patch-libgui_src_workspace-model.cc b/math/octave/patches/patch-libgui_src_workspace-model.cc index ed16f5d0b0b..39697810daf 100644 --- a/math/octave/patches/patch-libgui_src_workspace-model.cc +++ b/math/octave/patches/patch-libgui_src_workspace-model.cc @@ -1,9 +1,7 @@ -$NetBSD: patch-libgui_src_workspace-model.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgui_src_workspace-model.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $ Changes for compiling with Qt5 instead of Qt4 -$NetBSD: patch-libgui_src_workspace-model.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - --- libgui/src/workspace-model.cc.orig 2015-05-23 14:21:53.000000000 +0000 +++ libgui/src/workspace-model.cc @@ -132,7 +132,7 @@ workspace_model::data (const QModelIndex diff --git a/math/octave/patches/patch-libgui_src_workspace-view.cc b/math/octave/patches/patch-libgui_src_workspace-view.cc new file mode 100644 index 00000000000..4fbf5702f37 --- /dev/null +++ b/math/octave/patches/patch-libgui_src_workspace-view.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-libgui_src_workspace-view.cc,v 1.1 2016/08/06 13:03:35 prlw1 Exp $ + +Changes for compiling with Qt5 instead of Qt4 + +--- libgui/src/workspace-view.cc.orig 2016-04-20 18:23:57.000000000 +0000 ++++ libgui/src/workspace-view.cc +@@ -98,8 +98,8 @@ workspace_view::workspace_view (QWidget + view->horizontalHeader ()->restoreState ( + settings->value ("workspaceview/column_state").toByteArray ()); + // Set header properties for sorting +- view->horizontalHeader ()->setClickable (true); +- view->horizontalHeader ()->setMovable (true); ++ view->horizontalHeader ()->setSectionsClickable (true); ++ view->horizontalHeader ()->setSectionsMovable (true); + view->horizontalHeader ()->setSortIndicator ( + settings->value ("workspaceview/sort_by_column",0).toInt (), + static_cast<Qt::SortOrder> diff --git a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc b/math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc deleted file mode 100644 index 05b0e8c8881..00000000000 --- a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-libinterp_octave-value_ov-classdef.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libinterp/octave-value/ov-classdef.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/octave-value/ov-classdef.cc -@@ -1937,6 +1937,11 @@ cdef_object_scalar::is_partially_constru - return true; - } - -+void cdef_object_scalar::mark_as_constructed (const cdef_class& cls) -+{ -+ ctor_list.erase (cls); -+} -+ - handle_cdef_object::~handle_cdef_object (void) - { - #if DEBUG_TRACE diff --git a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.h b/math/octave/patches/patch-libinterp_octave-value_ov-classdef.h deleted file mode 100644 index 61afcab05ef..00000000000 --- a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libinterp_octave-value_ov-classdef.h,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libinterp/octave-value/ov-classdef.h.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/octave-value/ov-classdef.h -@@ -438,7 +438,7 @@ public: - - void mark_as_constructed (void) { ctor_list.clear (); } - -- void mark_as_constructed (const cdef_class& cls) { ctor_list.erase (cls); } -+ void mark_as_constructed (const cdef_class& cls); - - bool is_constructed (void) const { return ctor_list.empty (); } - |