Cairo 1.4.2nb1 breaks on Linux

["Ole Andre Rodlie" <olear%slackforge.net@localhost>]

Upgraded my machine (Linux 2.6.19/i386) yesterday and noticed that
Cairo didn't compile.

Making all in pdiff
if /bin/sh ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H
-I. -I. -I../.. -I../../src -I../../src -I/usr/pkg/include/freetype2
-I/usr/pkg/include   -I/usr/pkg/include   -I/usr/pkg/include
-I/usr/pkg/include/libpng12   -I/usr/pkg/include   -I/usr/pkg/include
  -Wall -Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing  -I/usr/pkg/include
-I/usr/include -I/usr/pkg/include/freetype2   -O2 -pipe -march=i486
-mtune=i686 -I/usr/pkg/include -I/usr/include
-I/usr/pkg/include/freetype2 -MT lpyramid.lo -MD -MP -MF
".deps/lpyramid.Tpo" -c -o lpyramid.lo lpyramid.c;  then mv -f
".deps/lpyramid.Tpo" ".deps/lpyramid.Plo"; else rm -f
".deps/lpyramid.Tpo"; exit 1; fi
mkdir .libs
gcc -DHAVE_CONFIG_H -I. -I../.. -I../../src
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/freetype2
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/libpng12 -Wall
-Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing -O2 -pipe -march=i486
-mtune=i686 -MT lpyramid.lo -MD -MP -MF .deps/lpyramid.Tpo -c
lpyramid.c  -fPIC -DPIC -o .libs/lpyramid.o
gcc -DHAVE_CONFIG_H -I. -I../.. -I../../src
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/freetype2
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/libpng12 -Wall
-Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing -O2 -pipe -march=i486
-mtune=i686 -MT lpyramid.lo -MD -MP -MF .deps/lpyramid.Tpo -c
lpyramid.c -o lpyramid.o >/dev/null 2>&1
if /bin/sh ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H
-I. -I. -I../.. -I../../src -I../../src -I/usr/pkg/include/freetype2
-I/usr/pkg/include   -I/usr/pkg/include   -I/usr/pkg/include
-I/usr/pkg/include/libpng12   -I/usr/pkg/include   -I/usr/pkg/include
  -Wall -Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing  -I/usr/pkg/include
-I/usr/include -I/usr/pkg/include/freetype2   -O2 -pipe -march=i486
-mtune=i686 -I/usr/pkg/include -I/usr/include
-I/usr/pkg/include/freetype2 -MT pdiff.lo -MD -MP -MF
".deps/pdiff.Tpo" -c -o pdiff.lo pdiff.c;  then mv -f
".deps/pdiff.Tpo" ".deps/pdiff.Plo"; else rm -f ".deps/pdiff.Tpo";
exit 1; fi
gcc -DHAVE_CONFIG_H -I. -I../.. -I../../src
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/freetype2
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/libpng12 -Wall
-Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing -O2 -pipe -march=i486
-mtune=i686 -MT pdiff.lo -MD -MP -MF .deps/pdiff.Tpo -c pdiff.c  -fPIC
-DPIC -o .libs/pdiff.o
pdiff.c:155: error: syntax error before "_get_pixel"
pdiff.c:156: warning: return type defaults to `int'
pdiff.c:156: warning: no previous prototype for '_get_pixel'
pdiff.c: In function `_get_pixel':
pdiff.c:157: error: `uint32_t' undeclared (first use in this function)
pdiff.c:157: error: (Each undeclared identifier is reported only once
pdiff.c:157: error: for each function it appears in.)
pdiff.c:157: error: `data' undeclared (first use in this function)
pdiff.c:159: error: syntax error before ')' token
pdiff.c: In function `_get_red':
pdiff.c:166: error: `uint32_t' undeclared (first use in this function)
pdiff.c:166: error: syntax error before "pixel"
pdiff.c:167: error: `uint8_t' undeclared (first use in this function)
pdiff.c:169: error: `pixel' undeclared (first use in this function)
pdiff.c :171: error: `alpha' undeclared (first use in this function)
pdiff.c: In function `_get_green':
pdiff.c:182: error: `uint32_t' undeclared (first use in this function)
pdiff.c:182: error: syntax error before "pixel"
pdiff.c:183: error: `uint8_t' undeclared (first use in this function)
pdiff.c:185: error: `pixel' undeclared (first use in this function)
pdiff.c:187: error: `alpha' undeclared (first use in this function)
pdiff.c: In function `_get_blue':
pdiff.c:198: error: `uint32_t' undeclared (first use in this function)
pdiff.c:198: error: syntax error before "pixel"
pdiff.c:199: error: `uint8_t' undeclared (first use in this function)
pdiff.c:201: error: `pixel' undeclared (first use in this function)
pdiff.c:203: error: `alpha' undeclared (first use in this function)

[wrapper.sh] note: The real command line, after the pkgsrc wrapper, was:
/usr/pkgsrc/graphics/cairo/work/.gcc/bin/gcc -DHAVE_CONFIG_H -I.
-I../.. -I../../src
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/freetype2
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/libpng12 -Wall
-Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing -O2 -pipe -march=i486
-mtune=i686 -MT pdiff.lo -MD -MP -MF .deps/pdiff.Tpo -c pdiff.c -fPIC
-DPIC -o .libs/pdiff.o -std=gnu99
-L/usr/pkgsrc/graphics/cairo/work/.buildlink/lib

[wrapper.sh] note: The real command line, after the pkgsrc wrapper, was:
/usr/pkg/bin/libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I.
-I../.. -I../../src
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/freetype2
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include
-I/usr/pkgsrc/graphics/cairo/work/.buildlink/include/libpng12 -Wall
-Wextra -Wsign-compare -Werror-implicit-function-declaration
-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked
-Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2
-Winit-self -Wdeclaration-after-statement -Wold-style-definition
-Wno-unused-parameter -fno-strict-aliasing -O2 -pipe -march=i486
-mtune=i686 -MT pdiff.lo -MD -MP -MF .deps/pdiff.Tpo -c -o pdiff.lo
pdiff.c
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/cairo/work/cairo-1.4.2/test/pdiff
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/cairo/work/cairo- 1.4.2/test
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/cairo/work/cairo-1.4.2
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/cairo/work/cairo-1.4.2
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/cairo
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/graphics/cairo


Since I knew that 1.4.2 worked, I looked at the ChangeLog for Cairo 1.4.2nb1:

Modified Files: Makefile distinfo
Added Files: patch-ac

Log Message:
  Repair a broken build on solaris and possibly others.

So, I removed patch-ac and everything worked. Just tought you should know.