summaryrefslogtreecommitdiffstats
path: root/www/webkit-gtk2/files
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2008-05-26 17:44:16 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2008-05-26 17:44:16 +0800
commitd65aa5b20ecf9d085edd5f95a97fab05b8daec24 (patch)
treefdcb69c8a037255d8c6d45d4d067cd5d4c93c892 /www/webkit-gtk2/files
parent4da51062d79b3994f33d2b47288c9a615d4f8d6d (diff)
downloadmarcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar
marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.gz
marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.bz2
marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.lz
marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.xz
marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.tar.zst
marcuscom-ports-d65aa5b20ecf9d085edd5f95a97fab05b8daec24.zip
Update to 34130
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10981 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/webkit-gtk2/files')
-rw-r--r--www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp11
-rw-r--r--www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp10
2 files changed, 10 insertions, 11 deletions
diff --git a/www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp b/www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp
deleted file mode 100644
index c27e6365a..000000000
--- a/www/webkit-gtk2/files/patch-WebCore_plugins_gtk_PluginDatabaseGtk.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- WebCore/plugins/gtk/PluginDatabaseGtk.cpp.orig 2008-04-18 04:00:55.000000000 -0400
-+++ WebCore/plugins/gtk/PluginDatabaseGtk.cpp 2008-04-21 08:15:45.665667131 -0400
-@@ -75,7 +75,7 @@
- g_strfreev(pluginPaths);
- }
-
-- directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", NULL);
-+ directory = g_build_filename(G_DIR_SEPARATOR_S %%_BROWSER_PLUGINS_DIR%% NULL);
- directories.append(directory);
- g_free(directory);
- directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "local", "lib", "mozilla", "plugins", NULL);
diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
new file mode 100644
index 000000000..8dddf2475
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
@@ -0,0 +1,10 @@
+--- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700
++++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700
+@@ -281,6 +281,7 @@
+ userPluginPath.append(String("/.netscape/plugins"));
+ paths.append(userPluginPath);
+
++ paths.append("%%BROWSER_PLUGINS");
+ paths.append("/usr/lib/browser/plugins");
+ paths.append("/usr/local/lib/mozilla/plugins");
+ paths.append("/usr/lib/firefox/plugins");