4 files changed, 39 insertions, 8 deletions
diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
index 006b49709..1d41c7c8d 100644
--- a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
+++ b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
@@ -1,8 +1,8 @@
---- WebKit/gtk/webkit.pc.in.orig	2008-04-01 14:46:09.251210738 -0400
-+++ WebKit/gtk/webkit.pc.in	2008-04-01 14:46:21.218068816 -0400
-@@ -8,4 +8,4 @@
+--- WebKit/gtk/webkit.pc.in.orig	2009-05-13 20:55:10.000000000 +0800
++++ WebKit/gtk/webkit.pc.in	2009-05-19 15:09:51.000000000 +0800
+@@ -8,4 +8,4 @@ Description: Web content engine for GTK+
  Version: @VERSION@
- Requires: gtk+-2.0
+ Requires: glib-2.0 gtk+-2.0 libsoup-2.4
  Libs: -L${libdir} -lwebkit-1.0
 -Cflags: -I${includedir}/webkit-1.0
 +Cflags: -I${includedir}/webkit-1.0 -I${includedir}/webkit-1.0/webkit
diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
index ed0a5895f..2670c229d 100644
--- a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
+++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
@@ -1,10 +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 @@
+--- WebCore/plugins/PluginDatabase.cpp.orig	2008-11-02 03:12:05.000000000 +0800
++++ WebCore/plugins/PluginDatabase.cpp	2009-05-19 15:09:51.000000000 +0800
+@@ -283,6 +283,7 @@ Vector<String> PluginDatabase::defaultPl
      userPluginPath.append(String("/.netscape/plugins"));
      paths.append(userPluginPath);
  
-+    paths.append("%%BROWSER_PLUGINS%%");
++    paths.append("%%BROWSER_PLUGINS_DIR%%");
      paths.append("/usr/lib/browser/plugins");
      paths.append("/usr/local/lib/mozilla/plugins");
      paths.append("/usr/lib/firefox/plugins");
diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo
new file mode 100644
index 000000000..2c4293af5
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-cairo
@@ -0,0 +1,11 @@
+--- WebCore/platform/graphics/BitmapImage.cpp.orig	2009-03-04 03:34:16.000000000 +0800
++++ WebCore/platform/graphics/BitmapImage.cpp	2009-05-19 15:09:51.000000000 +0800
+@@ -202,7 +202,7 @@ bool BitmapImage::isSizeAvailable()
+ NativeImagePtr BitmapImage::frameAtIndex(size_t index)
+ {
+     if (index >= frameCount())
+-        return 0;
++        return NULL;
+ 
+     if (index >= m_frames.size() || !m_frames[index].m_frame)
+         cacheFrame(index);
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
new file mode 100644
index 000000000..a022f4df1
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2009-05-19 15:17:51.000000000 +0800
++++ configure	2009-05-19 15:18:21.000000000 +0800
+@@ -20986,7 +20986,7 @@
+ 
+ if test "$enable_jit" = "yes"; then
+     case "$target_cpu" in
+-        i*86|x86_64)
++        i*86|x86_64|amd64)
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_JIT 1
+@@ -21020,7 +21020,7 @@
+ _ACEOF
+ 
+                 ;;
+-                x86_64)
++                x86_64|amd64)
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1