rpms/gdl/devel gdl-0.9pre6-cvs.patch, NONE, 1.1 gdl-0.9pre6-gcc43.patch, NONE, 1.1 gdl-0.9pre6-plplot.patch, NONE, 1.1
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue Mar 4 21:37:54 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16630
Added Files:
gdl-0.9pre6-cvs.patch gdl-0.9pre6-gcc43.patch
gdl-0.9pre6-plplot.patch
Log Message:
Add the patches
gdl-0.9pre6-cvs.patch:
--- NEW FILE gdl-0.9pre6-cvs.patch ---
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9pre6/aclocal.m4 cvs/gdl/aclocal.m4
--- gdl-0.9pre6/aclocal.m4 2007-10-29 17:10:49.000000000 -0600
+++ cvs/gdl/aclocal.m4 2007-11-08 16:13:07.000000000 -0700
@@ -1,7 +1,7 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,6706 +11,7445 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [m4_define([AC_PROVIDE_IFELSE],
+ [m4_ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
-AC_PREREQ([2.52])
-# serial 6
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [AC_LIBTOOL_CXX],
+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+ ])])
+dnl And a similar setup for Fortran 77 support
+ AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [AC_LIBTOOL_F77],
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. We must strip everything past the first ":",
-# and everything past the last "/".
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [ifdef([AC_PROG_GCJ],
+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([A][M_PROG_GCJ],
+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([LT_AC_PROG_GCJ],
+ [define([LT_AC_PROG_GCJ],
+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
- [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
- m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
- m4_if(regexp([$1], [^/.*]), -1,
- [.],
- patsubst([$1], [^\(/\).*], [\1])),
- patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
- patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
- [:.*])))/stamp-h[]_AM_STAMP_Count])
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h. But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-AC_CONFIG_HEADERS([$1],
- [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
- [$3])
-])# _AM_CONFIG_HEADER
-
-
-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# --------------------------------------------------------------
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# AM_CONFIG_HEADER
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
-# Do all the work for Automake. -*- Autoconf -*-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
[...38815 lines suppressed...]
+
+;
+; complex title with greek and math...
+;
+pro titre1, full=full, ymargin=ymargin, charsize=charsize
+
+t1='!6F(s) = (2!4p)!e-1/2!n !mi!s!a!e!m' + STRING(36b)
+t1=t1+'!r!b!i-!m' + STRING(36b) + '!nF(x)e!e-i2!4p!3xs!ndx'
+
+if KEYWORD_SET(full) then t1b=t1 else t1b=''
+if N_ELEMENTS(ymargin) EQ 0 then ymargin=[3,5]
+if N_ELEMENTS(charsize) EQ 0 then charsize=2.
+
+plot, findgen(10), charsize=charsize, /nodata, ymargin=ymargin, $
+ title=t1, xtitle=t1b, ytitle=t1b, subtitle=t1b
+
+xyouts, 0.2, 0.5, charsize=3, t1,/normal
+xyouts, 1, 2, charsize=2.2, t1,/data
+end
+
+
+pro titre2
+
+t2='!MI!S!A!E!8x!R!B!Ip!N !7q!Ii!N!8U!S!E2!R!Ii!Ndx'
+
+if KEYWORD_SET(full) then t2b=t2 else t2b=''
+
+plot, findgen(10),/nodata, ymargin=[3,5], charsize=2, title=t2, $
+ xtitle=t2b, ytitle=t2b, subtitle=t2b
+
+XYOUTS, 0.5, .5, t2, $
+ charSIZE = 8, /NORMAL
+end
+
+;
+; exemple basic de superposition
+;
+pro titre3
+
+t3='!S!3dessous!rDESSUS n!Son!rOUI'
+plot, findgen(10), charsize=3, ymargin=[5,8], title=t3
+end
+;
+; les differents indices ...
+;
+pro titre4
+
+t4='!3!n niveauref!LlL!n!DdD!n!IiI!n!AaA!n!BbB!n!EeE!n!UuU!UuU'
+plot, findgen(10), charsize=3, ymargin=[5,8], title=t4
+
+t4b='!3!n!scou!r!uca !n!scou!r!Lca'
+plot, findgen(10), charsize=3, ymargin=[5,8], title=t4b
+
+end
+
+;
+; testing and adjusting aligment
+;
+pro TITRE5, charsize=charsize
+;
+if N_ELEMENTS(charsize) NE 1 then charsize=2
+;
+title='aAa!iaiA!uaUA!n!iaA!nDD!dadDA!nttt!lalLA!naa'
+plot, ymargin=[3,6], findgen(10), title=title, charsize=charsize
+
+rep=''
+read, 'suite (rc)', rep
+;
+; testing the "sub" index capabilities
+;
+title='aAa!iaiA!uaUA!n!iaA!nDD!dadDA!nttt!lalLA!naa'
+title=title+'!eaa!ubb!ecc!n!daa!euu'
+plot, ymargin=[3,6], findgen(10), title=title, charsize=charsize
+
+rep=''
+read, 'suite (rc)', rep
+title='aAa!iaiA!uaUA!n!iaA!nDD!dadDA!nttt!lalLA!naa'
+plot, ymargin=[3,6], findgen(10), title=title, charsize=charsize
+
+end
+;
+; ----------------------------------------
+; showing the effects of positioning commands (!U, !L, !M ...)
+;
+pro TITLE_FORMATING_EXAMPLE, postscript=postscript, title=title
+;
+if KEYWORD_SET(postscript) then begin
+ set_plot, 'ps'
+ device, filename='title_example.ps'
+endif
+;
+PcharRef=!p.charsize
+if (!p.charsize LT 1e-6) then begin
+ !p.charsize=2
+ print, 'You can play with !p.charsize to test other Char Sizes ...'
+endif
+;
+if (N_ELEMENTS(title) EQ 0) then begin
+ title='!3RefLevel'
+ title=title+'!LLower!S!EExponent!R!IIndex!N Normal'
+ title=title+'!S!EExp!R!IInd!N!S!U Up!R!D Down!N!S!A Above!R!B Below'
+endif
+;
+plot, findgen(10), title=title, $
+ xtitle=title, ytitle=title, subtitle=title
+;
+; remember size= does not exist in GDL
+;
+XYOUTS, 1, 5, title
+;
+if KEYWORD_SET(postscript) then begin
+ device,/close
+ print, 'PostScript File "title_example.ps" generated'
+ set_plot, 'x'
+endif
+;
+!p.charsize=PcharRef
+;
+end
+;
+; -----------------------------------------------
+; AC le 20/01/2008
+; we alway have to check the effect with !p.multi ...
+;
+pro TEST_TITLES_PMULTI, all_titles=all_titles, title=title, help=help
+;
+if KEYWORD_SET(help) then begin
+ print, 'pro TEST_TITLES_PMULTI, all_titles=all_titles, $'
+ print, ' title=title, help=help'
+ print, ''
+ print, 'Advices: we can used external parameters (!p.charsize ...)'
+ print, 'to play with other options'
+ return
+endif
+;
+device,/decomposed
+;
+if (N_ELEMENTS(title) EQ 0) then title='gaspQWERTYassdsfgagfafd'
+;
+xtitle=''
+ytitle=''
+subtitle=''
+if KEYWORD_SET(all_titles) then begin
+ xtitle=title
+ ytitle=title
+ subtitle=title
+endif
+;
+window, 0
+!p.multi=0
+plot, findgen(10), title=title, subtitle=subtitle, xtitle=xtitle, ytitle=ytitle
+oplot, 10-findgen(10), color='ff'x
+;
+window, 1
+!p.multi=[0,2,2]
+plot, findgen(10), title=title, subtitle=subtitle, xtitle=xtitle, ytitle=ytitle
+oplot, 10-findgen(10), color='ff'x
+
+plot, findgen(10), title=title, subtitle=subtitle, xtitle=xtitle, ytitle=ytitle
+oplot, 10-findgen(10), color='ff00'x
+
+!p.multi=0
+
+end
+;
+; ---------------------------------
+; calling hub
+;
+pro TEST_TITLES, all=all
+;
+s=''
+TITLE_FORMATING_EXAMPLE
+READ, 'Please type any key to continue', s
+;
+TEST_TITLES_PMULTI, /all
+READ, 'Please type any key to continue', s
+;
+TITRE1
+READ, 'Please type any key to continue', s
+;
+if NOT(keyword_set(all)) then begin
+ print, 'To go further, you have to run individually the examples'
+ print, 'or to call them via /all keyword'
+ return
+endif
+;
+TITRE2
+READ, 'Please type any key to continue', s
+;
+TITRE3
+READ, 'Please type any key to continue', s
+;
+TITRE4
+READ, 'Please type any key to continue', s
+;
+TITRE5
+READ, 'Please type any key to continue', s
+;
+end
+
gdl-0.9pre6-gcc43.patch:
--- NEW FILE gdl-0.9pre6-gcc43.patch ---
--- gdl-0.9pre6/src/antlr/CharScanner.hpp.gcc43 2007-10-29 17:10:45.000000000 -0600
+++ gdl-0.9pre6/src/antlr/CharScanner.hpp 2008-02-13 10:55:14.000000000 -0700
@@ -10,6 +10,8 @@
#include <antlr/config.hpp>
+#include <cstdlib>
+#include <cstring>
#include <map>
#ifdef HAS_NOT_CCTYPE_H
--- gdl-0.9pre6/src/antlr/Parser.cpp.gcc 2007-10-29 17:10:45.000000000 -0600
+++ gdl-0.9pre6/src/antlr/Parser.cpp 2008-02-13 11:18:20.000000000 -0700
@@ -11,6 +11,7 @@
#include "antlr/TokenBuffer.hpp"
#include "antlr/MismatchedTokenException.hpp"
//#include "antlr/ASTFactory.hpp"
+#include <cstdlib>
#include <iostream>
#ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
--- gdl-0.9pre6/src/antlr/TreeParser.cpp.gcc43 2007-10-29 17:10:45.000000000 -0600
+++ gdl-0.9pre6/src/antlr/TreeParser.cpp 2008-02-13 11:20:28.000000000 -0700
@@ -8,6 +8,7 @@
#include "antlr/TreeParser.hpp"
#include "antlr/ASTNULLType.hpp"
#include "antlr/MismatchedTokenException.hpp"
+#include <cstdlib>
#include <iostream>
#include <stdio.h>
--- gdl-0.9pre6/src/basic_pro.cpp.gcc43 2007-10-29 17:10:47.000000000 -0600
+++ gdl-0.9pre6/src/basic_pro.cpp 2008-02-13 11:30:20.000000000 -0700
@@ -19,6 +19,7 @@
#include <string>
#include <fstream>
+#include <iterator>
#include <memory>
#include <set>
--- gdl-0.9pre6/src/gdlgstream.cpp.gcc43 2007-10-29 17:10:47.000000000 -0600
+++ gdl-0.9pre6/src/gdlgstream.cpp 2008-02-13 11:36:14.000000000 -0700
@@ -25,12 +25,12 @@
using namespace std;
-void PLPlotAbortHandler(char *c)
+void PLPlotAbortHandler(const char *c)
{
cout << "PLPlot abort handler: " << c << endl;
}
-int PLPlotExitHandler(char *c)
+int PLPlotExitHandler(const char *c)
{
cout << "PLPlot exit handler: " << c << endl;
return 0;
gdl-0.9pre6-plplot.patch:
--- NEW FILE gdl-0.9pre6-plplot.patch ---
--- gdl-0.9pre6/src/plot3d_nr.cpp.plplot 2007-10-29 17:10:47.000000000 -0600
+++ gdl-0.9pre6/src/plot3d_nr.cpp 2008-02-27 09:39:56.000000000 -0700
@@ -217,7 +217,7 @@
zmin = (zmax_in > zmin_in) ? zmin_in: zmax_in;
zmax = (zmax_in > zmin_in) ? zmax_in: zmin_in;
- pldtik(zmin, zmax, &tick, &nsub);
+ pldtik(zmin, zmax, &tick, &nsub, FALSE);
tp = tick * floor(zmin / tick) + tick;
pl3upv = 0;
More information about the fedora-extras-commits
mailing list