/[packages]/cauldron/xulrunner/current/SOURCES/xulrunner-2.0-system-cairo-tee.patch
ViewVC logotype

Annotation of /cauldron/xulrunner/current/SOURCES/xulrunner-2.0-system-cairo-tee.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 43415 - (hide annotations) (download)
Sat Jan 29 12:57:08 2011 UTC (13 years, 2 months ago) by dmorgan
File size: 1013 byte(s)
Merge mdv commit 633159
1 dmorgan 43415 https://bugzilla.mozilla.org/show_bug.cgi?id=623797
2    
3     # HG changeset patch
4     # User Jory A. Pratt (anarchy@gentoo.org)
5     # Parent b27366868c807e07a11741a7a2eb404ebc08e5e7
6     Check to ensure system cairo has tee backend support, part 2 bug #623797
7    
8     diff --git a/configure.in b/configure.in
9     --- a/configure.in
10     +++ b/configure.in
11     @@ -8714,16 +8714,17 @@ if test "$MOZ_TREE_CAIRO"; then
12    
13     CAIRO_FEATURES_H=gfx/cairo/cairo/src/cairo-features.h
14     mv -f $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig 2> /dev/null
15    
16     else
17     PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig)
18     MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
19     MOZ_CAIRO_LIBS=$CAIRO_LIBS
20     + PKG_CHECK_MODULES(CAIRO_TEE, cairo-tee >= $CAIRO_VERSION)
21     if test "$MOZ_X11"; then
22     PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION)
23     MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS $CAIRO_XRENDER_LIBS"
24     MOZ_CAIRO_CFLAGS="$MOZ_CAIRO_CFLAGS $CAIRO_XRENDER_CFLAGS"
25     fi
26     fi
27    
28     AC_SUBST(MOZ_TREE_CAIRO)
29    
30    

  ViewVC Help
Powered by ViewVC 1.1.30