[SCM] PAW: Physics Analysis Workstation branch, debian, updated. upstream/2.14.04.dfsg.2-25-g8b7ffba
Lifeng Sun
lifongsun at gmail.com
Tue Mar 29 12:57:11 UTC 2011
The following commit has been merged in the debian branch:
commit 3194ff8af1df3ec415c891c3b05cb121f2e45efb
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Fri Mar 18 14:01:08 2011 +0800
Update patch 119.
Include stdlib.h to declare 'free' function.
diff --git a/debian/patches/119-fix-compiler-warnings.dpatch b/debian/patches/119-fix-compiler-warnings.dpatch
index 183fe5b..c87ca0f 100755
--- a/debian/patches/119-fix-compiler-warnings.dpatch
+++ b/debian/patches/119-fix-compiler-warnings.dpatch
@@ -5,10 +5,23 @@
## DP: Fix a number of compiler warnings. Courtesy of Harald Vogt.
@DPATCH@
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/cern_types.h paw-2.14.04/src/pawlib/paw/ntuple/cern_types.h
---- paw-2.14.04~/src/pawlib/paw/ntuple/cern_types.h 1996-04-23 14:37:54.000000000 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/cern_types.h 2006-09-08 14:58:22.811814451 -0400
-@@ -36,26 +36,38 @@
+diff --git a/src/pawlib/comis/deccc/cs_hlshl.c b/src/pawlib/comis/deccc/cs_hlshl.c
+index a17a695..faced26 100644
+--- a/src/pawlib/comis/deccc/cs_hlshl.c
++++ b/src/pawlib/comis/deccc/cs_hlshl.c
+@@ -47,6 +47,7 @@
+
+ #include <sys/time.h>
+
++#include <stdlib.h>
+ #include <signal.h>
+ #include <string.h>
+
+diff --git a/src/pawlib/paw/ntuple/cern_types.h b/src/pawlib/paw/ntuple/cern_types.h
+index cf2d256..47c7c63 100644
+--- a/src/pawlib/paw/ntuple/cern_types.h
++++ b/src/pawlib/paw/ntuple/cern_types.h
+@@ -36,26 +36,38 @@ typedef struct _string32_ {
typedef unsigned int UInt32;
@@ -47,9 +60,10 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/cern_types.h paw-2.14.04/src/pawl
typedef float Float32;
-diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_vvec.c paw-2.14.04/src/pawlib/paw/ntuple/qp_vvec.c
---- paw-2.14.04~/src/pawlib/paw/ntuple/qp_vvec.c 1996-05-12 11:13:56.000000000 -0400
-+++ paw-2.14.04/src/pawlib/paw/ntuple/qp_vvec.c 2006-09-08 14:49:56.490766940 -0400
+diff --git a/src/pawlib/paw/ntuple/qp_vvec.c b/src/pawlib/paw/ntuple/qp_vvec.c
+index 5855ded..b9d022a 100644
+--- a/src/pawlib/paw/ntuple/qp_vvec.c
++++ b/src/pawlib/paw/ntuple/qp_vvec.c
@@ -19,6 +19,7 @@
*/
@@ -58,10 +72,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/ntuple/qp_vvec.c paw-2.14.04/src/pawlib/
#include "qp_report.h"
#include "qp_vvec.h"
-diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/caption.c paw-2.14.04/src/pawlib/paw/xbae/caption.c
---- paw-2.14.04~/src/pawlib/paw/xbae/caption.c 1996-03-01 06:39:36.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/xbae/caption.c 2006-09-08 15:05:15.658762762 -0400
-@@ -244,7 +244,7 @@
+diff --git a/src/pawlib/paw/xbae/caption.c b/src/pawlib/paw/xbae/caption.c
+index 805db4d..d2fbac0 100644
+--- a/src/pawlib/paw/xbae/caption.c
++++ b/src/pawlib/paw/xbae/caption.c
+@@ -244,7 +244,7 @@ Cardinal *num_args;
* it will use our name as it's label.
*/
(void)
@@ -70,7 +85,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/caption.c paw-2.14.04/src/pawlib/pa
xmLabelWidgetClass, (Widget)new,
XmNbackground, new->core.background_pixel,
XmNforeground, new->manager.foreground,
-@@ -613,7 +613,7 @@
+@@ -613,7 +613,7 @@ Boolean configure;
* to handle gadgets (the Motif function always calls the gadgets
* resize method)
*/
@@ -79,10 +94,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/caption.c paw-2.14.04/src/pawlib/pa
_XmConfigureObject((RectObj)UserChild(cw),
#else
_XmConfigureObject((Widget)UserChild(cw),
-diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/clip.c paw-2.14.04/src/pawlib/paw/xbae/clip.c
---- paw-2.14.04~/src/pawlib/paw/xbae/clip.c 1996-03-01 06:39:36.000000000 -0500
-+++ paw-2.14.04/src/pawlib/paw/xbae/clip.c 2006-09-08 14:49:56.491766727 -0400
-@@ -190,8 +190,8 @@
+diff --git a/src/pawlib/paw/xbae/clip.c b/src/pawlib/paw/xbae/clip.c
+index f7ff0a0..a43a215 100644
+--- a/src/pawlib/paw/xbae/clip.c
++++ b/src/pawlib/paw/xbae/clip.c
+@@ -190,8 +190,8 @@ XbaeClipWidget cw;
* XXX It might be more efficient to fake up an Expose event
* and call Redisplay directly
*/
@@ -93,10 +109,11 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/clip.c paw-2.14.04/src/pawlib/paw/x
0, 0,
0 /*Full Width*/, 0 /*Full Height*/,
True);
-diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw/xbae/matrix.c
---- paw-2.14.04~/src/pawlib/paw/xbae/matrix.c 1998-09-02 11:23:57.000000000 -0400
-+++ paw-2.14.04/src/pawlib/paw/xbae/matrix.c 2006-09-08 14:49:56.494766087 -0400
-@@ -67,7 +67,10 @@
+diff --git a/src/pawlib/paw/xbae/matrix.c b/src/pawlib/paw/xbae/matrix.c
+index 9effcfd..1cda29f 100644
+--- a/src/pawlib/paw/xbae/matrix.c
++++ b/src/pawlib/paw/xbae/matrix.c
+@@ -67,7 +67,10 @@ static char sccsid[] = "@(#)Matrix.c 3.21 11/25/92";
#endif
/* this BSDism is used to often to replace it in the code */
@@ -107,7 +124,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Translations for Matrix (these will also be used by the Clip child).
-@@ -3467,7 +3470,7 @@
+@@ -3467,7 +3470,7 @@ XmScrollBarCallbackStruct *call_data;
*/
VERT_ORIGIN(mw) = call_data->value;
@@ -116,7 +133,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
return;
/*
-@@ -3646,7 +3649,7 @@
+@@ -3646,7 +3649,7 @@ XmScrollBarCallbackStruct *call_data;
*/
HORIZ_ORIGIN(mw) = call_data->value;
@@ -125,7 +142,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
return;
/*
-@@ -6162,7 +6165,7 @@
+@@ -6162,7 +6165,7 @@ int num_rows;
(*((XbaeMatrixWidgetClass) XtClass(mw))->matrix_class.cancel_edit)
(mw, True);
@@ -134,7 +151,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Generate expose events on Matrix and Clip to force the
* new rows to be drawn.
-@@ -6254,7 +6257,7 @@
+@@ -6254,7 +6257,7 @@ DeleteRows.",
(*((XbaeMatrixWidgetClass) XtClass(mw))->matrix_class.cancel_edit)
(mw, True);
@@ -143,7 +160,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Generate expose events on Matrix and Clip to force the
* rows to be redrawn.
-@@ -6349,7 +6352,7 @@
+@@ -6349,7 +6352,7 @@ int num_columns;
(*((XbaeMatrixWidgetClass) XtClass(mw))->matrix_class.cancel_edit)
(mw, True);
@@ -152,7 +169,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Generate expose events on Matrix and Clip to force the
* new columns to be drawn.
-@@ -6446,7 +6449,7 @@
+@@ -6446,7 +6449,7 @@ DeleteColumns.",
(*((XbaeMatrixWidgetClass) XtClass(mw))->matrix_class.cancel_edit)
(mw, True);
@@ -161,7 +178,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Generate expose events on Matrix and Clip to force the
* columns to be redrawn.
-@@ -6528,7 +6531,7 @@
+@@ -6528,7 +6531,7 @@ in SetRowColors.",
for (j = 0; j < mw->matrix.columns; j++)
mw->matrix.cell_background[i + position][j] = colors[i];
@@ -170,7 +187,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Redraw all the visible non-fixed cells. We don't need to clear first
* since only the color changed.
-@@ -6626,7 +6629,7 @@
+@@ -6626,7 +6629,7 @@ in SetColumnColors.",
for (j = 0; j < num_colors; j++)
mw->matrix.cell_background[i][j + position] = colors[j];
@@ -179,7 +196,7 @@ diff -urNad paw-2.14.04~/src/pawlib/paw/xbae/matrix.c paw-2.14.04/src/pawlib/paw
/*
* Redraw all the visible non-fixed cells. We don't need to clear first
* since only the color changed.
-@@ -6716,7 +6719,7 @@
+@@ -6716,7 +6719,7 @@ SetCellColor.",
*/
mw->matrix.cell_background[row][column] = color;
--
PAW: Physics Analysis Workstation
More information about the debian-science-commits
mailing list