Ticket #12937: files.diff

File files.diff, 7.4 KB (added by adfernandes (Andrew Fernandes), 17 years ago)

three patch files deleted, the other three have changed

  • patch-configure 

    diff -uNr files.orig/patch-configure files/patch-configure
    old new  
    1 --- octave-2.9.9.orig/configure 2006-10-02 13:04:13.000000000 -0700
    2 +++ octave-2.9.9/configure      2006-11-07 00:28:15.000000000 -0800
    3 @@ -17238,7 +17238,7 @@
     1diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
     2--- octave-2.9.15.orig/configure        2007-10-17 13:33:17.000000000 -0400
     3+++ octave-2.9.15/configure     2007-10-17 13:31:50.000000000 -0400
     4@@ -16134,7 +16134,7 @@
    45 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    56 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
    67 if test $ac_cv_lib_cholmod_cholmod_start = yes; then
    … …  
    910        with_cholmod=yes
    1011 else
    1112 
    12 @@ -17328,7 +17328,7 @@
     13@@ -16208,7 +16208,7 @@
    1314 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    1415 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
    1516 if test $ac_cv_lib_cholmod_cholmod_start = yes; then
    … …  
    1819 fi
    1920 
    2021 fi
    21 @@ -17420,7 +17420,7 @@
     22@@ -16284,7 +16284,7 @@
    2223 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    2324 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
    2425 if test $ac_cv_lib_cholmod_cholmod_start = yes; then
    … …  
    2728        with_cholmod=yes
    2829 else
    2930 
    30 @@ -17510,7 +17510,7 @@
     31@@ -16358,7 +16358,7 @@
    3132 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    3233 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
    3334 if test $ac_cv_lib_cholmod_cholmod_start = yes; then
    … …  
    3637          with_cholmod=yes
    3738 fi
    3839 
    39 @@ -17919,7 +17919,7 @@
     40@@ -16757,7 +16757,7 @@
    4041     RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
    4142   ;;
    4243   *-*-darwin*)
    4344-    DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
    4445+    DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
    45      MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
     46     MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
    4647     SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
    4748     CXXPICFLAG=
    48 @@ -30652,9 +30652,6 @@
    49  
    50  
    51  case "$canonical_host_type" in
    52 -  *-*-darwin*)
    53 -    UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
    54 -  ;;
    55    *)
    56      UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
    57    ;;

  • patch-configure-2 

    diff -uNr files.orig/patch-configure-2 files/patch-configure-2
    old new  
    1 --- octave-2.9.9.orig/configure 2007-02-27 01:55:00.000000000 -0800
    2 +++ octave-2.9.9/configure      2007-02-27 01:55:37.000000000 -0800
    3 @@ -10788,9 +10788,9 @@
     1diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
     2--- octave-2.9.15.orig/configure        2007-10-18 11:17:52.000000000 -0400
     3+++ octave-2.9.15/configure     2007-10-18 11:19:19.000000000 -0400
     4@@ -10242,9 +10242,9 @@
     5 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
     6 _ACEOF
    47 
    5  GLPK_LIBS=
    6  if test -n "$glpk_lib"; then
    7 -  as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
     8-    as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
    89-{ echo "$as_me:$LINENO: checking for glp_lpx_simplex in -l$glpk_lib" >&5
    910-echo $ECHO_N "checking for glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
    1011+  as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''__glp_lpx_simplex" | $as_tr_sh`
    … …  
    1314 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
    1415   echo $ECHO_N "(cached) $ECHO_C" >&6
    1516 else
    16 @@ -10809,11 +10809,11 @@
     17@@ -10263,11 +10263,11 @@
    1718 #ifdef __cplusplus
    1819 extern "C"
    1920 #endif
    … …  
    2728   ;
    2829   return 0;
    2930 }
     31@@ -10310,7 +10310,7 @@
     32       GLPK_LIBS="-l$glpk_lib"
     33 
     34 cat >>confdefs.h <<\_ACEOF
     35-#define GLPK_PRE_4_14 1
     36+#undef  GLPK_PRE_4_14
     37 _ACEOF
     38 
     39 else

  • patch-configure-3 

    diff -uNr files.orig/patch-configure-3 files/patch-configure-3
    old new  
    1 --- octave-2.9.9.orig/configure 2007-02-26 12:22:12.000000000 -0800
    2 +++ octave-2.9.9/configure      2007-02-26 12:25:42.000000000 -0800
    3 @@ -30253,7 +30253,7 @@
    4      fi
    5      { echo "$as_me:$LINENO: checking to see if your gnuplot supports multiple plot windows" >&5
    6  echo $ECHO_N "checking to see if your gnuplot supports multiple plot windows... $ECHO_C" >&6; }
    7 -    if test -z "`echo 'set term x11 2' | $GNUPLOT_BINARY 2>&1`"; then
    8 +    if test -z "`echo 'set term aqua 2' | $GNUPLOT_BINARY 2>&1`"; then
    9        { echo "$as_me:$LINENO: result: yes" >&5
    10  echo "${ECHO_T}yes" >&6; }
    11      else

  • patch-dynamic-ld-cc 

    diff -uNr files.orig/patch-dynamic-ld-cc files/patch-dynamic-ld-cc
    old new  
    1 --- octave-2.9.9.orig/src/dynamic-ld.cc 2007-02-25 19:16:09.000000000 +0100
    2 +++ octave-2.9.9/src/dynamic-ld.cc      2007-02-25 18:44:29.000000000 +0100
    3 @@ -406,7 +406,11 @@
     1diff -uNr octave-2.9.15.orig/src/dynamic-ld.cc octave-2.9.15/src/dynamic-ld.cc
     2--- octave-2.9.15.orig/src/dynamic-ld.cc        2007-10-12 17:27:29.000000000 -0400
     3+++ octave-2.9.15/src/dynamic-ld.cc     2007-10-17 20:11:54.000000000 -0400
     4@@ -443,7 +443,11 @@
    45            {
    56              octave_mex_file_list::append (mex_file);
    67 

  • patch-glpk 

    diff -uNr files.orig/patch-glpk files/patch-glpk
    old new  
    1 --- octave-2.9.9.orig/src/DLD-FUNCTIONS/__glpk__.cc     2007-02-27 03:47:14.000000000 -0800
    2 +++ octave-2.9.9/src/DLD-FUNCTIONS/__glpk__.cc  2007-02-27 03:48:53.000000000 -0800
    3 @@ -38,8 +38,10 @@
    4  
    5  #if defined (HAVE_GLPK)
    6  
    7 -extern "C" {
    8  #include <glpk.h>
    9 +extern "C" {
    10 +  void _glp_lib_print_hook(int (*func)(void *info, char *buf), void *info);
    11 +  void _glp_lib_fault_hook(int (*func)(void *info, char *buf), void *info);
    12  }
    13  
    14  #define NIntP 17
    15 @@ -141,10 +143,10 @@
    16  
    17    clock_t t_start = clock();
    18  
    19 -  lib_set_fault_hook (NULL, glpk_fault_hook);
    20 +  _glp_lib_fault_hook (glpk_fault_hook, NULL);
    21  
    22    if (lpxIntParam[0] > 1)
    23 -    lib_set_print_hook (NULL, glpk_print_hook);
    24 +    _glp_lib_print_hook (glpk_print_hook, NULL);
    25  
    26    LPX *lp = lpx_create_prob ();
    27  
    28 @@ -277,7 +279,7 @@
    29        break;
    30  
    31      default:
    32 -      insist (method != method);
    33 +      glpk_fault_hook (NULL, "method != method");
    34      }
    35  
    36    /*  errnum assumes the following results:
    37 @@ -342,7 +344,8 @@
    38         }
    39  
    40        *time = (clock () - t_start) / CLOCKS_PER_SEC;
    41 -      *mem = (lib_env_ptr () -> mem_tpeak);
    42 +      /* currently there is no way to determine memory usage */
    43 +      *mem = 0;
    44  
    45        lpx_delete_prob (lp);
    46        return 0;

  • patch-glpk.m 

    diff -uNr files.orig/patch-glpk.m files/patch-glpk.m
    old new  
    1 --- octave-2.9.9.orig/scripts/optimization/glpk.m       2007-02-26 13:30:39.000000000 -0800
    2 +++ octave-2.9.9/scripts/optimization/glpk.m    2007-02-26 13:32:37.000000000 -0800
    3 @@ -361,7 +361,8 @@
    4  ## @item time
    5  ## Time (in seconds) used for solving LP/MIP problem.
    6  ## @item mem
    7 -## Memory (in bytes) used for solving LP/MIP problem.
    8 +## Memory (in bytes) used for solving LP/MIP problem (this is not
    9 +## available if the version of GLPK is 4.15 or later)
    10  ## @end table
    11  ## @end table
    12  ##