Author: krejzi Date: 2012-09-19 09:31:50 -0600 (Wed, 19 Sep 2012) New Revision: 2532
Added: trunk/webkit/ trunk/webkit/webkit-1.6.3_gcc-4.7-1.patch Removed: trunk/webkit/webkitgtk-1.6.3_gcc-4.7-1.patch trunk/webkitgtk/ Log: Rename webkit patches correctly. Copied: trunk/webkit/webkit-1.6.3_gcc-4.7-1.patch (from rev 2531, trunk/webkitgtk/webkitgtk-1.6.3_gcc-4.7-1.patch) =================================================================== --- trunk/webkit/webkit-1.6.3_gcc-4.7-1.patch (rev 0) +++ trunk/webkit/webkit-1.6.3_gcc-4.7-1.patch 2012-09-19 15:31:50 UTC (rev 2532) @@ -0,0 +1,36 @@ +Submitted By: Andrew Benton <[email protected]> +Date: 2012-03-18 +Initial Package Version: 1.6.3 +Upstream Status: From upstream +Origin: https://bugs.webkit.org/show_bug.cgi?id=47799 +Description: Fixes compiling webkit-1.6.3 with gcc-4.7 + +--- webkit-1.6.3/Source/WebCore/plugins/gtk/PluginViewGtk.cpp~ 2012-03-18 12:37:03.920894509 +0000 ++++ webkit-1.6.3/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-03-18 12:37:18.470660619 +0000 +@@ -71,6 +71,7 @@ + #include <gtk/gtk.h> + + #if defined(XP_UNIX) ++#define String XtStringType + #include "RefPtrCairo.h" + #include "gtk2xtbin.h" + #define Bool int // this got undefined somewhere +@@ -81,6 +82,7 @@ + #elif defined(GDK_WINDOWING_WIN32) + #include "PluginMessageThrottlerWin.h" + #include <gdk/gdkwin32.h> ++#undef String + #endif + + using JSC::ExecState; +--- webkit-1.6.3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp~ 2011-09-17 08:11:57.000000000 +0100 ++++ webkit-1.6.3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-18 13:07:18.360078362 +0000 +@@ -28,7 +28,7 @@ + #include "PluginObject.h" + #include <assert.h> + #include <string.h> +- ++#include <unistd.h> + using namespace std; + extern NPNetscapeFuncs *browser; + Deleted: trunk/webkit/webkitgtk-1.6.3_gcc-4.7-1.patch =================================================================== --- trunk/webkitgtk/webkitgtk-1.6.3_gcc-4.7-1.patch 2012-09-18 16:08:57 UTC (rev 2531) +++ trunk/webkit/webkitgtk-1.6.3_gcc-4.7-1.patch 2012-09-19 15:31:50 UTC (rev 2532) @@ -1,36 +0,0 @@ -Submitted By: Andrew Benton <[email protected]> -Date: 2012-03-18 -Initial Package Version: 1.6.3 -Upstream Status: From upstream -Origin: https://bugs.webkit.org/show_bug.cgi?id=47799 -Description: Fixes compiling webkit-1.6.3 with gcc-4.7 - ---- webkit-1.6.3/Source/WebCore/plugins/gtk/PluginViewGtk.cpp~ 2012-03-18 12:37:03.920894509 +0000 -+++ webkit-1.6.3/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-03-18 12:37:18.470660619 +0000 -@@ -71,6 +71,7 @@ - #include <gtk/gtk.h> - - #if defined(XP_UNIX) -+#define String XtStringType - #include "RefPtrCairo.h" - #include "gtk2xtbin.h" - #define Bool int // this got undefined somewhere -@@ -81,6 +82,7 @@ - #elif defined(GDK_WINDOWING_WIN32) - #include "PluginMessageThrottlerWin.h" - #include <gdk/gdkwin32.h> -+#undef String - #endif - - using JSC::ExecState; ---- webkit-1.6.3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp~ 2011-09-17 08:11:57.000000000 +0100 -+++ webkit-1.6.3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-03-18 13:07:18.360078362 +0000 -@@ -28,7 +28,7 @@ - #include "PluginObject.h" - #include <assert.h> - #include <string.h> -- -+#include <unistd.h> - using namespace std; - extern NPNetscapeFuncs *browser; - -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
