rpms/plplot/devel plplot-5.8.0-svn.patch, NONE, 1.1 plplot.spec, 1.49, 1.50
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Wed Jan 9 04:34:30 UTC 2008
- Previous message (by thread): rpms/sbcl/EL-5 sbcl-1.0-gcc4_sparc.patch, 1.1, NONE sbcl-1.0.1-bz220053.patch, 1.1, NONE
- Next message (by thread): rpms/sbcl/EL-4 .cvsignore, 1.20, 1.21 sbcl.spec, 1.47, 1.48 sources, 1.22, 1.23 sbcl-1.0-gcc4_sparc.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8235
Modified Files:
plplot.spec
Added Files:
plplot-5.8.0-svn.patch
Log Message:
* Mon Jan 7 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.8.0-7
- Update to latest svn for Tcl 8.5 support
- Don't build against itcl - does not support tcl 8.5
plplot-5.8.0-svn.patch:
--- NEW FILE plplot-5.8.0-svn.patch ---
Only in plplot-5.8.0: aclocal.m4
Only in plplot-5.8.0: autom4te.cache
Only in plplot-5.8.0/bindings/c++: Makefile.am
Only in plplot-5.8.0/bindings/c++: Makefile.in
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/bindings/c++/plstream.cc plplot/bindings/c++/plstream.cc
--- plplot-5.8.0/bindings/c++/plstream.cc 2007-11-18 13:04:01.000000000 -0700
+++ plplot/bindings/c++/plstream.cc 2008-01-08 17:19:01.000000000 -0700
@@ -1,5 +1,5 @@
//----------------------------------*-C++-*----------------------------------//
-// $Id: plstream.cc 7891 2007-09-27 11:32:09Z andrewross $
+// $Id: plstream.cc 8033 2007-11-23 15:28:09Z andrewross $
// Geoffrey Furnish
// Sep 21 1994
//
@@ -934,7 +934,7 @@
/* plot continental outline in world coordinates */
-void plstream::map( void (*mapform)(PLINT, PLFLT *, PLFLT *), char *type,
+void plstream::map( void (*mapform)(PLINT, PLFLT *, PLFLT *), const char *type,
PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat )
{
set_stream();
@@ -1075,7 +1075,7 @@
/* Process options list using current options info. */
-int plstream::parseopts( int *p_argc, char **argv, PLINT mode )
+int plstream::parseopts( int *p_argc, const char **argv, PLINT mode )
{
set_stream();
@@ -1785,13 +1785,13 @@
/* Create 1d stripchart */
-void plstream::stripc(PLINT *id, char *xspec, char *yspec,
+void plstream::stripc(PLINT *id, const char *xspec, const char *yspec,
PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax,
PLFLT xlpos, PLFLT ylpos,
bool y_ascl, bool acc,
PLINT colbox, PLINT collab,
- PLINT colline[], PLINT styline[], char *legline[],
- char *labx, char *laby, char *labtop)
+ PLINT colline[], PLINT styline[], const char *legline[],
+ const char *labx, const char *laby, const char *labtop)
{
set_stream();
@@ -1802,13 +1802,13 @@
// Deprecated version using PLINT not bool
-void plstream::stripc(PLINT *id, char *xspec, char *yspec,
+void plstream::stripc(PLINT *id, const char *xspec, const char *yspec,
PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax,
PLFLT xlpos, PLFLT ylpos,
PLINT y_ascl, PLINT acc,
PLINT colbox, PLINT collab,
- PLINT colline[], PLINT styline[], char *legline[],
- char *labx, char *laby, char *labtop)
+ PLINT colline[], PLINT styline[], const char *legline[],
+ const char *labx, const char *laby, const char *labtop)
{
set_stream();
@@ -2046,7 +2046,7 @@
/* Sets an optional user exit handler. */
-void plstream::sexit( int (*handler) (char *) )
+void plstream::sexit( int (*handler) (const char *) )
{
set_stream();
@@ -2172,7 +2172,7 @@
/* Merge user option table into internal info structure. */
-int plstream::MergeOpts( PLOptionTable *options, char *name, char **notes )
+int plstream::MergeOpts( PLOptionTable *options, const char *name, const char **notes )
{
set_stream();
@@ -2190,7 +2190,7 @@
/* Process input strings, treating them as an option and argument pair. */
-int plstream::SetOpt( char *opt, char *optarg )
+int plstream::SetOpt( const char *opt, const char *optarg )
{
set_stream();
@@ -2199,7 +2199,7 @@
/* Process options list using current options info. */
-int plstream::ParseOpts( int *p_argc, char **argv, PLINT mode )
+int plstream::ParseOpts( int *p_argc, const char **argv, PLINT mode )
{
set_stream();
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/bindings/c++/plstream.h plplot/bindings/c++/plstream.h
--- plplot-5.8.0/bindings/c++/plstream.h 2007-11-18 13:04:01.000000000 -0700
+++ plplot/bindings/c++/plstream.h 2008-01-08 17:19:01.000000000 -0700
@@ -1,5 +1,5 @@
//----------------------------------*-C++-*----------------------------------//
-// $Id: plstream.h 7891 2007-09-27 11:32:09Z andrewross $
+// $Id: plstream.h 8033 2007-11-23 15:28:09Z andrewross $
// Geoffrey Furnish
// Sep 21 1994
//
@@ -399,7 +399,7 @@
/* plot continental outline in world coordinates */
- void map( void (*mapform)(PLINT, PLFLT *, PLFLT *), char *type,
+ void map( void (*mapform)(PLINT, PLFLT *, PLFLT *), const char *type,
PLFLT minlong, PLFLT maxlong, PLFLT minlat, PLFLT maxlat );
/* Plot the latitudes and longitudes on the background. */
@@ -469,7 +469,7 @@
/* Process options list using current options info. */
- int parseopts( int *p_argc, char **argv, PLINT mode );
+ int parseopts( int *p_argc, const char **argv, PLINT mode );
/* Set fill pattern directly. */
@@ -718,13 +718,13 @@
/* Create 1d stripchart */
- void stripc(PLINT *id, char *xspec, char *yspec,
+ void stripc(PLINT *id, const char *xspec, const char *yspec,
PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax,
PLFLT xlpos, PLFLT ylpos,
bool y_ascl, bool acc,
PLINT colbox, PLINT collab,
- PLINT colline[], PLINT styline[], char *legline[],
- char *labx, char *laby, char *labtop);
+ PLINT colline[], PLINT styline[], const char *legline[],
+ const char *labx, const char *laby, const char *labtop);
/* Add a point to a stripchart. */
@@ -833,7 +833,7 @@
/* Sets an optional user exit handler. */
- void sexit( int (*handler) (char *) );
+ void sexit( int (*handler) (const char *) );
/* Transformation routines */
@@ -899,7 +899,7 @@
/* Merge user option table into internal info structure. */
- int MergeOpts( PLOptionTable *options, char *name, char **notes );
+ int MergeOpts( PLOptionTable *options, const char *name, const char **notes );
/* Set the strings used in usage and syntax messages. */
@@ -907,11 +907,11 @@
/* Process input strings, treating them as an option and argument pair. */
- int SetOpt( char *opt, char *optarg );
+ int SetOpt( const char *opt, const char *optarg );
/* Process options list using current options info. */
- int ParseOpts( int *p_argc, char **argv, PLINT mode );
+ int ParseOpts( int *p_argc, const char **argv, PLINT mode );
/* Print usage & syntax message. */
@@ -1044,13 +1044,13 @@
void spause( PLINT pause );
- void stripc(PLINT *id, char *xspec, char *yspec,
+ void stripc(PLINT *id, const char *xspec, const char *yspec,
PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax,
PLFLT xlpos, PLFLT ylpos,
PLINT y_ascl, PLINT acc,
PLINT colbox, PLINT collab,
- PLINT colline[], PLINT styline[], char *legline[],
- char *labx, char *laby, char *labtop);
+ PLINT colline[], PLINT styline[], const char *legline[],
+ const char *labx, const char *laby, const char *labtop);
void xormod(PLINT mode, PLINT *status);
};
Only in plplot-5.8.0/bindings/f77: configurable.f.in
Only in plplot-5.8.0/bindings/f77: Makefile.am
Only in plplot-5.8.0/bindings/f77: Makefile.in
[...60622 lines suppressed...]
+ {"plrgb1", plrgb1Cmd},
+ {"plschr", plschrCmd},
+ {"plscmap0", plscmap0Cmd},
+ {"plscmap0n", plscmap0nCmd},
+ {"plscmap1", plscmap1Cmd},
+ {"plscmap1l", plscmap1lCmd},
+ {"plscmap1n", plscmap1nCmd},
+ {"plscol0", plscol0Cmd},
+ {"plscolbg", plscolbgCmd},
+ {"plscolor", plscolorCmd},
+ {"plsdev", plsdevCmd},
+ {"plsdidev", plsdidevCmd},
+ {"plsdimap", plsdimapCmd},
+ {"plsdiori", plsdioriCmd},
+ {"plsdiplt", plsdipltCmd},
+ {"plsdiplz", plsdiplzCmd},
+ {"plsesc", plsescCmd},
+ {"plsfam", plsfamCmd},
+ {"plsfnam", plsfnamCmd},
+ {"plsmaj", plsmajCmd},
+ {"plsmin", plsminCmd},
+ {"plsori", plsoriCmd},
+ {"plspage", plspageCmd},
+ {"plspause", plspauseCmd},
+ {"plsstrm", plsstrmCmd},
+ {"plssub", plssubCmd},
+ {"plssym", plssymCmd},
+ {"plstyl", plstylCmd},
+ {"plsvpa", plsvpaCmd},
+ {"plsxax", plsxaxCmd},
+ {"plsyax", plsyaxCmd},
+ {"plsym", plsymCmd},
+ {"plszax", plszaxCmd},
+ {"pltext", pltextCmd},
+ {"plvasp", plvaspCmd},
+ {"plvpas", plvpasCmd},
+ {"plvpor", plvporCmd},
+ {"plvsta", plvstaCmd},
+ {"plw3d", plw3dCmd},
+ {"plwid", plwidCmd},
+ {"plwind", plwindCmd},
+ {"plxormod", plxormodCmd},
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/sys/win-tk/tclIndex plplot/sys/win-tk/tclIndex
--- plplot-5.8.0/sys/win-tk/tclIndex 1969-12-31 17:00:00.000000000 -0700
+++ plplot/sys/win-tk/tclIndex 2007-06-29 16:19:02.000000000 -0600
@@ -0,0 +1,42 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands. Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(plgrid) [list source [file join $dir plgrid.tcl]]
+set auto_index(plot) [list source [file join $dir plot.tcl]]
+set auto_index(x01) [list source [file join $dir x01.tcl]]
+set auto_index(plot1) [list source [file join $dir x01.tcl]]
+set auto_index(plot2) [list source [file join $dir x01.tcl]]
+set auto_index(plot3) [list source [file join $dir x01.tcl]]
+set auto_index(x02) [list source [file join $dir x02.tcl]]
+set auto_index(x03) [list source [file join $dir x03.tcl]]
+set auto_index(x04) [list source [file join $dir x04.tcl]]
+set auto_index(plot41) [list source [file join $dir x04.tcl]]
+set auto_index(x05) [list source [file join $dir x05.tcl]]
+set auto_index(x06) [list source [file join $dir x06.tcl]]
+set auto_index(x07) [list source [file join $dir x07.tcl]]
+set auto_index(restore_cmap1) [list source [file join $dir x08.tcl]]
+set auto_index(cmap1_init) [list source [file join $dir x08.tcl]]
+set auto_index(x08) [list source [file join $dir x08.tcl]]
+set auto_index(x09) [list source [file join $dir x09.tcl]]
+set auto_index(x09_polar) [list source [file join $dir x09.tcl]]
+set auto_index(x09_potential) [list source [file join $dir x09.tcl]]
+set auto_index(x10) [list source [file join $dir x10.tcl]]
+set auto_index(x11) [list source [file join $dir x11.tcl]]
+set auto_index(x12) [list source [file join $dir x12.tcl]]
+set auto_index(plfbox) [list source [file join $dir x12.tcl]]
+set auto_index(x13) [list source [file join $dir x13.tcl]]
+set auto_index(x14) [list source [file join $dir x14.tcl]]
+set auto_index(x15) [list source [file join $dir x15.tcl]]
+set auto_index(cmap1_init152) [list source [file join $dir x15.tcl]]
+set auto_index(plot151) [list source [file join $dir x15.tcl]]
+set auto_index(plot152) [list source [file join $dir x15.tcl]]
+set auto_index(x16) [list source [file join $dir x16.tcl]]
+set auto_index(x17) [list source [file join $dir x17.tcl]]
+set auto_index(x18) [list source [file join $dir x18.tcl]]
+set auto_index(test_poly) [list source [file join $dir x18.tcl]]
+set auto_index(x19) [list source [file join $dir x19.tcl]]
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/sys/win-tk/testPlplot.tcl plplot/sys/win-tk/testPlplot.tcl
--- plplot-5.8.0/sys/win-tk/testPlplot.tcl 1969-12-31 17:00:00.000000000 -0700
+++ plplot/sys/win-tk/testPlplot.tcl 2007-06-29 16:19:02.000000000 -0600
@@ -0,0 +1,50 @@
+puts stdout "Creating plplot directory" ; update
+catch {
+ console show
+ wm withdraw .
+ update
+}
+set vers "5.2.1"
+cd [file dirname [info script]]
+catch {file delete plplotter.kit}
+file delete -force plplotter.vfs
+file mkdir plplotter.vfs
+file mkdir plplotter.vfs/lib
+file mkdir plplotter.vfs/lib/plplotter${vers}
+file mkdir plplotter.vfs/examples
+file mkdir plplotter.vfs/examples/tcl
+file mkdir plplotter.vfs/examples/tk
+foreach pat {*.tcl tclIndex *.dat *.log} {
+ foreach f [glob -dir ../../examples/tcl $pat] {
+ file copy $f plplotter.vfs/examples/tcl
+ }
+}
+foreach f [glob -dir ../../examples/tk *.tcl] {
+ file copy $f plplotter.vfs/examples/tk
+}
+foreach f [glob -dir ../../data *.{map,fnt}] {
+ file copy $f plplotter.vfs/lib/plplotter${vers}
+}
+foreach f [glob -dir ../../bindings/tk pl{color,plot,defaults,tools,widget}.tcl] {
+ file copy $f plplotter.vfs/lib/plplotter${vers}
+}
+foreach f [glob -dir ../../bindings/tk-x-plat *.tcl] {
+ file copy $f plplotter.vfs/lib/plplotter${vers}
+}
+file copy pkgIndex.tcl plplotter.vfs/lib/plplotter${vers}
+file copy tclIndex plplotter.vfs/lib/plplotter${vers}
+foreach f [glob *.dll] {
+ file copy $f plplotter.vfs/lib/plplotter${vers}
+}
+
+# Make our 'main.tcl'
+set fout [open plplotter.vfs/main.tcl w]
+puts $fout "set dir \[file normalize \[file dirname \[info script\]\]\]"
+puts $fout "lappend auto_path \[file join \$dir lib\]"
+puts $fout "source \[file join \$dir examples tk runAllDemos.tcl\]"
+close $fout
+exec wish85g plplotter.vfs/main.tcl &
+puts "Done"
+exit
+
+
Only in plplot-5.8.0/test: Makefile.am
Only in plplot-5.8.0/test: Makefile.in
Only in plplot-5.8.0/test: plplot-test.sh.in
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/test/test_c.sh.in plplot/test/test_c.sh.in
--- plplot-5.8.0/test/test_c.sh.in 2007-11-18 13:04:07.000000000 -0700
+++ plplot/test/test_c.sh.in 2008-01-08 17:19:02.000000000 -0700
@@ -30,7 +30,7 @@
# skip 14 because it requires two output files.
# skip 17 because it is interactive.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \
- 21 22 23 24 25 26 27 28; do
+ 21 22 23 24 25 26 27 28 29 30; do
$cdir/x${index}c -dev $device -o ${OUTPUT_DIR}/x${index}c.$dsuffix \
$options 2> test.error
# Look for any status codes (segfaults, plexit) from the examples themselves.
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/test/test_octave.sh.in plplot/test/test_octave.sh.in
--- plplot-5.8.0/test/test_octave.sh.in 2007-11-18 13:04:07.000000000 -0700
+++ plplot/test/test_octave.sh.in 2008-01-08 17:19:02.000000000 -0700
@@ -32,6 +32,13 @@
# Launch an Octave script that exercises all the demos
$octave -f -q -p $octavedir <<EOF 2> test.error
+
+# Suppress spurious warnings with octave 2.9
+ver = str2num(split(version,"."));
+if ((ver(1) == 2 && ver(2) == 9) || (ver(1) >= 3))
+ warning("off","Octave:built-in-variable-assignment");
+endif
+
plplot_stub;
t = split("$options", "-"); t(1,:)="";
for i=1:rows(t)
Only in plplot-5.8.0: TODO.AM-LT
Only in plplot-5.8.0/utils: Makefile.am
Only in plplot-5.8.0/utils: Makefile.in
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/www/announce/.cvsignore plplot/www/announce/.cvsignore
--- plplot-5.8.0/www/announce/.cvsignore 1969-12-31 17:00:00.000000000 -0700
+++ plplot/www/announce/.cvsignore 2007-06-29 16:17:27.000000000 -0600
@@ -0,0 +1 @@
+*.txt *.pdf *.xhtml
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/www/examples/.cvsignore plplot/www/examples/.cvsignore
--- plplot-5.8.0/www/examples/.cvsignore 1969-12-31 17:00:00.000000000 -0700
+++ plplot/www/examples/.cvsignore 2007-06-29 16:17:27.000000000 -0600
@@ -0,0 +1,2 @@
+index.html
+demo*.php
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.8.0/www/index.html plplot/www/index.html
--- plplot-5.8.0/www/index.html 2007-11-18 13:03:58.000000000 -0700
+++ plplot/www/index.html 2007-11-20 15:44:00.000000000 -0700
@@ -114,7 +114,7 @@
<br>
<ul>
-<li><A HREF="http://sourceforge.net/project/shownotes.php?release_id=548604">Stable</A></li>
+<li><A HREF="http://sourceforge.net/project/shownotes.php?release_id=555104">Stable</A></li>
</ul>
</td>
</tr>
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- plplot.spec 4 Jan 2008 05:08:18 -0000 1.49
+++ plplot.spec 9 Jan 2008 04:33:53 -0000 1.50
@@ -5,13 +5,14 @@
Name: plplot
Version: 5.8.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
License: LGPLv2+
URL: http://plplot.sourceforge.net/
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
+Patch0: plplot-5.8.0-svn.patch
Patch1: plplot-5.8.0-multiarch.patch
Patch2: plplot-5.7.4-info.patch
Patch6: plplot-5.7.3-jni.patch
@@ -35,7 +36,9 @@
%endif
BuildRequires: java-devel, libgcj-devel
BuildRequires: freetype-devel, qhull-devel , ncurses-devel
-BuildRequires: gd-devel, tcl-devel, tk-devel, itcl-devel, itk-devel
+BuildRequires: gd-devel, tcl-devel, tk-devel
+# itcl is not compatible with tcl 8.5
+#BuildRequires: itcl-devel, itk-devel
BuildRequires: python-devel, pygtk2-devel, numpy
BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
BuildRequires: perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
@@ -200,6 +203,7 @@
%prep
%setup -q
+%patch0 -p1 -b .svn
%patch1 -p1 -b .multiarch
%patch2 -p1 -b .orig
%patch6 -p1 -b .jni
@@ -218,6 +222,7 @@
%{build_octave} \
-DENABLE_pdl:BOOL=ON \
-DHAVE_PTHREAD:BOOL=ON \
+ -DHAVE_TCL_GT_84=ON \
-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
-DPLD_aqt:BOOL=ON \
-DPLD_conex:BOOL=ON \
@@ -265,7 +270,7 @@
%check
cd fedora
#Hack
-export ITCL_LIBRARY=%{_libdir}/itcl3.3
+#export ITCL_LIBRARY=%{_libdir}/itcl3.3
# Exclude psttfc test for now
ctest -V -E psttfc
@@ -485,6 +490,10 @@
%changelog
+* Mon Jan 7 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.8.0-7
+- Update to latest svn for Tcl 8.5 support
+- Don't build against itcl - does not support tcl 8.5
+
* Thu Jan 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.8.0-6
- Rebuild for new Tcl 8.5
- Previous message (by thread): rpms/sbcl/EL-5 sbcl-1.0-gcc4_sparc.patch, 1.1, NONE sbcl-1.0.1-bz220053.patch, 1.1, NONE
- Next message (by thread): rpms/sbcl/EL-4 .cvsignore, 1.20, 1.21 sbcl.spec, 1.47, 1.48 sources, 1.22, 1.23 sbcl-1.0-gcc4_sparc.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list