Only depend on xrender if x11 is being used

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Jeremy Huddleston Sequoia]

http://trac.macports.org/ticket/34086

configure.ac contains:
# check for XRender under Linux/Unix. Some linkers require explicit
# linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
if test "$os_win32" = "no"; then
   PKG_CHECK_MODULES([XRENDER], [xrender])
   AC_SUBST([XRENDER_CFLAGS])
   AC_SUBST([XRENDER_LIBS])
fi

But that logic is incorrect.  You should be checking for xrender based on target (x11), not OS.  This incorrectly results in xrender being pulled in for the quartz target, and it incorrectly prevents xrender from being pulled in on the win/x11 target.

[Jeremy Huddleston Sequoia]

Here is a patch:
https://trac.macports.org/raw-attachment/ticket/34086/xrender-check.patch


--- configure.orig	2012-04-18 17:55:13.000000000 -0500
+++ configure	2012-04-18 17:56:11.000000000 -0500
@@ -22086,7 +22086,7 @@
 
 # check for XRender under Linux/Unix. Some linkers require explicit
 # linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
-if test "$os_win32" = "no"; then
+if test "$with_target" = "x11"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5

[Changhun Kang]

Created attachment 170103 [details]
I made a simple patch for this bug.

[Jeremy Huddleston Sequoia]

That's exactly the same patch that I provided in the link in the previous comment...

[Changhun Kang]

I appreciate for your guide.
Is there anything i missed?
> That's exactly the same patch that I provided in the link in the previous comment...

[Jeremy Huddleston Sequoia]

(In reply to comment #4)
> I appreciate for your guide.
> Is there anything i missed?
> > That's exactly the same patch that I provided in the link in the previous comment...

No, I'm saying that's exactly what I had already, so:

Reviewed-by: Jeremy Huddleston Sequoia <[e-mail]>
Tested-by: Jeremy Huddleston Sequoia <[e-mail]>

Sorry, I'm not familiar with the commit process within webkit and have just been filing bugs.  If it should've been sent to a list or made an attachment, please let me know for next time.

[Benjamin Poulain]

Comment on attachment 170103 [details]
I made a simple patch for this bug.

This looks out of date, the patch does not apply.

[Jeremy Huddleston Sequoia]

It's a trivial 1-line patch.  Surely you can rebase it.

[Jeremy Huddleston Sequoia]

And it applies fine to 1.11.5

[Zan Dobersek]

The configuration system used by the Autotools build was reworked recently. The change should now fit in here:
http://trac.webkit.org/browser/trunk/Source/autotools/FindDependencies.m4

[Changhun Kang]

Created attachment 189013 [details]
Patch

[WebKit Review Bot]

Comment on attachment 189013 [details]
Patch

Clearing flags on attachment: 189013

Committed r143344: <http://trac.webkit.org/changeset/143344>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.