rpms/amaya/devel amaya-9.1-64bits.patch, 1.4, 1.5 amaya.spec, 1.20, 1.21

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15842

Modified Files:
	amaya-9.1-64bits.patch amaya.spec 
Log Message:
next try at the x86_64 patch

amaya-9.1-64bits.patch:

Index: amaya-9.1-64bits.patch
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya-9.1-64bits.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amaya-9.1-64bits.patch	22 Feb 2006 18:44:51 -0000	1.4
+++ amaya-9.1-64bits.patch	22 Feb 2006 21:20:06 -0000	1.5
@@ -1,5 +1,5 @@
 --- ./Amaya/thotlib/base/structlist.c.64bits	2004-12-08 11:52:20.000000000 +0100
-+++ ./Amaya/thotlib/base/structlist.c	2006-02-22 19:07:23.000000000 +0100
++++ ./Amaya/thotlib/base/structlist.c	2006-02-22 21:36:07.000000000 +0100
 @@ -509,7 +509,7 @@
  	    fprintf (fileDescriptor, " Name=NULL");
  	  else
@@ -10,7 +10,7 @@
        /* ecrit l'URI associee au schema de structure */
        if (pNode->ElStructSchema->SsUriName == NULL)
 --- ./Amaya/thotlib/base/fileaccess.c.64bits	2005-02-23 12:46:21.000000000 +0100
-+++ ./Amaya/thotlib/base/fileaccess.c	2006-02-22 19:07:23.000000000 +0100
++++ ./Amaya/thotlib/base/fileaccess.c	2006-02-22 21:36:07.000000000 +0100
 @@ -684,7 +684,7 @@
         while (ptr != NULL);
  
@@ -20,8 +20,8 @@
         if (i > 1)
  	 {
  	   strncpy (aDirectory, text, i);
---- ./Amaya/thotlib/dialogue/font.c.64bits	2006-02-22 19:15:33.000000000 +0100
-+++ ./Amaya/thotlib/dialogue/font.c	2006-02-22 19:17:57.000000000 +0100
+--- ./Amaya/thotlib/dialogue/font.c.64bits	2005-02-23 12:46:21.000000000 +0100
++++ ./Amaya/thotlib/dialogue/font.c	2006-02-22 21:36:07.000000000 +0100
 @@ -889,7 +889,7 @@
  #endif /* _WIN_PRINT */
        break;
@@ -40,22 +40,14 @@
  	 }
         break;
       case UnAuto:
---- ./Amaya/thotlib/image/xpmcreate.c.64bits	2006-02-22 19:34:49.000000000 +0100
-+++ ./Amaya/thotlib/image/xpmcreate.c	2006-02-22 19:43:47.000000000 +0100
-@@ -85,14 +85,14 @@
-                           Pixel *used_pixels, unsigned int *nused_pixels));
+--- ./Amaya/thotlib/image/xpmcreate.c.64bits	2003-11-18 09:10:25.000000000 +0100
++++ ./Amaya/thotlib/image/xpmcreate.c	2006-02-22 22:18:53.000000000 +0100
+@@ -2287,7 +2287,7 @@
+     XImage *shapeimage,
+     Pixel *shape_pixels)
+ {
+-    unsigned int a, x, y;
++    unsigned long a, x, y;
+ 
+     switch (cpp) {
  
- #ifndef FOR_MSW
--LFUNC(ParseAndPutPixels, int, (xpmData *data, unsigned int width,
-+LFUNC(ParseAndPutPixels, long, (xpmData *data, unsigned int width,
- 			       unsigned int height, unsigned int ncolors,
- 			       unsigned int cpp, XpmColor *colorTable,
- 			       xpmHashTable *hashtable,
- 			       XImage *image, Pixel *image_pixels,
- 			       XImage *mask, Pixel *mask_pixels));
- #else  /* FOR_MSW */
--LFUNC(ParseAndPutPixels, int, (Display *dc, xpmData *data, unsigned int width,
-+LFUNC(ParseAndPutPixels, long, (Display *dc, xpmData *data, unsigned int width,
- 			       unsigned int height, unsigned int ncolors,
- 			       unsigned int cpp, XpmColor *colorTable,
- 			       xpmHashTable *hashtable,


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- amaya.spec	22 Feb 2006 18:44:51 -0000	1.20
+++ amaya.spec	22 Feb 2006 21:20:06 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -99,6 +99,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-10
+- next try at the x86_64 patch
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-9
 - update x86_64 patch again