pyrox.dev
lol
1From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001
2From: Thomas Tuegel <ttuegel@gmail.com>
3Date: Mon, 1 Dec 2014 17:22:23 -0600
4Subject: [PATCH] dlopen-webkit-nsplugin
5
6---
7 qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
8 qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +-
9 .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
13index 679480b..2c373cc 100644
14--- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
15+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
16@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0)
17 }
18 }
19
20- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
21+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
22 if (library.load()) {
23 typedef void *(*gtk_init_check_ptr)(int*, char***);
24 gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
25diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
26index de06a2f..363bde5 100644
27--- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
28+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
29@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
30 // support gdk based plugins (like flash) that use a different X connection.
31 // The code below has the same effect as this one:
32 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
33- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
34+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
35 if (!library.load())
36 return 0;
37
38diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
39index d734ff6..62a2197 100644
40--- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
41+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
42@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
43 // The code below has the same effect as this one:
44 // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
45
46- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
47+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
48 if (!library.load())
49 return 0;
50
51--
522.1.3
53