forked from mirrors/nixpkgs
54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
|
From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
||
|
|
Date: Mon, 1 Dec 2014 17:22:23 -0600
|
||
|
|
Subject: [PATCH] dlopen-webkit-nsplugin
|
||
|
|
|
||
|
|
---
|
||
|
|
qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
|
||
|
|
qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +-
|
||
|
|
.../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||
|
|
index 679480b..2c373cc 100644
|
||
|
|
--- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||
|
|
+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||
|
|
@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
|
||
|
|
+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
|
||
|
|
if (library.load()) {
|
||
|
|
typedef void *(*gtk_init_check_ptr)(int*, char***);
|
||
|
|
gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
|
||
|
|
diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||
|
|
index de06a2f..363bde5 100644
|
||
|
|
--- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||
|
|
+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||
|
|
@@ -697,7 +697,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(QLatin1String("libgdk-x11-2.0"), 0);
|
||
|
|
+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
|
||
|
|
if (!library.load())
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||
|
|
index d734ff6..62a2197 100644
|
||
|
|
--- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||
|
|
+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||
|
|
@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
|
||
|
|
// The code below has the same effect as this one:
|
||
|
|
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
||
|
|
|
||
|
|
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
||
|
|
+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
|
||
|
|
if (!library.load())
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.1.3
|
||
|
|
|