rpms/plplot/devel plplot-5.7.4-svn.patch, NONE, 1.1 plplot.spec, 1.39, 1.40 plplot-5.7.4-octave.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Fri Nov 9 17:01:29 UTC 2007
- Previous message (by thread): rpms/ldns/devel ldns_1.2.1_origin.patch, NONE, 1.1 ldns.spec, 1.25, 1.26
- Next message (by thread): rpms/sugar-datastore/OLPC-2 .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 sugar-datastore.spec, 1.40, 1.41
- 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-serv15018
Modified Files:
plplot.spec
Added Files:
plplot-5.7.4-svn.patch
Removed Files:
plplot-5.7.4-octave.patch
Log Message:
* Fri Nov 9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
- Update to latest svn
- Rebuild for new octave api
plplot-5.7.4-svn.patch:
--- NEW FILE plplot-5.7.4-svn.patch ---
Only in plplot-5.7.4: aclocal.m4
Only in plplot-5.7.4: autom4te.cache
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/bindings/ada/CMakeLists.txt plplot/bindings/ada/CMakeLists.txt
--- plplot-5.7.4/bindings/ada/CMakeLists.txt 2007-08-13 18:37:13.000000000 -0600
+++ plplot/bindings/ada/CMakeLists.txt 2007-10-16 17:12:46.000000000 -0600
@@ -20,17 +20,29 @@
if(ENABLE_ada)
- set(plplotada${LIB_TAG}_LIB_SRCS
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot.adb
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot.ads
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_thin.adb
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_thin.ads
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_traditional.adb
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_traditional.ads
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_auxiliary.adb
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_auxiliary.ads
+ set(SOURCE_LIST
+ plplot.adb
+ plplot.ads
+ plplot_thin.adb
+ plplot_thin.ads
+ plplot_traditional.adb
+ plplot_traditional.ads
+ plplot_auxiliary.adb
+ plplot_auxiliary.ads
)
+ set(plplotada${LIB_TAG}_LIB_SRCS)
+ foreach(SOURCE_FILE ${SOURCE_LIST})
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE}.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_FILE}
+ )
+ set(plplotada${LIB_TAG}_LIB_SRCS
+ ${plplotada${LIB_TAG}_LIB_SRCS}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_FILE}
+ )
+ endforeach(SOURCE_FILE ${SOURCE_LIST})
+
add_library(plplotada${LIB_TAG} ${plplotada${LIB_TAG}_LIB_SRCS})
target_link_libraries(plplotada${LIB_TAG}
Only in plplot-5.7.4/bindings/ada: plplot.adb
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/bindings/ada/plplot.adb.cmake plplot/bindings/ada/plplot.adb.cmake
--- plplot-5.7.4/bindings/ada/plplot.adb.cmake 1969-12-31 17:00:00.000000000 -0700
+++ plplot/bindings/ada/plplot.adb.cmake 2007-10-16 17:12:46.000000000 -0600
@@ -0,0 +1,2990 @@
+-- $Id: plplot.adb.cmake 7929 2007-10-14 15:42:29Z airwin $
+
+-- Thick Ada binding to PLplot
+
+-- Copyright (C) 2006-2007 Jerry Bauck
+
+-- This file is part of PLplot.
+
+-- PLplot is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Library Public License as published
+-- by the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+
+-- PLplot 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 Library General Public License for more details.
+
+-- You should have received a copy of the GNU Library General Public License
+-- along with PLplot; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+with
+ PLplot_Thin,
+ PLplot_Auxiliary,
+ Ada.Text_IO,
+ Ada.Numerics.Long_Elementary_Functions,
+ Ada.Strings.Unbounded,
+ Ada.Unchecked_Conversion,
+ Ada.Strings.Maps,
+ Ada.Command_Line,
+ System,
+ System.Address_To_Access_Conversions,
+ Interfaces.C.Pointers,
+ Interfaces.C;
+use
+ PLplot_Thin,
+ PLplot_Auxiliary,
+ Ada.Text_IO,
+ Ada.Numerics.Long_Elementary_Functions,
+ Ada.Strings.Unbounded,
+ Interfaces.C;
+
+-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
+-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
+--with Ada.Numerics.Long_Real_Arrays; use Ada.Numerics.Long_Real_Arrays;
+ at Ada_Is_2007_With_and_Use_Numerics@
+
+package body PLplot is
+
+--------------------------------------------------------------------------------
+-- High-Level subroutines for thick binding --
+--------------------------------------------------------------------------------
+
+ -- When asked to draw white lines on black background, do it.
+ -- This is the default.
+ procedure Draw_White_On_Black is
+ begin
+ Set_One_Color_Map_0(Black, 0, 0 , 0);
+ Set_One_Color_Map_0(White, 255, 255, 255);
+ end Draw_White_On_Black;
+
+
+ -- When asked to draw black lines on white background, reverse black and white.
+ -- This might look better on anti-aliased displays.
+ -- fix this Darken some colors which have low contrast on white background, e.g. Yellow.
+ -- fix this Make a version that draws on white and converts _all_ colors to black for publications.
+ procedure Draw_Black_On_White is
+ begin
+ Set_One_Color_Map_0(Black, 255, 255, 255);
+ Set_One_Color_Map_0(White, 0, 0, 0);
+ end Draw_Black_On_White;
+
+
+ -- Set default pen width. Docs don't say, so I'll make it 1.
+ -- I could make this depend on the type of outut device used.
+ Default_Pen_Width : constant Integer := 1;
+ procedure Set_Default_Pen_Width is
+ begin
+ Set_Pen_Width(Default_Pen_Width);
+ end Set_Default_Pen_Width;
+
+
+ -- Plotter for up to five x-y pairs and settable axis style, plot
+ -- line colors, widths, and styles, justification, zoom, and labels.
+ -- Can be used directly or as part of a "simple" plotter
+ -- such as those that follow or which are made by the user.
+ procedure Multiplot_Pairs
+ (x1 : Real_Vector := Dont_Plot_This;
+ y1 : Real_Vector := Dont_Plot_This;
+ x2 : Real_Vector := Dont_Plot_This;
+ y2 : Real_Vector := Dont_Plot_This;
+ x3 : Real_Vector := Dont_Plot_This;
+ y3 : Real_Vector := Dont_Plot_This;
+ x4 : Real_Vector := Dont_Plot_This;
+ y4 : Real_Vector := Dont_Plot_This;
+ x5 : Real_Vector := Dont_Plot_This;
+ y5 : Real_Vector := Dont_Plot_This;
+ X_Labels : Label_String_Array_Type := Default_Label_String_Array;
+ Y_Labels : Label_String_Array_Type := Default_Label_String_Array;
+ Title_Labels : Label_String_Array_Type := Default_Label_String_Array;
+ Axis_Style : Axis_Style_Type := Linear_Box_Plus;
+ Colors : Color_Array_Type := Default_Color_Array;
+ Line_Widths : Line_Width_Array_Type := Default_Line_Width_Array;
+ Line_Styles : Line_Style_Array_Type := Default_Line_Style_Array;
+ Justification : Justification_Type := Not_Justified;
+ x_Min_Zoom : Long_Float := Long_Float'small;
+ x_Max_Zoom : Long_Float := Long_Float'large;
+ y_Min_Zoom : Long_Float := Long_Float'small;
+ y_Max_Zoom : Long_Float := Long_Float'large) is
+
+ x_Min, y_Min : Long_Float := Long_Float'large;
+ x_Max, y_Max : Long_Float := Long_Float'small;
+
+ begin
+ -- Set or find x_Min.
+ if x_Min_Zoom /= Long_Float'small then -- zoom
+ x_Min := x_Min_Zoom;
+ else -- Auto-scale x_Min.
+ if x1'length /= 1 then
+ x_Min := Long_Float'min(x_Min, Vector_Min(x1));
+ end if;
+ if x2'length /= 1 then
+ x_Min := Long_Float'min(x_Min, Vector_Min(x2));
+ end if;
+ if x3'length /= 1 then
+ x_Min := Long_Float'min(x_Min, Vector_Min(x3));
+ end if;
+ if x4'length /= 1 then
+ x_Min := Long_Float'min(x_Min, Vector_Min(x4));
+ end if;
+ if x5'length /= 1 then
+ x_Min := Long_Float'min(x_Min, Vector_Min(x5));
+ end if;
+ end if; -- Set or find x_Min.
+
+ -- Set or find x_Max.
+ if x_Max_Zoom /= Long_Float'large then -- zoom
+ x_Max := x_Max_Zoom;
+ else -- Auto-scale x_Max.
+ if x1'length /= 1 then
+ x_Max := Long_Float'max(x_Max, Vector_Max(x1));
+ end if;
+ if x2'length /= 1 then
+ x_Max := Long_Float'max(x_Max, Vector_Max(x2));
+ end if;
+ if x3'length /= 1 then
+ x_Max := Long_Float'max(x_Max, Vector_Max(x3));
+ end if;
+ if x4'length /= 1 then
[...49994 lines suppressed...]
- ./x${index} -dev $device -o $results/x${index}t.$dsuffix $options
+ ./x${index} -dev $device -o $results/x${index}t.$dsuffix $options 2> test.error
status_code=$?
+ cat test.error
if [ "$status_code" -ne 0 ]; then
exit $status_code
fi
+ # Look for any PLPLOT ERROR messages from plwarn that do not result in an
+ # exit code.
+ is_error=`grep -l 'PLPLOT ERROR' test.error`
+ if test -n "$is_error"; then
+ exit 1
+ fi
done
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/utils/CMakeLists.txt plplot/utils/CMakeLists.txt
--- plplot-5.7.4/utils/CMakeLists.txt 2007-08-13 18:37:16.000000000 -0600
+++ plplot/utils/CMakeLists.txt 2007-09-21 13:51:19.000000000 -0600
@@ -25,23 +25,30 @@
${CMAKE_BINARY_DIR}/include
)
-add_executable(plrender plrender.c)
+if(USE_RPATH)
+ get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+endif(USE_RPATH)
-if(WIN32 AND BUILD_SHARED_LIBS)
- SET_SOURCE_FILES_PROPERTIES(plrender.c
- PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
-endif(WIN32 AND BUILD_SHARED_LIBS)
+if(PLD_plmeta)
+ add_executable(plrender plrender.c)
+
+ if(WIN32 AND BUILD_SHARED_LIBS)
+ SET_SOURCE_FILES_PROPERTIES(plrender.c
+ PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
+ )
+ endif(WIN32 AND BUILD_SHARED_LIBS)
-target_link_libraries(plrender plplot${LIB_TAG})
+ target_link_libraries(plrender plplot${LIB_TAG})
-if(USE_RPATH)
- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
- set_target_properties(plrender
- PROPERTIES
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- )
-endif(USE_RPATH)
-install(TARGETS plrender DESTINATION ${BIN_DIR})
+ if(USE_RPATH)
+ set_target_properties(plrender
+ PROPERTIES
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ )
+ endif(USE_RPATH)
+
+ install(TARGETS plrender DESTINATION ${BIN_DIR})
+endif(PLD_plmeta)
add_executable(pltek pltek.c)
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/www/announce/.cvsignore plplot/www/announce/.cvsignore
--- plplot-5.7.4/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.7.4/www/examples/.cvsignore plplot/www/examples/.cvsignore
--- plplot-5.7.4/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.7.4/www/examples/example_page.php plplot/www/examples/example_page.php
--- plplot-5.7.4/www/examples/example_page.php 2007-08-13 18:37:11.000000000 -0600
+++ plplot/www/examples/example_page.php 2007-10-16 17:12:43.000000000 -0600
@@ -6,7 +6,7 @@
$demo_str = sprintf ("%02d", $demo);
$demo_dir = "../examples-data/demo$demo_str";
- $demos = array_merge (range (1, 13), array (15, 16), range (18, 25));
+ $demos = array_merge (range (1, 13), array (15, 16), range (18, 28));
print <<<END
<div ALIGN="CENTER"><b>Select to see the example $demo source code</b></div>
@@ -17,6 +17,8 @@
<input TYPE="submit" NAME="lbind" VALUE="C">
<input TYPE="submit" NAME="lbind" VALUE="C++">
<input TYPE="submit" NAME="lbind" VALUE="F77">
+<input TYPE="submit" NAME="lbind" VALUE="F95">
+<input TYPE="submit" NAME="lbind" VALUE="Ada">
<input TYPE="submit" NAME="lbind" VALUE="Tcl">
<input TYPE="submit" NAME="lbind" VALUE="Java">
<input TYPE="submit" NAME="lbind" VALUE="Python">
@@ -38,6 +40,12 @@
case ("F77"):
$fname = "x" . $demo_str . "f.f-";
break;
+ case ("F95"):
+ $fname = "x" . $demo_str . "f.f90-";
+ break;
+ case ("Ada"):
+ $fname = "x" . $demo_str . "a.adb-";
+ break;
case ("Tcl"):
$fname = "x" . $demo_str . ".tcl-";
break;
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/www/examples/index.html.in plplot/www/examples/index.html.in
--- plplot-5.7.4/www/examples/index.html.in 2007-08-13 18:37:11.000000000 -0600
+++ plplot/www/examples/index.html.in 2007-11-05 10:06:55.000000000 -0700
@@ -134,7 +134,7 @@
<div ALIGN="CENTER">
-<b>These examples reflect the status of PLplot-5.7.3</b><br><br>
+<b>These examples were generated with the pngcairo device and reflect the status of PLplot-5.8.0</b><br><br>
<b>Select to view full-size image and source code</b><br>
</div>
@@ -146,7 +146,7 @@
<:
# Each element of the structure below contains:
#
-# [ demo#, number of pages, thumbnail, credits]
+# [ demo#, number of pages, particular thumbnail for top-level page, credits]
#
@demos = (
[ 1, 1, 1, ""],
@@ -171,30 +171,16 @@
[22, 4, 3, ""],
[23, 11, 1, ""],
[24, 1, 1, "
-<p>This png image was created with device psttfc and converted from
-postscript to png with the ImageMagick \\\"convert\\\" command.
-Our new psttf and psttfc devices generate postscript output using
-<a href=\\\"http://www.unifont.org/lasi/\\\">libLASi</a> to handle TrueType
-fonts. libLASI in turn
-uses libpango to render the text. Thus, because of libpango, all complex
-text layout (CTL) languages should be rendered correctly by default with
-these devices. </p>
-<p>Warning: Although our gd-related devices (png, jpeg, and gif) work well
-for the other examples, they currently have the limitation of using simple
-left-to-right rendering of TrueType fonts without the aid of libpango. Thus,
-for these devices the CTL languages such as Arabic, Hebrew, and Hindi will
-be rendered in the wrong order for example 24. A current workaround for
-gd-related devices is to reorder the UTF8 strings into non-standard order
-but this workaround will not help for CTL languages where vertical
-positioning is important. We plan to convert the gd-related devices to use
-libpango to deal permanently with this CTL-related issue.</p>
<p>Credits:
<ul>
<li><a href=\\\"http://www.columbia.edu/~fdc/pace/\\\">Say Peace in all languages!</a>
<li><a href=\\\"http://www.columbia.edu/~fdc/pace/flag.html\\\">Pace flag</a>
</ul>
"],
- [25, 1, 1, ""]);
+ [25, 4, 1, ""],
+ [26, 2, 1, ""],
+ [27, 10, 1, ""],
+ [28, 5, 1, ""]);
$count = 0;
@@ -248,4 +234,3 @@
</body>
</html>
-
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/www/index.html plplot/www/index.html
--- plplot-5.7.4/www/index.html 2007-08-13 18:37:11.000000000 -0600
+++ plplot/www/index.html 2007-11-05 10:06:55.000000000 -0700
@@ -114,8 +114,7 @@
<br>
<ul>
-<li><A HREF="http://sourceforge.net/project/shownotes.php?release_id=496421">Development</A></li>
-<li><A HREF="http://sourceforge.net/project/shownotes.php?release_id=420949">Stable</A></li>
+<li><A HREF="http://sourceforge.net/project/shownotes.php?release_id=548604">Stable</A></li>
</ul>
</td>
</tr>
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.4/www/source/index.html plplot/www/source/index.html
--- plplot-5.7.4/www/source/index.html 2007-08-13 18:37:10.000000000 -0600
+++ plplot/www/source/index.html 2007-09-21 13:51:17.000000000 -0600
@@ -131,11 +131,11 @@
You can obtain the latest stable version of PLplot from our
<A HREF="http://sourceforge.net/project/showfiles.php?group_id=2915">file
release site</A>. Alternatively, you can obtain the cutting-edge version of
-PLplot (but with no promises about stability) from CVS HEAD via anonymous
+PLplot (but with no promises about stability) from SVN via anonymous
access to our
-<A HREF="http://sourceforge.net/cvs/?group_id=2915">
-CVS repository</A>. Finally, you can browse our CVS repository
-<A HREF="http://plplot.cvs.sourceforge.net/plplot/plplot/">
+<A HREF="http://sourceforge.net/svn/?group_id=2915">
+SVN repository</A>. Finally, you can browse our SVN repository
+<A HREF="http://plplot.svn.sourceforge.net/viewvc/plplot/">
here</A>.
</td>
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- plplot.spec 17 Oct 2007 03:36:23 -0000 1.39
+++ plplot.spec 9 Nov 2007 17:00:53 -0000 1.40
@@ -5,14 +5,14 @@
Name: plplot
Version: 5.7.4
-Release: 4%{?dist}
+Release: 5%{?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
-Patch1: plplot-5.7.4-octave.patch
+Patch0: plplot-5.7.4-svn.patch
Patch2: plplot-5.7.4-info.patch
Patch5: plplot-5.7.2-multilib.patch
Patch6: plplot-5.7.3-jni.patch
@@ -201,7 +201,7 @@
%prep
%setup -q
-%patch1 -p1 -b .octave -E
+%patch0 -p1 -b .svn
%patch2 -p1 -b .orig
%patch5 -p1 -b .multilib
%patch6 -p1 -b .jni
@@ -486,6 +486,10 @@
%{_libdir}/pkgconfig/plplotd-wxwidgets.pc
%changelog
+* Fri Nov 9 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-5
+- Update to latest svn
+- Rebuild for new octave api
+
* Tue Oct 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-4
- Add patch from svn to fix octave bindings for octave 2.9.15, drop
old version
--- plplot-5.7.4-octave.patch DELETED ---
- Previous message (by thread): rpms/ldns/devel ldns_1.2.1_origin.patch, NONE, 1.1 ldns.spec, 1.25, 1.26
- Next message (by thread): rpms/sugar-datastore/OLPC-2 .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 sugar-datastore.spec, 1.40, 1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list