Title: [89272] releases/WebKitGTK/webkit-1.4
Diff
Modified: releases/WebKitGTK/webkit-1.4/ChangeLog (89271 => 89272)
--- releases/WebKitGTK/webkit-1.4/ChangeLog 2011-06-20 19:29:39 UTC (rev 89271)
+++ releases/WebKitGTK/webkit-1.4/ChangeLog 2011-06-20 19:29:54 UTC (rev 89272)
@@ -1,3 +1,17 @@
+2011-06-20 Xan Lopez <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Link explicitly with XRender on Linux/Unix
+ https://bugs.webkit.org/show_bug.cgi?id=57558
+
+ Some linkers, like GNU Gold, require explicit linkage of all the
+ libraries used instead of relying on our dependencies to bring
+ them in. In this case, the build fails because we use XRender in
+ the plugin code but don't link directly to it.
+
+ * configure.ac: check for XRender on UNIX.
+
2011-09-09 Martin Robinson <[email protected]>
Reviewed by Gustavo Noronha.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog (89271 => 89272)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-20 19:29:39 UTC (rev 89271)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-20 19:29:54 UTC (rev 89272)
@@ -1,3 +1,12 @@
+2011-06-20 Xan Lopez <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Link explicitly with XRender on Linux/Unix
+ https://bugs.webkit.org/show_bug.cgi?id=57558
+
+ * GNUmakefile.am: add XRender CFLAGS.
+
2011-06-04 Martin Robinson <[email protected]>
Reviewed by Xan Lopez.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/GNUmakefile.am (89271 => 89272)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/GNUmakefile.am 2011-06-20 19:29:39 UTC (rev 89271)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/GNUmakefile.am 2011-06-20 19:29:54 UTC (rev 89272)
@@ -5083,6 +5083,7 @@
$(LIBXSLT_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(UNICODE_CFLAGS) \
+ $(XRENDER_CFLAGS) \
$(XT_CFLAGS)
EXTRA_DIST += \
Modified: releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog (89271 => 89272)
--- releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog 2011-06-20 19:29:39 UTC (rev 89271)
+++ releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/ChangeLog 2011-06-20 19:29:54 UTC (rev 89272)
@@ -1,3 +1,12 @@
+2011-06-20 Xan Lopez <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Link explicitly with XRender on Linux/Unix
+ https://bugs.webkit.org/show_bug.cgi?id=57558
+
+ * GNUmakefile.am: add XRender LIBS.
+
2011-06-13 Martin Robinson <[email protected]>
Reviewed by Gustavo Noronha Silva.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/GNUmakefile.am (89271 => 89272)
--- releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/GNUmakefile.am 2011-06-20 19:29:39 UTC (rev 89271)
+++ releases/WebKitGTK/webkit-1.4/Source/WebKit/gtk/GNUmakefile.am 2011-06-20 19:29:54 UTC (rev 89272)
@@ -102,6 +102,7 @@
$(PNG_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
+ $(XRENDER_LIBS) \
$(XT_LIBS) \
$(WINMM_LIBS) \
$(SHLWAPI_LIBS) \
Modified: releases/WebKitGTK/webkit-1.4/configure.ac (89271 => 89272)
--- releases/WebKitGTK/webkit-1.4/configure.ac 2011-06-20 19:29:39 UTC (rev 89271)
+++ releases/WebKitGTK/webkit-1.4/configure.ac 2011-06-20 19:29:54 UTC (rev 89272)
@@ -945,6 +945,14 @@
AC_SUBST([GEOCLUE_LIBS])
fi
+# 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
+
# check if gstreamer is available
if test "$enable_video" = "yes"; then
PKG_CHECK_MODULES([GSTREAMER],
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
