[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:47:17 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 77f7b2410e949fdc11ced3ec0d4ef2ffc71b9806
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 30 03:16:59 2010 +0000
2010-12-29 Konstantin Tokarev <annulen at yandex.ru>
Reviewed by Eric Seidel.
[Qt] Fixed compatibility with gold linker on X11 platforms
https://bugs.webkit.org/show_bug.cgi?id=51700
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
Linked TestNetscapePlugin with libX11 on Unix platforms
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e3b5293..b3942c2 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-29 Konstantin Tokarev <annulen at yandex.ru>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] Fixed compatibility with gold linker on X11 platforms
+ https://bugs.webkit.org/show_bug.cgi?id=51700
+
+ * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+ Linked TestNetscapePlugin with libX11 on Unix platforms
+
2010-12-29 Ademar de Souza Reis Jr <ademar.reis at openbossa.org>
Reviewed by Darin Adler.
diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
index de3cf6a..30d22d6 100644
--- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
@@ -44,3 +44,7 @@ mac {
} else {
SOURCES += ../../unix/TestNetscapePlugin/TestNetscapePlugin.cpp
}
+
+unix {
+ LIBS += -lX11
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list