rpms/plplot/devel plplot-5.7.3-svn.patch,1.1,1.2
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue Aug 7 16:39:38 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20173
Modified Files:
plplot-5.7.3-svn.patch
Log Message:
Update svn patch
plplot-5.7.3-svn.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 plplot-5.7.3-svn.patch
Index: plplot-5.7.3-svn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot-5.7.3-svn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.7.3-svn.patch 12 Jul 2007 19:54:29 -0000 1.1
+++ plplot-5.7.3-svn.patch 7 Aug 2007 16:39:34 -0000 1.2
@@ -993,7 +993,7 @@
end PLplot;
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/ada/plplot.ads plplot/bindings/ada/plplot.ads
--- plplot-5.7.3/bindings/ada/plplot.ads 2007-03-25 18:41:51.000000000 -0600
-+++ plplot/bindings/ada/plplot.ads 2007-07-12 13:49:01.000000000 -0600
++++ plplot/bindings/ada/plplot.ads 2007-08-06 09:06:02.000000000 -0600
@@ -1,11 +1,13 @@
with
- PLplotThin,
@@ -1026,7 +1026,7 @@
+ -- color map has been changed, then these colors will return surprising
+ -- results. Color map 0 can always be restored to its default state using
+ -- Restore_Default_Snapshot_Of_Color_Map_0.
-+ subtype Plot_Color_Type is Integer range 0..255;
++ subtype Plot_Color_Type is Integer;
Black : constant Plot_Color_Type := 0;
Red : constant Plot_Color_Type := 1;
Yellow : constant Plot_Color_Type := 2;
@@ -6406,7 +6406,7 @@
+end PLplot_Traditional;
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/ada/plplot_traditional.ads plplot/bindings/ada/plplot_traditional.ads
--- plplot-5.7.3/bindings/ada/plplot_traditional.ads 1969-12-31 17:00:00.000000000 -0700
-+++ plplot/bindings/ada/plplot_traditional.ads 2007-07-12 13:49:01.000000000 -0600
++++ plplot/bindings/ada/plplot_traditional.ads 2007-08-06 09:06:02.000000000 -0600
@@ -0,0 +1,1463 @@
+with
+ PLplot_Thin,
@@ -6439,7 +6439,7 @@
+ -- colors map has been changed, then these colors will return surprising
+ -- results. Color map 0 can always be restored to its default state using
+ -- Set_Color_Map_0(
-+ subtype Plot_Color_Type is Integer range 0..255;
++ subtype Plot_Color_Type is Integer;
+ Black : constant Plot_Color_Type := 0;
+ Red : constant Plot_Color_Type := 1;
+ Yellow : constant Plot_Color_Type := 2;
@@ -7944,6 +7944,95 @@
// Geoffrey Furnish
// Sep 21 1994
//
+diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/CMakeLists.txt plplot/bindings/CMakeLists.txt
+--- plplot-5.7.3/bindings/CMakeLists.txt 2007-03-25 18:41:51.000000000 -0600
++++ plplot/bindings/CMakeLists.txt 2007-08-07 09:32:34.000000000 -0600
+@@ -44,43 +44,50 @@
+ endif(PLD_tkwin)
+
+ if(index)
+- find_program(CAT NAMES cat)
+- if(NOT CAT)
+- find_program(COPY NAMES cmd)
++ if(UNIX)
++ add_custom_target(pkgIndex.tcl ALL
++ COMMAND cat ${index} > pkgIndex.tcl
++ DEPENDS ${index}
++ )
++ else(UNIX)
++ find_program(CAT NAMES cat)
++ if(NOT CAT)
++ find_program(COPY NAMES cmd)
++ if(NOT COPY)
++ find_program(COPY NAMES command)
++ endif(NOT COPY)
++ if(COPY)
++ set(CAT ${COPY} CACHE INTERNAL "program to concatenate files" FORCE)
++ set(COPY "copy" CACHE INTERNAL "program to concatenate files" FORCE)
++ else(COPY)
++ message(FATAL_ERROR "program to concatenate files not found")
++ endif(COPY)
++ message(STATUS "Copy: ${COPY} - ${CAT}")
++ endif(NOT CAT)
+ if(NOT COPY)
+- find_program(COPY NAMES command)
++ set(indexn)
++ foreach(file ${index})
++ file(TO_NATIVE_PATH ${file} filen)
++ set(indexn ${indexn} ${filen})
++ endforeach(file ${index})
++ add_custom_target(pkgIndex.tcl ALL
++ COMMAND ${CAT} ${indexn} > pkgIndex.tcl
++ DEPENDS ${index}
++ )
++ else(NOT COPY)
++ set(indexn)
++ set(prefix)
++ foreach(file ${index})
++ file(TO_NATIVE_PATH ${file} filen)
++ set(indexn ${indexn} ${prefix}${filen})
++ set(prefix +)
++ endforeach(file ${index})
++ add_custom_target(pkgIndex.tcl ALL
++ COMMAND ${COPY} ${indexn} pkgIndex.tcl
++ DEPENDS ${index}
++ )
+ endif(NOT COPY)
+- if(COPY)
+- set(CAT ${COPY} CACHE INTERNAL "program to concatenate files" FORCE)
+- set(COPY "copy" CACHE INTERNAL "program to concatenate files" FORCE)
+- else(COPY)
+- message(FATAL_ERROR "program to concatenate files not found")
+- endif(COPY)
+- message(STATUS "Copy: ${COPY} - ${CAT}")
+- endif(NOT CAT)
+- if(NOT COPY)
+- set(indexn)
+- foreach(file ${index})
+- file(TO_NATIVE_PATH ${file} filen)
+- set(indexn ${indexn} ${filen})
+- endforeach(file ${index})
+- add_custom_target(pkgIndex.tcl ALL
+- COMMAND ${CAT} ${indexn} > pkgIndex.tcl
+- DEPENDS ${index}
+- )
+- else(NOT COPY)
+- set(indexn)
+- set(prefix)
+- foreach(file ${index})
+- file(TO_NATIVE_PATH ${file} filen)
+- set(indexn ${indexn} ${prefix}${filen})
+- set(prefix +)
+- endforeach(file ${index})
+- add_custom_target(pkgIndex.tcl ALL
+- COMMAND ${COPY} ${indexn} pkgIndex.tcl
+- DEPENDS ${index}
+- )
+- endif(NOT COPY)
++ endif(UNIX)
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
+ DESTINATION ${DATA_DIR}
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/f77/CMakeLists.txt plplot/bindings/f77/CMakeLists.txt
--- plplot-5.7.3/bindings/f77/CMakeLists.txt 2007-03-25 18:41:51.000000000 -0600
+++ plplot/bindings/f77/CMakeLists.txt 2007-06-29 16:17:51.000000000 -0600
@@ -8496,6 +8585,83 @@
foreach( srcfile ${JAVA_FILES_FULL} )
Only in plplot-5.7.3/bindings/java: Makefile.in
+diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/bindings/java/plplotjavac.i plplot/bindings/java/plplotjavac.i
+--- plplot-5.7.3/bindings/java/plplotjavac.i 2007-03-25 18:41:51.000000000 -0600
++++ plplot/bindings/java/plplotjavac.i 2007-08-06 09:06:01.000000000 -0600
+@@ -46,7 +46,9 @@
+ typedef float PLFLT;
+ #endif
+
+-typedef long PLINT;
++/* This assumes that C int is 32-bit - swig doesn't know about int32_t */
++/* Ideally we should have a typemap for it */
++typedef int PLINT;
+ typedef unsigned int PLUNICODE;
+ typedef PLINT PLBOOL;
+
+@@ -721,6 +723,8 @@
+ ai = (jobject *) malloc( nx * sizeof(jobject) );
+ adat = (jPLFLT **) malloc( nx * sizeof(jPLFLT *) );
+
++ (*jenv)->EnsureLocalCapacity( jenv, nx );
++
+ for( i=0; i < nx; i++ )
+ {
+ ai[i] = (*jenv)->GetObjectArrayElement( jenv, $input, i );
+@@ -781,6 +785,8 @@
+ ai = (jobject *) malloc( nx * sizeof(jobject) );
+ adat = (jPLFLT **) malloc( nx * sizeof(jPLFLT *) );
+
++ (*jenv)->EnsureLocalCapacity( jenv, nx );
++
+ for( i=0; i < nx; i++ )
+ {
+ ai[i] = (*jenv)->GetObjectArrayElement( jenv, $input, i );
+@@ -834,6 +840,8 @@
+ ai = (jobject *) malloc( nx * sizeof(jobject) );
+ adat = (jPLFLT **) malloc( nx * sizeof(jPLFLT *) );
+
++ (*jenv)->EnsureLocalCapacity( jenv, nx );
++
+ for( i=0; i < nx; i++ )
+ {
+ ai[i] = (*jenv)->GetObjectArrayElement( jenv, $input, i );
+@@ -885,6 +893,8 @@
+ ai = (jobject *) malloc( nx * sizeof(jobject) );
+ adat = (jPLFLT **) malloc( nx * sizeof(jPLFLT *) );
+
++ (*jenv)->EnsureLocalCapacity( jenv, nx );
++
+ for( i=0; i < nx; i++ )
+ {
+ ai[i] = (*jenv)->GetObjectArrayElement( jenv, $input, i );
+@@ -941,6 +951,8 @@
+ int ny = -1;
+ int i;
+
++ (*jenv)->EnsureLocalCapacity( jenv, nx );
++
[...4728 lines suppressed...]
+ 0x263F,2282,0
+ 0x2640,2283,0
+-0x2295,2284,0
++0x2641,2284,0
+ 0x2642,2285,0
+ 0x2643,2286,0
+ 0x2644,2287,0
+-0x0000,2288,0
++0x2645,2288,0
+ 0x2646,2289,0
+ 0x2647,2290,0
+ 0x263E,2291,0
+ 0x2604,2292,0
+-0x2600,2293,0
+-0x0000,2293,0
++0x2605,2293,0
+ 0x260A,2294,0
+ 0x260B,2295,0
+ 0x2197,2296,0
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/fonts/plhershey-unicode-gen.c plplot/fonts/plhershey-unicode-gen.c
--- plplot-5.7.3/fonts/plhershey-unicode-gen.c 2007-03-25 18:41:57.000000000 -0600
+++ plplot/fonts/plhershey-unicode-gen.c 2007-06-29 16:17:35.000000000 -0600
@@ -19793,13 +23674,13 @@
@@ -1,5 +1,5 @@
-/* $Id$
- * $Log$
-- * Revision 1.1 2007/07/12 19:54:29 orion
-- * Add svn patch to fix ada bindings on x86_64 and other issues
+- * Revision 1.2 2007/08/07 16:39:34 orion
+- * Update svn patch
- *
+/* $Id$
+ * $Log$
-+ * Revision 1.1 2007/07/12 19:54:29 orion
-+ * Add svn patch to fix ada bindings on x86_64 and other issues
++ * Revision 1.2 2007/08/07 16:39:34 orion
++ * Update svn patch
+ *
* Revision 1.10 2000/12/18 21:01:49 airwin
* Change to new style plplot/*.h header file locations.
@@ -19810,13 +23691,13 @@
@@ -1,5 +1,5 @@
-/* $Id$
- * $Log$
-- * Revision 1.1 2007/07/12 19:54:29 orion
-- * Add svn patch to fix ada bindings on x86_64 and other issues
+- * Revision 1.2 2007/08/07 16:39:34 orion
+- * Update svn patch
- *
+/* $Id$
+ * $Log$
-+ * Revision 1.1 2007/07/12 19:54:29 orion
-+ * Add svn patch to fix ada bindings on x86_64 and other issues
++ * Revision 1.2 2007/08/07 16:39:34 orion
++ * Update svn patch
+ *
* Revision 1.10 2000/12/18 21:01:49 airwin
* Change to new style plplot/*.h header file locations.
@@ -30184,13 +34065,13 @@
@@ -1,437 +1,437 @@
-/* $Id$
- $Log$
-- Revision 1.1 2007/07/12 19:54:29 orion
-- Add svn patch to fix ada bindings on x86_64 and other issues
+- Revision 1.2 2007/08/07 16:39:34 orion
+- Update svn patch
-
+/* $Id$
+ $Log$
-+ Revision 1.1 2007/07/12 19:54:29 orion
-+ Add svn patch to fix ada bindings on x86_64 and other issues
++ Revision 1.2 2007/08/07 16:39:34 orion
++ Update svn patch
+
Revision 1.3 2000/12/18 21:01:50 airwin
Change to new style plplot/*.h header file locations.
@@ -34253,13 +38134,13 @@
@@ -1,5 +1,5 @@
-/* $Id$
- $Log$
-- Revision 1.1 2007/07/12 19:54:29 orion
-- Add svn patch to fix ada bindings on x86_64 and other issues
+- Revision 1.2 2007/08/07 16:39:34 orion
+- Update svn patch
-
+/* $Id$
+ $Log$
-+ Revision 1.1 2007/07/12 19:54:29 orion
-+ Add svn patch to fix ada bindings on x86_64 and other issues
++ Revision 1.2 2007/08/07 16:39:34 orion
++ Update svn patch
+
Revision 1.3 2000/12/18 21:01:50 airwin
Change to new style plplot/*.h header file locations.
@@ -34271,13 +38152,13 @@
/* -*-C-*-
-/* $Id$
- * $Log$
-- * Revision 1.1 2007/07/12 19:54:29 orion
-- * Add svn patch to fix ada bindings on x86_64 and other issues
+- * Revision 1.2 2007/08/07 16:39:34 orion
+- * Update svn patch
- *
+/* $Id$
+ * $Log$
-+ * Revision 1.1 2007/07/12 19:54:29 orion
-+ * Add svn patch to fix ada bindings on x86_64 and other issues
++ * Revision 1.2 2007/08/07 16:39:34 orion
++ * Update svn patch
+ *
* Revision 1.1 2000/05/12 18:05:32 furnish
* Imported latest Mac port work by Rob Managan.
@@ -36462,13 +40343,13 @@
@@ -1,390 +1,390 @@
-/* $Id$
- * $Log$
-- * Revision 1.1 2007/07/12 19:54:29 orion
-- * Add svn patch to fix ada bindings on x86_64 and other issues
+- * Revision 1.2 2007/08/07 16:39:34 orion
+- * Update svn patch
- *
+/* $Id$
+ * $Log$
-+ * Revision 1.1 2007/07/12 19:54:29 orion
-+ * Add svn patch to fix ada bindings on x86_64 and other issues
++ * Revision 1.2 2007/08/07 16:39:34 orion
++ * Update svn patch
+ *
* Revision 1.3 2000/12/18 21:01:50 airwin
* Change to new style plplot/*.h header file locations.
@@ -37386,13 +41267,13 @@
@@ -1,5 +1,5 @@
-/* $Id$
- * $Log$
-- * Revision 1.1 2007/07/12 19:54:29 orion
-- * Add svn patch to fix ada bindings on x86_64 and other issues
+- * Revision 1.2 2007/08/07 16:39:34 orion
+- * Update svn patch
- *
+/* $Id$
+ * $Log$
-+ * Revision 1.1 2007/07/12 19:54:29 orion
-+ * Add svn patch to fix ada bindings on x86_64 and other issues
++ * Revision 1.2 2007/08/07 16:39:34 orion
++ * Update svn patch
+ *
* Revision 1.1 1996/10/22 18:22:09 furnish
* Update the OS/2 driver with fixes supplied by Thorsten Feiweier.
@@ -51802,13 +55683,13 @@
/* -*-C-*- */
-/* $Id$
- * $Log$
-- * Revision 1.1 2007/07/12 19:54:29 orion
-- * Add svn patch to fix ada bindings on x86_64 and other issues
+- * Revision 1.2 2007/08/07 16:39:34 orion
+- * Update svn patch
- *
+/* $Id$
+ * $Log$
-+ * Revision 1.1 2007/07/12 19:54:29 orion
-+ * Add svn patch to fix ada bindings on x86_64 and other issues
++ * Revision 1.2 2007/08/07 16:39:34 orion
++ * Update svn patch
+ *
* Revision 1.2 2002/07/04 15:17:15 vincentdarley
* win-tk build
@@ -51846,13 +55727,13 @@
# Copyright (C) 2004 Rafael Laboissiere
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/test/test_ada.sh.in plplot/test/test_ada.sh.in
--- plplot-5.7.3/test/test_ada.sh.in 2007-03-25 18:41:57.000000000 -0600
-+++ plplot/test/test_ada.sh.in 2007-07-12 13:49:01.000000000 -0600
++++ plplot/test/test_ada.sh.in 2007-08-06 09:06:02.000000000 -0600
@@ -27,6 +27,10 @@
# pushd $adadir; make; popd
# Do the standard non-interactive examples.
-for index in t01 01 10 12; do
-+for index in 01 02 10 12 thick01 thick10 thick12; do
++for index in 01 02 04 10 12 thick01 thick02 thick04 thick10 thick12; do
$adadir/x${index}a -dev $device -o ${OUTPUT_DIR}/x${index}a.$dsuffix $options
+ status_code=$?
+ if [ "$status_code" -ne 0 ]; then
@@ -52022,12 +55903,14 @@
done
diff -ru --unidirectional-new-file --exclude=.svn plplot-5.7.3/test/test_python.sh.in plplot/test/test_python.sh.in
--- plplot-5.7.3/test/test_python.sh.in 2007-03-25 18:41:57.000000000 -0600
-+++ plplot/test/test_python.sh.in 2007-07-12 13:49:01.000000000 -0600
-@@ -30,5 +30,9 @@
++++ plplot/test/test_python.sh.in 2007-08-06 09:06:02.000000000 -0600
+@@ -29,6 +29,10 @@
+ # Skip 19 because it is just a placeholder without a real implementation.
# Skip 20, 21 and 25 because they are not (yet) implemented.
# For 24 you need special fonts installed to get good result.
- for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 22 23 24 26; do
+-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 22 23 24 26; do
- @PYTHON@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}p.$dsuffix $options
++for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 21 22 23 24 26; do
+ @PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}p.$dsuffix $options
+ status_code=$?
+ if [ "$status_code" -ne 0 ]; then
More information about the fedora-extras-commits
mailing list