rpms/gdl/devel gdl-0.9rc4-cvs.patch, 1.1, 1.2 gdl-0.9rc4-wx.patch, 1.1, 1.2 gdl.spec, 1.56, 1.57

Orion Poplawski orion at fedoraproject.org
Wed Jul 7 21:44:58 UTC 2010


Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11848

Modified Files:
	gdl-0.9rc4-cvs.patch gdl-0.9rc4-wx.patch gdl.spec 
Log Message:
* Wed Jul 7 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.14.rc4
- Update to today's cvs
- Drop wx-config patch
- Re-instate wx patch to avoid segfault on test exit


gdl-0.9rc4-cvs.patch:
 cvs/gdl/INSTALL                                    |   50 
 cvs/gdl/MAP_INSTALL                                |   51 
 cvs/gdl/Makefile.cvs                               |    8 
 cvs/gdl/NEWS                                       |   30 
 cvs/gdl/README                                     |   20 
 cvs/gdl/config.h.in                                |    6 
 cvs/gdl/configure                                  |27455 +++++++++++----------
 cvs/gdl/configure.in                               |  167 
 cvs/gdl/doc/www/contribute.html                    |   30 
 cvs/gdl/doc/www/credits.html                       |   55 
 cvs/gdl/doc/www/download.html                      |   69 
 cvs/gdl/doc/www/feedback.html                      |   23 
 cvs/gdl/doc/www/gdl.css                            |   25 
 cvs/gdl/doc/www/home.html                          |   70 
 cvs/gdl/doc/www/index.html                         |   12 
 cvs/gdl/doc/www/menu.html                          |   32 
 cvs/gdl/doc/www/require.html                       |   86 
 cvs/gdl/doc/www/resources.html                     |   38 
 cvs/gdl/doc/www/screenshot.html                    |  124 
 cvs/gdl/doc/www/screenshots/screenshot01.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot01_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot02.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot02_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot03.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot03_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot04.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot04_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot05.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot05_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot06.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot06_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot07.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot07_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot08.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot08_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot09.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot09_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot10.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot10_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot11.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot11_thumb.png |binary
 cvs/gdl/doc/www/screenshots/screenshot12.png       |binary
 cvs/gdl/doc/www/screenshots/screenshot12_thumb.png |binary
 cvs/gdl/doc/www/support.html                       |   20 
 cvs/gdl/doc/www/tdl.html                           |   19 
 cvs/gdl/gdl.kdevelop                               |    9 
 cvs/gdl/src/.#file.cpp.1.9                         |  842 
 cvs/gdl/src/GDLInterpreter.cpp                     | 3808 +-
 cvs/gdl/src/GDLInterpreter.hpp                     |  362 
 cvs/gdl/src/GDLInterpreterTokenTypes.hpp           |  425 
 cvs/gdl/src/GDLInterpreterTokenTypes.txt           |  425 
 cvs/gdl/src/GDLLexer.cpp                           |  383 
 cvs/gdl/src/GDLLexer.hpp                           |    2 
 cvs/gdl/src/GDLParser.cpp                          | 3122 +-
 cvs/gdl/src/GDLParser.hpp                          |   26 
 cvs/gdl/src/GDLTokenTypes.hpp                      |  425 
 cvs/gdl/src/GDLTokenTypes.txt                      |  425 
 cvs/gdl/src/GDLTreeParser.cpp                      | 1903 -
 cvs/gdl/src/GDLTreeParser.hpp                      |   23 
 cvs/gdl/src/GDLTreeParserTokenTypes.hpp            |  425 
 cvs/gdl/src/GDLTreeParserTokenTypes.txt            |  425 
 cvs/gdl/src/Makefile.am                            |    5 
 cvs/gdl/src/Makefile.in                            |   85 
 cvs/gdl/src/accessdesc.hpp                         |   10 
 cvs/gdl/src/antlr/LLkParser.cpp                    |    8 
 cvs/gdl/src/antlr/Makefile.am                      |    6 
 cvs/gdl/src/antlr/Makefile.in                      |   84 
 cvs/gdl/src/antlr/Parser.cpp                       |   11 
 cvs/gdl/src/antlr/RefCount.hpp                     |    4 
 cvs/gdl/src/antlr/TreeParser.cpp                   |    6 
 cvs/gdl/src/arrayindex.cpp                         |   12 
 cvs/gdl/src/arrayindex.hpp                         |  513 
 cvs/gdl/src/arrayindexlistt.hpp                    |   18 
 cvs/gdl/src/assocdata.cpp                          |   13 
 cvs/gdl/src/assocdata.hpp                          |   15 
 cvs/gdl/src/basegdl.cpp                            |   21 
 cvs/gdl/src/basegdl.hpp                            |   46 
 cvs/gdl/src/basic_fun.cpp                          |  878 
 cvs/gdl/src/basic_fun_cl.cpp                       |    4 
 cvs/gdl/src/basic_fun_jmg.cpp                      |   30 
 cvs/gdl/src/basic_op.cpp                           |  378 
 cvs/gdl/src/basic_pro.cpp                          |  128 
 cvs/gdl/src/basic_pro_jmg.cpp                      |   70 
 cvs/gdl/src/basic_pro_jmg.hpp                      |    2 
 cvs/gdl/src/convert2.cpp                           |   38 
 cvs/gdl/src/datalistt.hpp                          |    2 
 cvs/gdl/src/datatypes.cpp                          |  753 
 cvs/gdl/src/datatypes.hpp                          |   17 
 cvs/gdl/src/datatypesref.cpp                       | 1906 +
 cvs/gdl/src/dcompiler.cpp                          |    7 
 cvs/gdl/src/deviceps.hpp                           |   21 
 cvs/gdl/src/devicex.hpp                            |   13 
 cvs/gdl/src/dimension.hpp                          |    2 
 cvs/gdl/src/dinterpreter.cpp                       |  116 
 cvs/gdl/src/dinterpreter.hpp                       |   26 
 cvs/gdl/src/dnode.cpp                              |    3 
 cvs/gdl/src/dnode.hpp                              |   13 
 cvs/gdl/src/dpro.cpp                               |   23 
 cvs/gdl/src/dpro.hpp                               |   10 
 cvs/gdl/src/dstructgdl.cpp                         |    5 
 cvs/gdl/src/dstructgdl.hpp                         |    9 
 cvs/gdl/src/envt.cpp                               |  192 
 cvs/gdl/src/envt.hpp                               |   57 
 cvs/gdl/src/fftw.cpp                               |   28 
 cvs/gdl/src/file.cpp                               |   80 
 cvs/gdl/src/gdl.cpp                                |    2 
 cvs/gdl/src/gdlc.g                                 |  404 
 cvs/gdl/src/gdlc.i.g                               | 3701 +-
 cvs/gdl/src/gdlc.tree.g                            |  242 
 cvs/gdl/src/gdlgstream.cpp                         |   12 
 cvs/gdl/src/gdlgstream.hpp                         |   80 
 cvs/gdl/src/gdljournal.cpp                         |    8 
 cvs/gdl/src/gdlpsstream.cpp                        |    2 
 cvs/gdl/src/gdlpsstream.hpp                        |    3 
 cvs/gdl/src/gdlpython.cpp                          |    2 
 cvs/gdl/src/gdlsvgstream.cpp                       |    2 
 cvs/gdl/src/gdlwidget.cpp                          |  294 
 cvs/gdl/src/gdlwidget.hpp                          |   43 
 cvs/gdl/src/gdlwinstream.hpp                       |    4 
 cvs/gdl/src/gdlxstream.cpp                         |   44 
 cvs/gdl/src/gdlxstream.hpp                         |   13 
 cvs/gdl/src/gdlzstream.cpp                         |    2 
 cvs/gdl/src/graphics.cpp                           |   13 
 cvs/gdl/src/grib.cpp                               |    4 
 cvs/gdl/src/grib.hpp                               |    4 
 cvs/gdl/src/gshhs.cpp                              |  288 
 cvs/gdl/src/gshhs.hpp                              |   30 
 cvs/gdl/src/gsl_fun.cpp                            |  169 
 cvs/gdl/src/gsl_fun.hpp                            |    1 
 cvs/gdl/src/gzstream.hpp                           |   12 
 cvs/gdl/src/hdf_pro.cpp                            |    5 
 cvs/gdl/src/initsysvar.cpp                         |   11 
 cvs/gdl/src/io.cpp                                 |   94 
 cvs/gdl/src/io.hpp                                 |    2 
 cvs/gdl/src/lapack.cpp                             |   19 
 cvs/gdl/src/libinit.cpp                            |   31 
 cvs/gdl/src/libinit_jmg.cpp                        |   33 
 cvs/gdl/src/magick_cl.cpp                          |    2 
 cvs/gdl/src/math_fun.cpp                           | 1251 
 cvs/gdl/src/math_fun.hpp                           |    1 
 cvs/gdl/src/math_fun_ac.cpp                        |   58 
 cvs/gdl/src/math_fun_jmg.cpp                       |   14 
 cvs/gdl/src/math_fun_jmg.hpp                       |    9 
 cvs/gdl/src/math_utl.hpp                           |   11 
 cvs/gdl/src/ncdf_cl.cpp                            |   31 
 cvs/gdl/src/newprognode.cpp                        |  822 
 cvs/gdl/src/objects.cpp                            |   61 
 cvs/gdl/src/objects.hpp                            |   52 
 cvs/gdl/src/plotting.cpp                           |  546 
 cvs/gdl/src/plotting.hpp                           |    7 
 cvs/gdl/src/print.cpp                              |   13 
 cvs/gdl/src/pro/Makefile.am                        |   11 
 cvs/gdl/src/pro/Makefile.in                        |   11 
 cvs/gdl/src/pro/README.txt                         |    8 
 cvs/gdl/src/pro/STATUS                             |    2 
 cvs/gdl/src/pro/UrgentNeed.txt                     |    1 
 cvs/gdl/src/pro/deriv.pro                          |    2 
 cvs/gdl/src/pro/dialog_pickfile.pro                |  387 
 cvs/gdl/src/pro/escape_special_char.pro            |   87 
 cvs/gdl/src/pro/file_basename.pro                  |   45 
 cvs/gdl/src/pro/file_copy.pro                      |  193 
 cvs/gdl/src/pro/file_delete.pro                    |  132 
 cvs/gdl/src/pro/file_dirname.pro                   |   12 
 cvs/gdl/src/pro/file_expand_path.pro               |   16 
 cvs/gdl/src/pro/findex.pro                         |   97 
 cvs/gdl/src/pro/hist_2d.pro                        |   39 
 cvs/gdl/src/pro/hist_nd.pro                        |  177 
 cvs/gdl/src/pro/imsl_erf.pro                       |    8 
 cvs/gdl/src/pro/interpol.pro                       |   43 
 cvs/gdl/src/pro/ludc.pro                           |    7 
 cvs/gdl/src/pro/restore.pro                        |   22 
 cvs/gdl/src/pro/str_sep.pro                        |   64 
 cvs/gdl/src/pro/strsplit.pro                       |  193 
 cvs/gdl/src/pro/tvscl.pro                          |   47 
 cvs/gdl/src/prognode.cpp                           |  969 
 cvs/gdl/src/prognode.hpp                           | 1130 
 cvs/gdl/src/prognodeexpr.cpp                       | 1310 -
 cvs/gdl/src/prognodeexpr.hpp                       |   70 
 cvs/gdl/src/pythongdl.cpp                          |   12 
 cvs/gdl/src/read.cpp                               |  126 
 cvs/gdl/src/sigfpehandler.cpp                      |    2 
 cvs/gdl/src/specializations.hpp                    |   16 
 cvs/gdl/src/str.cpp                                |   31 
 cvs/gdl/src/strassenmatrix.hpp                     |   23 
 cvs/gdl/src/typedefs.hpp                           |   93 
 cvs/gdl/src/widget.cpp                             |  258 
 cvs/gdl/src/widget.hpp                             |    1 
 cvs/gdl/testsuite/Makefile.am                      |   37 
 cvs/gdl/testsuite/Makefile.in                      |   40 
 cvs/gdl/testsuite/README                           |   48 
 cvs/gdl/testsuite/Saturn.jpg                       |binary
 cvs/gdl/testsuite/checks                           |   15 
 cvs/gdl/testsuite/test_constants.pro               |  906 
 cvs/gdl/testsuite/test_device.pro                  |   29 
 cvs/gdl/testsuite/test_erfinv.pro                  |   24 
 cvs/gdl/testsuite/test_fft.pro                     |  149 
 cvs/gdl/testsuite/test_fft_leak.pro                |   93 
 cvs/gdl/testsuite/test_file_basename.pro           |   60 
 cvs/gdl/testsuite/test_file_copy.pro               |  236 
 cvs/gdl/testsuite/test_file_delete.pro             |  159 
 cvs/gdl/testsuite/test_file_dirname.pro            |   49 
 cvs/gdl/testsuite/test_file_search.pro             |   84 
 cvs/gdl/testsuite/test_fix.pro                     |   17 
 cvs/gdl/testsuite/test_float2string.pro            |   37 
 cvs/gdl/testsuite/test_gc.pro                      |   28 
 cvs/gdl/testsuite/test_get_screen_size.pro         |   80 
 cvs/gdl/testsuite/test_hist_2d.pro                 |   67 
 cvs/gdl/testsuite/test_idl8.pro                    |   45 
 cvs/gdl/testsuite/test_interpol.pro                |   39 
 cvs/gdl/testsuite/test_known_bugs.pro              |  101 
 cvs/gdl/testsuite/test_memory.pro                  |    8 
 cvs/gdl/testsuite/test_nans_in_sort_and_median.pro |   81 
 cvs/gdl/testsuite/test_pmulti.pro                  |   23 
 cvs/gdl/testsuite/test_point_lun.pro               |   51 
 cvs/gdl/testsuite/test_product.pro                 |  198 
 cvs/gdl/testsuite/test_read_jpeg.pro               |  109 
 cvs/gdl/testsuite/test_readf.pro                   |  138 
 cvs/gdl/testsuite/test_rebin.pro                   |   11 
 cvs/gdl/testsuite/test_spher_harm.pro              |  105 
 cvs/gdl/testsuite/test_spl_init.pro                |  163 
 cvs/gdl/testsuite/test_str_functions.pro           |   80 
 cvs/gdl/testsuite/test_strsplit.pro                |  168 
 cvs/gdl/testsuite/test_suite.pro                   | 1716 -
 cvs/gdl/testsuite/test_tv.pro                      |   76 
 cvs/gdl/testsuite/test_url.pro                     |   64 
 cvs/gdl/testsuite/test_zeropoly.pro                |    4 
 cvs/gdl/testsuite/test_zip.pro                     |  126 
 cvs/gdl/testsuite/test_zzz.pro                     |    5 
 cvs/gdl/testsuite/try                              |    5 
 gdl-0.9rc4/doc/Makefile                            |only
 gdl-0.9rc4/gdl.kdevses                             |only
 gdl-0.9rc4/m4                                      |only
 gdl-0.9rc4/src/GDLInterpreter.cvs.cpp              |only
 gdl-0.9rc4/src/GDLInterpreterHack.cpp              |only
 gdl-0.9rc4/src/deviceps.hpp.orig                   |only
 gdl-0.9rc4/src/libinit.cpp.orig                    |only
 gdl-0.9rc4/src/libinit.cpp.rej                     |only
 gdl-0.9rc4/src/plotting.cpp.orig                   |only
 gdl-0.9rc4/src/plotting.cpp.rej                    |only
 gdl-0.9rc4/src/pro/dicom/Makefile.am.off           |only
 gdl-0.9rc4/src/pro/dicom/Makefile.in.off           |only
 gdl-0.9rc4/src/strassenmatrix.no_c_check.hpp       |only
 gdl-0.9rc4/src/strassenmatrix.ok.hpp               |only
 gdl-0.9rc4/src/strassenmatrix.rc1.hpp              |only
 gdl-0.9rc4/testsuite/Makefile                      |only
 245 files changed, 44001 insertions(+), 22658 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 gdl-0.9rc4-cvs.patchIndex: gdl-0.9rc4-cvs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl-0.9rc4-cvs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdl-0.9rc4-cvs.patch	3 Jun 2010 15:10:44 -0000	1.1
+++ gdl-0.9rc4-cvs.patch	7 Jul 2010 21:44:57 -0000	1.2
@@ -23,7 +23,7 @@ diff -ru --unidirectional-new-file --exc
  
 diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/configure cvs/gdl/configure
 --- gdl-0.9rc4/configure	2010-02-02 11:13:51.000000000 -0700
-+++ cvs/gdl/configure	2010-04-16 11:22:42.000000000 -0600
++++ cvs/gdl/configure	2010-07-07 14:40:58.445004719 -0600
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -32,7 +32,260 @@ diff -ru --unidirectional-new-file --exc
  #
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-@@ -698,8 +698,8 @@
+@@ -530,22 +530,22 @@
+ # Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-case X$lt_ECHO in
++case X$ECHO in
+ X*--fallback-echo)
+   # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+   ;;
+ esac
+ 
+-ECHO=${lt_ECHO-echo}
++echo=${ECHO-echo}
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+   shift
+ elif test "X$1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $ECHO works!
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
+   :
+ else
+   # Restart under the correct shell.
+@@ -555,9 +555,9 @@
+ if test "X$1" = X--fallback-echo; then
+   # used as fallback echo
+   shift
+-  cat <<_LT_EOF
++  cat <<EOF
+ $*
+-_LT_EOF
++EOF
+   exit 0
+ fi
+ 
+@@ -565,116 +565,121 @@
+ # if CDPATH is set.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-if test -z "$lt_ECHO"; then
+-  if test "X${echo_test_string+set}" != Xset; then
+-    # find a string as large as possible, as long as the shell can cope with it
+-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+-      then
+-        break
+-      fi
+-    done
+-  fi
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
+ 
+-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+-     test "X$echo_testing_string" = "X$echo_test_string"; then
+-    :
+-  else
+-    # The Solaris, AIX, and Digital Unix default echo programs unquote
+-    # backslashes.  This makes it impossible to quote backslashes using
+-    #   echo "$something" | sed 's/\\/\\\\/g'
+-    #
+-    # So, first we look for a working echo in the user's PATH.
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
+ 
+-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-    for dir in $PATH /usr/ucb; do
+-      IFS="$lt_save_ifs"
+-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-         test "X$echo_testing_string" = "X$echo_test_string"; then
+-        ECHO="$dir/echo"
+-        break
+-      fi
+-    done
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
+     IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
+ 
+-    if test "X$ECHO" = Xecho; then
+-      # We didn't find a better echo, so look for alternatives.
+-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+-         test "X$echo_testing_string" = "X$echo_test_string"; then
+-        # This shell has a builtin print -r that does the trick.
+-        ECHO='print -r'
+-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+-        # If we have ksh, try running configure again with it.
+-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-        export ORIGINAL_CONFIG_SHELL
+-        CONFIG_SHELL=/bin/ksh
+-        export CONFIG_SHELL
+-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+-      else
+-        # Try using printf.
+-        ECHO='printf %s\n'
+-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	  # Cool, printf works
+-	  :
+-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+-	     test "X$echo_testing_string" = 'X\t' &&
+-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	     test "X$echo_testing_string" = "X$echo_test_string"; then
+-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	  export CONFIG_SHELL
+-	  SHELL="$CONFIG_SHELL"
+-	  export SHELL
+-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+-	     test "X$echo_testing_string" = 'X\t' &&
+-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	     test "X$echo_testing_string" = "X$echo_test_string"; then
+-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
[...36137 lines suppressed...]
++endif
++
++ext=strsplit(str3,'$',/ext)
++;print , str3 , ' Fext> ' , strjoin(ext,'-') , N_ELEMENTS(ext)
++
++res=['ch' , 'ops &up str*ings.' ]
++if( (N_ELEMENTS(ext) ne 2) AND (ARRAY_EQUAL(tab,res, /NO_TYPECONV) eq 0 )) then begin
++   MESSAGE, 'error str extract', /continue
++   EXIT, status=1
++endif
++;
++
++ext=strsplit(str3,'$',/ext,/preserve)
++;print , str3 , ' Fext> ' , strjoin(ext,'-') , N_ELEMENTS(ext)
++if((N_ELEMENTS(ext) ne 3)) then begin
++   MESSAGE, 'error str3 extract preserve', /continue
++   EXIT, status=1
++endif
++
++;
++
++tab=strsplit(str4,'.')
++res=[2,7]
++if(ARRAY_EQUAL(tab,res) eq 0) then begin
++   MESSAGE, 'error str3', /continue
++   EXIT, status=1
++endif
++
++tab=strsplit(str4,'.',/preserve)
++res=[0,1,2,7]
++if(ARRAY_EQUAL(tab,res) eq 0) then begin
++   MESSAGE, 'error str4 preserve_null', /continue
++   EXIT, status=1
++endif
++
++ext=strsplit(str4,'.',/ext,/preserve)
++;print , str4 , ' Fext> ' , strjoin(ext,'-') , N_ELEMENTS(ext)
++if((N_ELEMENTS(ext) ne 4)) then begin
++   MESSAGE, 'error str4 extract , preserve', /continue
++   EXIT, status=1
++endif
++
++tab= STRSPLIT(str5,/preserve)
++res=[0,1,3,5,7,9]
++if(ARRAY_EQUAL(tab,res) eq 0) then begin
++   MESSAGE, 'error str5 preserve_null', /continue
++   EXIT, status=1
++endif
++
++ext= STRSPLIT(str5,/preserve,/extract)
++if((N_ELEMENTS(ext) ne 6)) then begin
++   MESSAGE, 'error str5 extract , preserve', /continue
++   EXIT, status=1
++endif
++
++print, 'All tests done'
++;
++end
++
++
 diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/test_suite.pro cvs/gdl/testsuite/test_suite.pro
 --- gdl-0.9rc4/testsuite/test_suite.pro	2010-02-02 11:13:51.000000000 -0700
 +++ cvs/gdl/testsuite/test_suite.pro	2010-05-21 10:24:01.372906136 -0600
@@ -52130,6 +86106,136 @@ diff -ru --unidirectional-new-file --exc
 +  foreach i of c do ptr_free, i
 +
  end
+diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/test_zip.pro cvs/gdl/testsuite/test_zip.pro
+--- gdl-0.9rc4/testsuite/test_zip.pro	1969-12-31 17:00:00.000000000 -0700
++++ cvs/gdl/testsuite/test_zip.pro	2010-06-29 03:20:57.000000000 -0600
+@@ -0,0 +1,126 @@
++;
++; Testing the /compress keyword !
++;
++; Maxime Lenoir, June 2010
++; under GNU GPL 2 or later
++; 
++pro TEST_ZIP
++
++file='test_zip.gz'
++spawn,'echo -e "GDL - GNU Data Language\nA free IDL (Interactive Data Language) compatible incremental\ncompiler (i. e. runs IDL programs)." | gzip > '+file
++
++openr,fd,file,/get,/compress,/delete
++
++;; Size test (FSTAT)
++if strlowcase(!version.os_name) eq 'linux' then spawn,'stat --printf=%s '+file,s else spawn,'stat -f%z '+file,s
++if (fstat(fd)).size ne s then begin
++	message,/continue,'Bad size returned for zipped file'
++	exit,status=1
++endif
++
++;; READ TESTS
++
++; Readf test
++str=''
++readf,fd,str
++spawn,'cat '+file+' | gunzip - | head -1',head1
++if str ne head1 then begin
++	message,/continue,'Readf doesn''t work on zipped file'
++	exit,status=1
++endif
++
++readf,fd,str
++spawn,'cat '+file+' | gunzip - | head -2 | tail -1',head2
++if str ne head2 then begin
++	message,/continue,'Readf doesn''t work twice on zipped file'
++	exit,status=1
++endif
++
++point_lun,fd,0
++readf,fd,str ; At this point, readf works well, so we can test point_lun
++if str ne head1 then begin
++	message,/continue,'Point_lun doesn''t work on zipped file (read mode)'
++	exit,status=1
++endif
++
++; Assoc test
++point_lun,fd,0
++a=assoc(fd,bytarr(5))
++spawn,'cat '+file+' | gunzip - | head -1 | cut -b 1-5',cut15
++if string(a[0]) ne cut15 then begin
++	message,/continue,'Assoc doesn''t work on zipped file'
++	exit,status=1
++endif
++
++point_lun,fd,5
++
++if string(a[0]) ne cut15 then begin
++	message,/continue,'Assoc doesn''t work twice on zipped file'
++	exit,status=1
++endif
++
++spawn,'cat '+file+' | gunzip - | head -1 | cut -b 6-10',cut15
++if string(a[1]) ne ' GNU ' then begin
++	message,/continue,'Assoc doesn''t work with differents indexes on zipped file'
++	exit,status=1
++endif
++
++; Readu test
++point_lun,fd,0
++str='123'
++readu,fd,str
++if str ne 'GDL' then begin
++	message,/continue,'Readu doesn''t work on zipped file'
++	exit,status=1
++endif
++
++readu,fd,str
++if str ne ' - ' then begin
++	message,/continue,'Readu doesn''t work twice on zipped file'
++	exit,status=1
++endif
++
++close,fd
++free_lun,fd
++
++;; WRITE TESTS
++
++file='test_zipw.gz'
++openw,fd,file,/get,/compress
++printf,fd,'GNU Data Language'
++close,fd
++free_lun,fd
++
++openr,fd,file,/get,/compress
++readf,fd,str
++if str ne 'GNU Data Language' then begin
++	message,/continue,'Printf doesn''t work on zipped file'
++	exit,status=1
++endif
++close,fd
++free_lun,fd
++
++openw,fd,file,/get,/compress
++printf,fd,'GNU Data Language'
++point_lun,fd,10
++; point_lun used in write mode is pretty useless cause you can only move forward and it cause premature EOF.
++; Also, you can't open a file in write mode, with compress and append keywords.
++; So, if you don't specify append, you truncate the file, and point_lun become useless.
++; To summarize, you can't write data and go backward to overwrite it. (Just don't use it)
++
++printf,fd,'rocks' ; GNU Data Language\nrocks\n
++close,fd
++free_lun,fd
++
++openr,fd,file,/get,/compress,/delete
++a=assoc(fd,bytarr(10))
++
++if string(a[0]) ne 'GNU Data L' or strmid(string(a[1]),0,7) ne 'anguage' then begin
++	message,/continue,'Point_lun doesn''t work on zipped file (write mode)'
++	exit,status=1
++endif
++
++close,fd
++free_lun,fd
++
++end
 diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc4/testsuite/test_zzz.pro cvs/gdl/testsuite/test_zzz.pro
 --- gdl-0.9rc4/testsuite/test_zzz.pro	1969-12-31 17:00:00.000000000 -0700
 +++ cvs/gdl/testsuite/test_zzz.pro	2010-04-07 10:29:37.000000000 -0600

gdl-0.9rc4-wx.patch:
 basic_pro.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: gdl-0.9rc4-wx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl-0.9rc4-wx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gdl-0.9rc4-wx.patch	15 Feb 2010 20:42:51 -0000	1.1
+++ gdl-0.9rc4-wx.patch	7 Jul 2010 21:44:57 -0000	1.2
@@ -1,11 +1,11 @@
---- gdl-0.9rc4/src/basic_pro.cpp.wx	2010-02-02 11:13:51.000000000 -0700
-+++ gdl-0.9rc4/src/basic_pro.cpp	2010-02-04 10:54:58.336905605 -0700
-@@ -689,7 +689,7 @@
-   {
+--- gdl-0.9rc4/src/basic_pro.cpp.wx	2010-07-07 15:40:39.000000000 -0600
++++ gdl-0.9rc4/src/basic_pro.cpp	2010-07-07 15:41:48.498004077 -0600
+@@ -728,7 +728,7 @@
+ #endif
  
  #ifdef HAVE_LIBWXWIDGETS
 -    wxTheApp->OnExit(); // Defined in GDLApp::OnExit() in gdlwidget.cpp
 +    if (wxTheApp) wxTheApp->OnExit(); // Defined in GDLApp::OnExit() in gdlwidget.cpp
-     wxUninitialize();
+ //     wxUninitialize();
  #endif
  


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gdl.spec	3 Jun 2010 15:10:46 -0000	1.56
+++ gdl.spec	7 Jul 2010 21:44:57 -0000	1.57
@@ -2,7 +2,7 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.13.rc4%{?dist}
+Release:        0.14.rc4%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -13,7 +13,6 @@ Source1:        gdl.csh
 Source2:        gdl.sh
 Source3:        makecvstarball
 Patch0:         gdl-0.9rc4-cvs.patch
-Patch1:         gdl-0.9rc4-wx-config.patch
 # Build with system antlr library.  Request for upstream change here:
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
 Patch4:         gdl-0.9rc3-antlr.patch
@@ -82,12 +81,11 @@ Provides:       %{name}-runtime = %{vers
 %prep
 %setup -q -n %{name}-%{version}rc4
 %patch0 -p1 -b .cvs
-%patch1 -p1 -b .wx-config
 %if !0%{?rhel}
 #patch4 -p1 -b .antlr
 %patch5 -p1 -b .antlr-auto
 %endif
-#patch6 -p1 -b .wx
+%patch6 -p1 -b .wx
 %if !0%{?rhel}
 rm -rf src/antlr
 %endif
@@ -169,6 +167,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 7 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.14.rc4
+- Update to today's cvs
+- Drop wx-config patch
+- Re-instate wx patch to avoid segfault on test exit
+
 * Thu Jun 3 2010 Orion Poplawski <orion at cora.nwra.com> - 0.9-0.13.rc4
 - Update to today's cvs
 - Drop GLDLexer and python patches



More information about the scm-commits mailing list