Mercurial > mxe-octave

changeset 3686:1e623b4ce67b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave: add gnulib isatty fix patch (bug #37623) * src/octave-1-gnulib-isatty.patch: added file. * src/stable-octave-1-gnulib-isatty.patch: added file * dist-files.mk: added octave-1-gnulib-isatty.patch, stable-octave-1-gnulib-isatty.patch * makeinst-script.sh: removed --line-editing option from shortcuts if Win8.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 15 Aug 2014 22:27:34 -0400
parents 2fe9db1b3f77
children 1d5439991318
files dist-files.mk makeinst-script.sh src/octave-1-gnulib-isatty.patch src/stable-octave-1-gnulib-isatty.patch
diffstat 4 files changed, 84 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Aug 16 22:27:18 2014 -0400
+++ b/dist-files.mk	Fri Aug 15 22:27:34 2014 -0400
@@ -428,6 +428,7 @@
   ocaml-native.mk \
   octave-1-docinstall.patch \
   octave-1-fixes.patch \
+  octave-1-gnulib-isatty.patch \
   octave.mk \
   of-actuarial.mk \
   of-communications.mk \
@@ -561,6 +562,7 @@
   sqlite.mk \
   stable-octave-1-docinstall.patch \
   stable-octave-1-fixes.patch \
+  stable-octave-1-gnulib-isatty.patch \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
--- a/makeinst-script.sh	Sat Aug 16 22:27:18 2014 -0400
+++ b/makeinst-script.sh	Fri Aug 15 22:27:34 2014 -0400
@@ -257,13 +257,8 @@
  CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION"
  CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
  SetOutPath "%USERPROFILE%"
- \${If} \$IsWin8 == 1
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
- \${Else}
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
-   CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
- \${EndIf}
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
  SetOutPath "\$INSTDIR"
 EOF
   # if we have documentation files, create shortcuts
@@ -281,13 +276,8 @@
 
   \${If} \$InstallShortcuts == \${BST_CHECKED}
     SetOutPath "%USERPROFILE%"
-    \${If} \$IsWin8 == 1
-       CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
-       CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "-i --line-editing" "\$INSTDIR\\$ICON" 0
-    \${Else}
-       CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
-       CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
-    \${EndIf}
+    CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+    CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
   \${Endif}
 
   ; BLAS set up
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/octave-1-gnulib-isatty.patch	Fri Aug 15 22:27:34 2014 -0400
@@ -0,0 +1,39 @@
+Patch based on savannah.gnu.org/bugs/?327623#attached
+
+diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c
+--- octave-3.8.2-rc2.orig/libgnu/isatty.c	2014-08-12 15:31:01.710229546 -0400
++++ octave-3.8.2-rc2/libgnu/isatty.c	2014-08-12 15:41:15.603406658 -0400
+@@ -34,7 +34,13 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
+ 
+ #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+ static int
+diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c
+--- octave-3.8.2-rc2.orig/libgnu/select.c	2014-08-12 15:31:01.704229427 -0400
++++ octave-3.8.2-rc2/libgnu/select.c	2014-08-12 15:44:44.268552023 -0400
+@@ -84,7 +84,14 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
++
+ 
+ static BOOL
+ IsSocketHandle (HANDLE h)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-gnulib-isatty.patch	Fri Aug 15 22:27:34 2014 -0400
@@ -0,0 +1,39 @@
+Patch based on savannah.gnu.org/bugs/?327623#attached
+
+diff -ur octave-3.8.2-rc2.orig/libgnu/isatty.c octave-3.8.2-rc2/libgnu/isatty.c
+--- octave-3.8.2-rc2.orig/libgnu/isatty.c	2014-08-12 15:31:01.710229546 -0400
++++ octave-3.8.2-rc2/libgnu/isatty.c	2014-08-12 15:41:15.603406658 -0400
+@@ -34,7 +34,13 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
+ 
+ #if HAVE_MSVC_INVALID_PARAMETER_HANDLER
+ static int
+diff -ur octave-3.8.2-rc2.orig/libgnu/select.c octave-3.8.2-rc2/libgnu/select.c
+--- octave-3.8.2-rc2.orig/libgnu/select.c	2014-08-12 15:31:01.704229427 -0400
++++ octave-3.8.2-rc2/libgnu/select.c	2014-08-12 15:44:44.268552023 -0400
+@@ -84,7 +84,14 @@
+ 
+ /* Optimized test whether a HANDLE refers to a console.
+    See <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00065.html>.  */
+-#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++//#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)
++static BOOL
++IsConsoleHandle(HANDLE h)
++{
++  DWORD mode;
++  return GetConsoleMode(h, &mode) != 0;
++}
++
+ 
+ static BOOL
+ IsSocketHandle (HANDLE h)