On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote:
> Hi,
>
> This is an update to cairo 1.12.12.
>
> diff -u -p -r1.1 patch-src_cairo_pc_in
> --- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 -0000 1.1
> +++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -0000
> @@ -1,11 +1,11 @@
> $OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
> ---- src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
> -+++ src/cairo.pc.in Tue Jan 29 08:22:13 2013
> +--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
> ++++ src/cairo.pc.in Fri Feb 1 17:25:52 2013
> @@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
> Version: @VERSION@
>
> @PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
> -Libs: -L${libdir} -lcairo
> -+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
> ++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
> Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
> Cflags: -I${includedir}/cairo
This looks wrong. X11BASE may not be defined when someone parses
cairo.pc, but hard-coding the /usr/X11R6 value seems to ack that the
value of X11BASE will never change....
Something like @X11BASE@ with the proper substitution at configure time is
probably better.
But dozeen of other packages may be affected by the same kind of
issues, and I'm too lazy now to check what's the approved approach for
other cases.
Anyways if this change is wanted, it should probably be a separate commit.
--
Matthieu Herrb
