1
--- mozilla/configure.in.bak 2007-04-27 12:06:53.000000000 -0700
2
+++ mozilla/configure.in 2007-04-27 13:51:40.000000000 -0700
3
@@ -6731,12 +6731,29 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$M
4
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION)
5
MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
6
MOZ_CAIRO_LIBS=$CAIRO_LIBS
8
+ if test "$MOZ_X11"; then
9
+ if test "$MOZ_SVG_RENDERER_CAIRO"; then
10
+ PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:)
11
+ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS
12
+ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
14
+ if test "$MOZ_ENABLE_CANVAS"; then
15
+ PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:)
16
+ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS
17
+ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS"
23
AC_SUBST(MOZ_TREE_CAIRO)
24
AC_SUBST(MOZ_CAIRO_CFLAGS)
25
AC_SUBST(MOZ_CAIRO_LIBS)
26
+AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS)
27
+AC_SUBST(MOZ_CAIRO_XLIB_LIBS)
28
+AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS)
29
+AC_SUBST(MOZ_CAIRO_XRENDER_LIBS)
31
dnl ========================================================
33
--- mozilla/layout/build/Makefile.in.bak 2007-04-27 12:13:22.000000000 -0700
34
+++ mozilla/layout/build/Makefile.in 2007-04-27 13:53:00.000000000 -0700
35
@@ -234,6 +234,17 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
40
+ifdef MOZ_SVG_RENDERER_CAIRO
41
+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) \
44
+ifdef MOZ_ENABLE_CANVAS
45
+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) \
50
ifneq (,$(filter mac cocoa gtk,$(MOZ_WIDGET_TOOLKIT)))
53
--- mozilla/layout/svg/renderer/src/cairo/Makefile.in.bak 2007-04-27 13:55:51.000000000 -0700
54
+++ mozilla/layout/svg/renderer/src/cairo/Makefile.in 2007-04-27 13:49:51.000000000 -0700
55
@@ -93,6 +93,11 @@ LOCAL_INCLUDES = \
56
-I$(topsrcdir)/gfx/src \
60
+CFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS)
61
+CXXFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS)
65
LOCAL_INCLUDES += -I$(topsrcdir)/gfx/src/gtk
66
CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
67
--- mozilla/config/autoconf.mk.in.bak 2007-04-27 12:12:12.000000000 -0700
68
+++ mozilla/config/autoconf.mk.in 2007-04-27 13:47:28.000000000 -0700
69
@@ -207,6 +207,8 @@ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDER
70
MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@
71
MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@
72
MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
73
+MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@
74
+MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@
77
# Mac's don't like / in a #include, so we include the libart
78
@@ -218,6 +220,8 @@ endif
80
MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@
81
MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@
82
+MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@
83
+MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@
85
MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@
86
MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@
87
--- mozilla/content/canvas/src/Makefile.in.bak 2007-04-27 12:25:38.000000000 -0700
88
+++ mozilla/content/canvas/src/Makefile.in 2007-04-27 12:25:00.000000000 -0700
89
@@ -94,7 +94,7 @@ FORCE_STATIC_LIB = 1
91
include $(topsrcdir)/config/rules.mk
93
-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
94
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS)
96
ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT)))
97
# needed for nsDrawingSurfaceMac.h