Re: problem configuring Amaya 11.4.4 with system raptor (or zlib-1.2.7)

Troubleshooting a different problem led me back to this one.  Amaya =20
11.4.4 compiles fine against zlib 1.2.5, but for 1.2.6 or higher, a =20
change in the headers leads to the error below.  The following two =20
patches fix the problem.  I've just added them to my ebuild, but I =20
suppose they should really be wrapped in a test for which zlib version =20
is being used.  Both files to be patched are in Amaya/amaya/

Jack

::::::::::::::
Xml2thot.diff
::::::::::::::
--- Xml2thot.c.orig     2013-02-20 15:40:34.000000000 -0500
+++ Xml2thot.c  2013-02-20 15:41:23.000000000 -0500
@@ -5847,7 +5847,7 @@
    while (!endOfFile && !XMLNotWellFormed && !XMLInvalidToken)
      {
        /* read the XML file */
-      res =3D gzread (infile, bufferRead, COPY_BUFFER_SIZE);
+      res =3D gzread ((gzFile)infile, bufferRead, COPY_BUFFER_SIZE);
        if (res < 0)
          return;

::::::::::::::
/tmp/html2thot.diff
::::::::::::::
--- html2thot.c.orig    2013-02-20 15:31:26.000000000 -0500
+++ html2thot.c 2013-02-20 15:32:34.000000000 -0500
@@ -4349,7 +4349,7 @@
        WorkBuffer =3D FileBuffer;
      }
    // need to read a new set of characters
-  LastCharInWorkBuffer =3D gzread (infile, &FileBuffer[StartOfRead],
+  LastCharInWorkBuffer =3D gzread ((gzFile)infile, =20
&FileBuffer[StartOfRead],
                                   INPUT_FILE_BUFFER_SIZE - =20
StartOfRead);
    // add previous read characters not managed yet
    LastCharInWorkBuffer +=3D StartOfRead;

:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::=
:::::

On 2012.11.14 15:48, Laurent Carcone wrote:
> I made a quick google research, it seems to be a problem with the =20
> zlib library [1], [2], [3].
> Which version are you running ?
>=20
> Laurent
>=20
>=20
> [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D661906
> [2] http://forum.simutrans.com/index.php?topic=3D9575.0
> [3] http://comments.gmane.org/gmane.linux.lfs.devel/11698
>=20
> Le 14/11/12 20:28, Jack a =E9crit :
>> Laurent,
>>=20
>> Thanks for the suggestion.  However, using --disable-annot, I get
>>=20
>> ../../amaya/html2thot.c: In function 'void GetNextHTMLbuffer(FILE*, =20
>> ThotBool*, char**, int*)':
>> ../../amaya/html2thot.c:4353:70: error: cannot convert 'FILE*' to =20
>> 'gzFile_s*' for argument '1' to 'int gzread(gzFile_s*, void*, =20
>> unsigned int)'
>> make[1]: *** [html2thot.o] Error 1
>> make[1]: Leaving directory `[full-path-to]/Amaya/LINUX-ELF/amaya'
>> make: *** [amaya_prog] Error 2
>>=20
>> I haven't done much troubleshooting of this yet, but I don't find =20
>> anything obvious in a quick Google.
>>=20
>> Also, while Annotations are not particularly important to me, I also =20
>> plan to try to figure out why it was failing when using the included =20
>> raptor.
>>=20
>> Thanks for any hints or suggestions.
>>=20
>> Jack
>>=20
>> On 2012.11.14 05:09, Laurent Carcone wrote:
>>> Hello,
>>>=20
>>> If I remember correctly, raptor is used by the experimental =20
>>> Annotations service. If you don't want to use this service you can =20
>>> disable it when you launch the configure command: ../configure =20
>>> --disable-annot
>>>=20
>>> Thanks,
>>> Laurent
>>>=20
>>> Le 08/11/2012 20:03, Jack a =E9crit :
>>>> I am trying to compile Amaya 11.4.4 on Gentoo Linux, and have run =20
>>>> into a problem.  It appears that the configuration cannot find my =20
>>>> system raptor, and it subsequently fails to build with the =20
>>>> built-in raptor.  If anyone is interested, I will provide more =20
>>>> information on this fail in a separate thread.
>>>>=20
>>>> I have raptor 2.0.8 installed and it appears that as of raptor =20
>>>> 2.0, raptor-config was dropped in favor of pkg-config.  I don't =20
>>>> know if Amaya would work with raptor2 but if  so, it needs to =20
>>>> check for pkg-config raptor2 instead of raptor-config.  If raptor2 =20
>>>> will work, I would much rather see a fix so it is possible.  If =20
>>>> the code is still based on raptor1, then I'll pursue why the =20
>>>> internal raptor is not working.
>>>>=20
>>>> Thanks for any suggsetions.
>>>>=20
>>>> Jack
>>>>=20
>>>>=20
>>>=20
>>=20
>>=20
>=20
=