As of JPEG-9, the type 'boolean' is an enumeration, but since glib defines TRUE and FALSE as numeric constants and this is C++, they need to be explicitly casted. --- a/src/af/util/xp/ut_jpeg.cpp +++ b/src/af/util/xp/ut_jpeg.cpp @@ -102,7 +102,7 @@ static boolean _jpegFillInputBuffer (j_decompress_ptr cinfo) src->pub.next_input_byte = src->sourceBuf->getPointer (src->pos); src->pub.bytes_in_buffer = src->sourceBuf->getLength (); - return 1; // boolean is a libjpeg type that is an int. + return (boolean)TRUE; } /* In the following file, we also need to reverse header include order: JPEG needs to be included before Glib, which is included by "abiword-garble.h" for this fix to work. The JPEG header needs the types FILE and size_t, we can get them from cstdio. --- a/plugins/garble/xp/abiword-garble-jpeg.cpp 2009-09-05 17:49:53.000000000 +0200 +++ b/plugins/garble/xp/abiword-garble-jpeg.cpp 2014-09-07 21:28:49.364008571 +0200 @@ -20,12 +20,14 @@ * 02111-1307, USA. */ -#include "abiword-garble.h" +#include extern "C" { #include } +#include "abiword-garble.h" + //----------------------------------------------------------------------------- typedef struct { struct jpeg_destination_mgr pub; @@ -49,7 +51,7 @@ mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest; dest->pub.next_output_byte = dest->buf; dest->pub.free_in_buffer = dest->bufsize; - return FALSE; + return (boolean)FALSE; } //----------------------------------------------------------------------------- @@ -96,7 +98,7 @@ cinfo.image_width = (JDIMENSION) w; cinfo.image_height = (JDIMENSION) h; jpeg_set_defaults (&cinfo); - jpeg_set_quality ( &cinfo, 50, TRUE ); + jpeg_set_quality ( &cinfo, 50, (boolean)TRUE ); cinfo.dest = (struct jpeg_destination_mgr *) (*cinfo.mem->alloc_small)((j_common_ptr)&cinfo, JPOOL_PERMANENT, sizeof(mem_destination_mgr)); dest = (mem_dest_ptr) cinfo.dest; dest->pub.init_destination = _jpeg_init_destination; @@ -105,7 +107,7 @@ dest->buf = (JOCTET*)data; dest->bufsize = length; dest->jpegsize = 0; - jpeg_start_compress (&cinfo, TRUE); + jpeg_start_compress (&cinfo, (boolean)TRUE); // write data for (int i=0; iCommit message (Expand)Author 2021-03-06tests: do not hard code HTTP ports...Previously, test cases could fail if some process was listening at a hard-coded port. This patch eliminates most of these potential failures, by automatically assigning an unbound port. This should allow for building multiple guix trees in parallel outside a build container, though this is currently untested. The test "home-page: Connection refused" in tests/lint.scm still hardcodes port 9999, however. * guix/tests/http.scm (http-server-can-listen?): remove now unused procedure. (%http-server-port): default to port 0, meaning the OS will automatically choose a port. (open-http-server-socket): remove the false statement claiming this procedure is exported and also return the allocated port number. (%local-url): raise an error if the port is obviously unbound. (call-with-http-server): set %http-server-port to the allocated port while the thunk is called. * tests/derivations.scm: adjust test cases to use automatically assign a port. As there is no risk of a port conflict now, do not make any tests conditional upon 'http-server-can-listen?' anymore. * tests/elpa.scm: likewise. * tests/lint.scm: likewise, and add a TODO comment about a port that is still hard-coded. * tests/texlive.scm: likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Maxime Devos 2020-01-17import: texlive: Avoid uses of '@@' in tests....* guix/import/texlive.scm (fetch-sxml, sxml->package): Export. * tests/texlive.scm <top level>: Call '%http-server-port'. ("fetch-sxml: returns SXML for valid XML"): Use 'with-http-server' and set 'current-http-proxy' instead of using 'mock'. ("sxml->package"): Remove use of '@@'. Ludovic Courtès 2017-06-15guix: Add texlive importer....* guix/import/texlive.scm: New file. * guix/scripts/import/texlive.scm: New file. * Makefile.am (MODULES): Add them. * tests/texlive.scm: New file. * Makefile.am (SCM_TESTS): Add it. * guix/scripts/import.scm (importers): Add texlive importer. * doc/guix.texi (Invoking guix import): Document it. Ricardo Wurmus