[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
girish at forwardbias.in
girish at forwardbias.in
Wed Dec 22 12:16:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 813b220c09cc00fb5ffb043c03ed87e7b1aa8a4f
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 18 03:53:08 2010 +0000
Reviewed by Antonio Gomes.
[Qt] On Maemo5, there is no libgdk-x11-2.0.so symlink. Look for
libgdk-x11-2.0.so.0 instead on X11 and Maemo5.
https://bugs.webkit.org/show_bug.cgi?id=44043
* plugins/qt/PluginViewQt.cpp:
(WebCore::getPluginDisplay):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b668037..ba3c6f8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-17 Girish Ramakrishnan <girish at forwardbias.in>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] On Maemo5, there is no libgdk-x11-2.0.so symlink. Look for
+ libgdk-x11-2.0.so.0 instead on X11 and Maemo5.
+
+ https://bugs.webkit.org/show_bug.cgi?id=44043
+
+ * plugins/qt/PluginViewQt.cpp:
+ (WebCore::getPluginDisplay):
+
2010-08-17 Ariya Hidayat <ariya at sencha.com>
Reviewed by Antonio Gomes.
diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 0ca356b..de90693 100644
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -662,7 +662,7 @@ static Display *getPluginDisplay()
// support gdk based plugins (like flash) that use a different X connection.
// The code below has the same effect as this one:
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- QLibrary library("libgdk-x11-2.0");
+ QLibrary library("libgdk-x11-2.0.so.0");
if (!library.load())
return 0;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list