rpms/plplot/devel plplot-5.7.3-svn.patch, NONE, 1.1 plplot.spec, 1.33, 1.34
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Jul 12 19:55:01 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1297
Modified Files:
plplot.spec
Added Files:
plplot-5.7.3-svn.patch
Log Message:
Add svn patch to fix ada bindings on x86_64 and other issues
plplot-5.7.3-svn.patch:
--- NEW FILE plplot-5.7.3-svn.patch ---
Only in plplot-5.7.3: aclocal.m4
Only in plplot-5.7.3: autom4te.cache
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/ada/CMakeLists.txt plplot/bindings/ada/CMakeLists.txt
--- plplot-5.7.3/bindings/ada/CMakeLists.txt 2007-03-25 18:41:51.000000000 -0600
+++ plplot/bindings/ada/CMakeLists.txt 2007-07-12 13:49:01.000000000 -0600
@@ -23,8 +23,12 @@
set(plplotada${LIB_TAG}_LIB_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/plplot.adb
${CMAKE_CURRENT_SOURCE_DIR}/plplot.ads
- ${CMAKE_CURRENT_SOURCE_DIR}/plplotthin.adb
- ${CMAKE_CURRENT_SOURCE_DIR}/plplotthin.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
)
add_library(plplotada${LIB_TAG} ${plplotada${LIB_TAG}_LIB_SRCS})
@@ -33,14 +37,23 @@
plplot${LIB_TAG} ${GNAT_LIB}
)
- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
- set_target_properties(plplotada${LIB_TAG}
- PROPERTIES
- SOVERSION ${plplotada_SOVERSION}
- VERSION ${plplotada_VERSION}
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
+ if(USE_RPATH)
+ get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+ set_target_properties(plplotada${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${plplotada_SOVERSION}
+ VERSION ${plplotada_VERSION}
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+ else(USE_RPATH)
+ set_target_properties(plplotada${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${plplotada_SOVERSION}
+ VERSION ${plplotada_VERSION}
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+ endif(USE_RPATH)
# The commands below have been tested to work fine for the shared libraries,
# but comment this out until we can decide on an install location for
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/ada/plplot.adb plplot/bindings/ada/plplot.adb
--- plplot-5.7.3/bindings/ada/plplot.adb 2007-03-25 18:41:51.000000000 -0600
+++ plplot/bindings/ada/plplot.adb 2007-07-12 13:49:01.000000000 -0600
@@ -1,5 +1,6 @@
with
- PLplotThin,
+ PLplot_Thin,
+ PLplot_Auxiliary,
Ada.Text_IO,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings.Unbounded,
@@ -11,7 +12,8 @@
Interfaces.C.Pointers,
Interfaces.C;
use
- PLplotThin,
+ PLplot_Thin,
+ PLplot_Auxiliary,
Ada.Text_IO,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings.Unbounded,
@@ -27,20 +29,12 @@
-- High-Level subroutines for thick binding --
--------------------------------------------------------------------------------
- -- Initialization. Must be called before starting to plot.
- -- Certain other procedures, if used, must be called first.
- procedure Initialize_Plotter is
- begin
- Initialize_PLplot;
- end Initialize_Plotter;
-
-
-- When asked to draw white lines on black background, do it.
-- This is the default.
procedure Draw_White_On_Black is
begin
- Set_Color_Map_0(Black, 0, 0 , 0);
- Set_Color_Map_0(White, 255, 255, 255);
+ Set_One_Color_Map_0(Black, 0, 0 , 0);
+ Set_One_Color_Map_0(White, 255, 255, 255);
end Draw_White_On_Black;
@@ -50,8 +44,8 @@
-- 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_Color_Map_0(Black, 255, 255, 255);
- Set_Color_Map_0(White, 0, 0, 0);
+ Set_One_Color_Map_0(Black, 255, 255, 255);
+ Set_One_Color_Map_0(White, 0, 0, 0);
end Draw_Black_On_White;
@@ -182,51 +176,51 @@
-- Set environment and its color.
- Set_Color(White);
+ Set_Pen_Color(White);
-- Set_Environment_Clear_Subpage(x_Min, x_Max, y_Min, y_Max, Justification, Axis_Style);
Set_Environment(x_Min, x_Max, y_Min, y_Max, Justification, Axis_Style);
if x1'length /= 1 and y1'length /= 1 then
- Write_Labels(X_Labels(1), Y_Labels(1), Title_Labels(1));
- Set_Color(Colors(1));
+ Write_Labels(To_String(X_Labels(1)), To_String(Y_Labels(1)), To_String(Title_Labels(1)));
+ Set_Pen_Color(Colors(1));
--Set_Pen_Width(Line_Widths(1));
Select_Line_Style(Line_Styles(1));
Draw_Curve(x1, y1);
end if;
if x2'length /= 1 and y2'length /= 1 then
- Write_Labels(X_Labels(2), Y_Labels(2), Title_Labels(2));
- Set_Color(Colors(2));
+ Write_Labels(To_String(X_Labels(2)), To_String(Y_Labels(2)), To_String(Title_Labels(2)));
+ Set_Pen_Color(Colors(2));
--Set_Pen_Width(Line_Widths(2));
Select_Line_Style(Line_Styles(2));
Draw_Curve(x2, y2);
end if;
if x3'length /= 1 and y3'length /= 1 then
- Write_Labels(X_Labels(3), Y_Labels(3), Title_Labels(3));
- Set_Color(Colors(3));
+ Write_Labels(To_String(X_Labels(3)), To_String(Y_Labels(3)), To_String(Title_Labels(3)));
+ Set_Pen_Color(Colors(3));
--Set_Pen_Width(Line_Widths(3));
Select_Line_Style(Line_Styles(3));
Draw_Curve(x3, y3);
end if;
if x4'length /= 1 and y4'length /= 1 then
- Write_Labels(X_Labels(4), Y_Labels(4), Title_Labels(4));
- Set_Color(Colors(4));
+ Write_Labels(To_String(X_Labels(4)), To_String(Y_Labels(4)), To_String(Title_Labels(4)));
+ Set_Pen_Color(Colors(4));
--Set_Pen_Width(Line_Widths(4));
Select_Line_Style(Line_Styles(4));
Draw_Curve(x4, y4);
end if;
if x5'length /= 1 and y5'length /= 1 then
- Write_Labels(X_Labels(5), Y_Labels(5), Title_Labels(5));
- Set_Color(Colors(5));
+ Write_Labels(To_String(X_Labels(5)), To_String(Y_Labels(5)), To_String(Title_Labels(5)));
+ Set_Pen_Color(Colors(5));
--Set_Pen_Width(Line_Widths(5));
Select_Line_Style(Line_Styles(5));
Draw_Curve(x5, y5);
end if;
- Set_Color(White);
+ Set_Pen_Color(White);
Set_Default_Pen_Width;
Select_Line_Style(1); --solid
end Multiplot_Pairs;
@@ -243,18 +237,18 @@
y3 : Real_Vector := Dont_Plot_This;
y4 : Real_Vector := Dont_Plot_This;
y5 : Real_Vector := Dont_Plot_This;
- X_Label : Unbounded_String := Default_Label_String;
- Y_Label : Unbounded_String := Default_Label_String;
- Title_Label : Unbounded_String := Default_Label_String) is
+ X_Label : String := To_String(Default_Label_String);
+ Y_Label : String := To_String(Default_Label_String);
+ Title_Label : String := To_String(Default_Label_String)) is
X_Label_String_Array : Label_String_Array_Type := Default_Label_String_Array;
Y_Label_String_Array : Label_String_Array_Type := Default_Label_String_Array;
Title_Label_String_Array : Label_String_Array_Type := Default_Label_String_Array;
begin
- X_Label_String_Array(1) := X_Label; -- First slot only; others not used.
- Y_Label_String_Array(1) := Y_Label; -- First slot only; others not used.
- Title_Label_String_Array(1) := Title_Label; -- First slot only; others not used.
+ X_Label_String_Array(1) := TUB(X_Label); -- First slot only; others not used.
+ Y_Label_String_Array(1) := TUB(Y_Label); -- First slot only; others not used.
+ Title_Label_String_Array(1) := TUB(Title_Label); -- First slot only; others not used.
Multiplot_Pairs(x, y1, x, y2, x, y3, x, y4, x, y5,
X_Labels => X_Label_String_Array,
@@ -272,9 +266,9 @@
y3 : Real_Vector := Dont_Plot_This;
y4 : Real_Vector := Dont_Plot_This;
[...67608 lines suppressed...]
+<A HREF="http://sourceforge.net/project/showfiles.php?group_id=2915">Access
+PLplot tarballs and rpm's</A>
+</td>
+</tr>
+
+<tr>
+<td>
+</td>
+<td>
+From this SourceForge file release area for PLplot you may download tarballs
+and rpm's and also view the release notes (by clicking on the version number).
+</td>
+</tr>
+
+<tr> <td> <br> </td> </tr>
+<tr>
+<td colspan=2 align="left">
+
+<font size="+2">
+Debian Packages
+</font>
+
+</td>
+
+<tr>
+<td>
+</td>
+<td>
+<P>
+Debian packages for PLplot 5.3.1 are available in the stable distribution
+of Debian. Packages for PLplot 5.6.1 are available in the testing and
+the unstable distributions.
+</P>
+
+</td>
+</tr>
+
+</table>
+</table>
+
+
+</body>
+</html>
+
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/www/source/index.html plplot/www/source/index.html
--- plplot-5.7.3/www/source/index.html 1969-12-31 17:00:00.000000000 -0700
+++ plplot/www/source/index.html 2007-06-29 16:17:24.000000000 -0600
@@ -0,0 +1,152 @@
+<html>
+<head>
+<title>
+PLplot Source Code
+</title>
+</head>
+<body text="#000000" bgcolor="#FFFFFF" >
+
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<td align="left" valign="top" ROWSPAN=1000>
+
+<table border="0">
+<td align=center nowrap>
+<table>
+<tr>
+<td width=1> </td>
+<td nowrap>
+<font face="Helvetica, Arial" size=+1>
+<br>
+<b> PLplot Site Menu </b>
+</font>
+</td>
+<td width=1> </td>
+</tr>
+</table>
+</td>
+</tr>
+
+<tr>
+<td>
+<hr size=1 noshade=noshade color="#000000">
+</td>
+</tr>
+
+
+<td>
+<table border=0 cellpadding=0 cellspacing=2>
+<font face="Helvetica, Arial">
+<tr><td>
+<A HREF="../index.html"><IMG border=0 SRC="../plplot_icons/whiteball.gif" ALIGN=top></A>
+</td><td>
+<A HREF="../index.html">Home</A>
+</td></tr>
+
+<tr><td>
+<A HREF="../resources/index.html"><IMG border=0 SRC="../plplot_icons/whiteball.gif" ALIGN=top></A>
+</td><td>
+<A HREF="../resources/index.html">Resources</A>
+</td></tr>
+
+<tr><td>
+<A HREF="../source/index.html"><IMG border=0 SRC="../plplot_icons/redball.gif" ALIGN=top></A>
+</td><td>
+<b>
+<A HREF="../source/index.html">Source Code</A>
+</b>
+</td></tr>
+
+<tr><td>
+<A HREF="../examples/index.html"><IMG border=0 SRC="../plplot_icons/whiteball.gif" ALIGN=top></A>
+</td><td>
+<A HREF="../examples/index.html">Examples</A><br>
+</td></tr>
+
+<tr><td>
+<A HREF="../demo/index.html"><IMG border=0 SRC="../plplot_icons/whiteball.gif" ALIGN=top></A>
+</td><td>
+<A HREF="../demo/index.html">Try it online</A><br>
+</td></tr>
+
+<tr><td>
+<A HREF="../credits/index.html"><IMG border=0 SRC="../plplot_icons/whiteball.gif" ALIGN=top></A>
+</td><td>
+<A HREF="../credits/index.html">Credits</A><br>
+</td></tr>
+</table>
+
+</font>
+</td>
+</tr>
+
+</table>
+
+<td rowspan=1000> <! a little spacer >
+</td>
+
+<td rowspan=1000 bgcolor="#000000" width=1>
+<IMG SRC="../plplot_icons/pad.gif" width=1> <! a little black spacer >
+</td>
+
+<td rowspan=1000> <! a little spacer>
+
+</td>
+
+<td>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+ <td align="right" valign="top" bgcolor="#eeccaa">
+ <br>
+ <font face="Helvetica, Arial">
+ <h1>
+ PLplot Source code
+ </h1>
+ </font>
+ </td>
+ <td bgcolor="#eeccaa">
+
+ </td>
+</tr>
+<tr> <td> <br> </td> </tr>
+</table>
+
+
+<table border="0">
+<tr>
+<td colspan=2 align="left">
+<font size=+2>
+Download
+</font>
+</td>
+</tr>
+
+<tr>
+<td>
+<table width=20> <tr> <td> <br> </td> </tr> </table> <! A 20 pixel spacer>
+</td>
+
+<td>
+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
+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/">
+here</A>.
+
+</td>
+</tr>
+</tr>
+</table>
+</table>
+
+<br>
+<p>
+
+</body>
+</html>
+
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plplot.spec 12 Jul 2007 19:45:47 -0000 1.33
+++ plplot.spec 12 Jul 2007 19:54:29 -0000 1.34
@@ -15,6 +15,7 @@
Patch2: plplot-5.6.1-info.patch
Patch5: plplot-5.7.2-multilib.patch
Patch6: plplot-5.7.3-jni.patch
+Patch7: plplot-5.7.3-svn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake, libtool-ltdl-devel, swig
@@ -185,6 +186,7 @@
%patch2 -p1 -b .orig
%patch5 -p1 -b .multilib
%patch6 -p1 -b .jni
+%patch7 -p1 -b .svn
%build
@@ -459,6 +461,7 @@
%changelog
* Thu Jul 12 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3
- Disable Ada interface on ppc64 until available (bug #241233)
+- Add svn patch to fix ada bindings on x86_64 and other issues
- Add build_doc conditional to test doc builds
* Mon Apr 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-2
More information about the scm-commits
mailing list