[53845] users/devans/GNOME_2_27/www/webkit-gtk/files/ patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin. cpp.diff

devans at macports.org devans at macports.org
Wed Jul 15 09:13:09 PDT 2009


Revision: 53845
          http://trac.macports.org/changeset/53845
Author:   devans at macports.org
Date:     2009-07-15 09:13:08 -0700 (Wed, 15 Jul 2009)
Log Message:
-----------
GNOME_2_27/www/webkit-gtk: revise patch as submitted upstream in https://bugs.webkit.org/show_bug.cgi?id=25998.

Modified Paths:
--------------
    users/devans/GNOME_2_27/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff

Modified: users/devans/GNOME_2_27/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
===================================================================
--- users/devans/GNOME_2_27/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2009-07-15 16:10:17 UTC (rev 53844)
+++ users/devans/GNOME_2_27/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2009-07-15 16:13:08 UTC (rev 53845)
@@ -1,29 +1,33 @@
---- WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp.orig	2009-07-10 03:02:02.000000000 -0700
-+++ WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp	2009-07-13 12:59:40.000000000 -0700
-@@ -26,6 +26,13 @@
+--- WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp.orig	2009-07-14 08:05:33.000000000 -0700
++++ WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp	2009-07-14 08:07:37.000000000 -0700
+@@ -26,6 +26,15 @@
   */
  
  #include "config.h"
 +
++#ifdef __APPLE__
 +#define Cursor       QD_Cursor
 +#define WindowPtr    QD_WindowPtr
 +#define Picture      QD_Picture
 +#define BOOL         OSX_BOOL
 +#define EventType    HIT_EventType
++#endif
 +
  #include "PluginObject.h"
  
  #include "npapi.h"
-@@ -36,6 +43,13 @@
+@@ -36,6 +45,15 @@
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
 +
++#ifdef __APPLE__
 +#undef Cursor
 +#undef WindowPtr
 +#undef Picture
 +#undef BOOL
 +#undef EventType
++#endif
 +
  #include <X11/Xlib.h>
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090715/10582ac8/attachment.html>


More information about the macports-changes mailing list