Attachment 3525 Details for Bug 4724 – proposed patch

[patch] proposed patch

cairo.patch (text/plain), 1.40 KB, created by Benny Siegert on 2005-10-09 09:10:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benny Siegert

Created: 2005-10-09 09:10:13 UTC

Size: 1.40 KB

patch

obsolete

>--- configure.in.orig	Wed Aug 24 18:25:48 2005
>+++ configure.in	Fri Oct  7 23:38:07 2005
>@@ -89,18 +89,21 @@ AC_ARG_ENABLE(xlib,
>   [  --disable-xlib          Disable cairo's Xlib backend],
>   [use_xlib=$enableval], [use_xlib=yes])
> 
>+XRENDER_LIBS=
> if test "x$use_xlib" = "xyes"; then
>   dnl Check for Xrender header files if the Xrender package is not installed:
>   PKG_CHECK_MODULES(XRENDER, xrender >= 0.6, [
>     XRENDER_REQUIRES=xrender
>     use_xlib=yes], [
>-      AC_CHECK_HEADER(X11/extensions/Xrender.h, [
>       AC_PATH_XTRA
>+      CPPFLAGS="$CPPFLAGS $X_CFLAGS"
>+      AC_CHECK_HEADER(X11/extensions/Xrender.h, [
>       XRENDER_LIBS="$X_LIBS -lXrender -lXext -lX11 $X_EXTRA_LIBS"
>       use_xlib=yes], [
> 		use_xlib="no (requires Xrender http://freedesktop.org/Software/xlibs)"])])
>   _CHECK_FUNCS_WITH_FLAGS(XrmFinalize, $XRENDER_CFLAGS, $XRENDER_LIBS)
> fi
>+AC_SUBST(XRENDER_LIBS)
> 
> AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, test "x$use_xlib" = "xyes")
> if test "x$use_xlib" = "xyes"; then
>--- cairo.pc.in.orig	Fri Oct  7 23:01:40 2005
>+++ cairo.pc.in	Fri Oct  7 23:01:52 2005
>@@ -8,5 +8,5 @@ Description: Multi-platform 2D graphics 
> Version: @VERSION@
> 
> @PKGCONFIG_REQUIRES@: @FREETYPE_REQUIRES@ @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
>-Libs: @FREETYPE_CONFIG_LIBS@ -L${libdir} -lcairo 
>+Libs: @FREETYPE_CONFIG_LIBS@ @XRENDER_LIBS@ -L${libdir} -lcairo 
> Cflags: @FREETYPE_CONFIG_CFLAGS@ -I${includedir}/cairo

Actions: View | Splinter Review

Attachments on bug 4724: 3525

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.