[72215] trunk/dports/www/webkit-gtk

devans at macports.org devans at macports.org
Thu Oct 7 06:30:05 PDT 2010 

Revision: 72215
          http://trac.macports.org/changeset/72215
Author:   devans at macports.org
Date:     2010-10-07 06:30:03 -0700 (Thu, 07 Oct 2010)
Log Message:
-----------
webkit-gtk: update to version 1.2.5.

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff
    trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
    trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff
    trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff

Added Paths:
-----------
    trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff

Removed Paths:
-------------
    trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2010-10-07 13:24:30 UTC (rev 72214)
+++ trunk/dports/www/webkit-gtk/Portfile	2010-10-07 13:30:03 UTC (rev 72215)
@@ -5,7 +5,7 @@
 
 name		webkit-gtk
 epoch           1
-version		1.2.4
+version		1.2.5
 description	Apple's WebKit HTML rendering library for GTK+
 long_description ${description}
 maintainers	gmail.com:myschizobuddy devans
@@ -16,12 +16,12 @@
 
 distname        webkit-${version}
 
-checksums       md5     dc3a92dd0e8c2e70263fbfdf809b51a5 \
-                sha1    e4e31e6d5025d8c8d7ac81fe6d7c947918ce4790 \
-                rmd160  787997f6235911675726d903ff3b9549fb615fe5
+checksums       md5     09f04985665b9abf6f0d9956f86a6a31 \
+                sha1    2cd50e62a0c94bba8cc8a8466ea16fac1f9fc1ce \
+                rmd160  7510af4c5d15c06adf984a090a9e9550f5ea7147
 
 patchfiles      patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff \
-                TextBreakIterator.diff\
+                patch-TextBreakIterator.diff\
                 patch-WebCore-config-h.diff
 
 depends_lib	\
@@ -43,7 +43,7 @@
 # TODO: Use muniversal, so this is detected per arch
 configure.args	\
         --enable-jit=no \
-        --disable-introspection
+        --enable-introspection=no
 
 post-patch {
     reinplace "s|-licucore|-licui18n -licuuc|" ${worksrcpath}/configure

Deleted: trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff	2010-10-07 13:24:30 UTC (rev 72214)
+++ trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff	2010-10-07 13:30:03 UTC (rev 72215)
@@ -1,11 +0,0 @@
---- WebCore/platform/text/TextBreakIterator.h	2009-12-21 01:32:31.000000000 -0500
-+++ WebCore/platform/text/TextBreakIterator.new.h	2009-12-21 01:32:22.000000000 -0500
-@@ -26,7 +26,7 @@
- 
- namespace WebCore {
- 
--    class TextBreakIterator;
-+    typedef struct UBreakIterator TextBreakIterator;
- 
-     // Note: The returned iterator is good only until you get another iterator.
- 

Copied: trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff (from rev 72155, trunk/dports/www/webkit-gtk/files/TextBreakIterator.diff)
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff	                        (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-TextBreakIterator.diff	2010-10-07 13:30:03 UTC (rev 72215)
@@ -0,0 +1,11 @@
+--- WebCore/platform/text/TextBreakIterator.h	2009-12-21 01:32:31.000000000 -0500
++++ WebCore/platform/text/TextBreakIterator.new.h	2009-12-21 01:32:22.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+ namespace WebCore {
+ 
+-    class TextBreakIterator;
++    typedef struct UBreakIterator TextBreakIterator;
+ 
+     // Note: The returned iterator is good only until you get another iterator.
+ 

Modified: trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff	2010-10-07 13:24:30 UTC (rev 72214)
+++ trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff	2010-10-07 13:30:03 UTC (rev 72215)
@@ -1,6 +1,6 @@
---- WebCore/config.h.orig	2010-05-19 21:58:25.000000000 +0200
-+++ WebCore/config.h	2010-05-19 19:41:37.000000000 +0200
-@@ -129,7 +129,7 @@
+--- WebCore/config.h.orig	2010-09-10 06:20:33.000000000 -0700
++++ WebCore/config.h	2010-10-05 11:28:51.000000000 -0700
+@@ -126,7 +126,7 @@
  // Also generates errors on wx on Windows, presumably because these functions
  // are used from wx headers.
  #if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)

Modified: trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2010-10-07 13:24:30 UTC (rev 72214)
+++ trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff	2010-10-07 13:30:03 UTC (rev 72215)
@@ -1,5 +1,5 @@
---- WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp.orig	2009-06-11 17:05:32.000000000 -0700
-+++ WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp	2009-06-15 13:59:40.000000002 -0700
+--- WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp.orig	2010-09-10 06:20:34.000000000 -0700
++++ WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp	2010-10-05 11:28:51.000000000 -0700
 @@ -26,6 +26,13 @@
   */
  
@@ -27,4 +27,4 @@
 +
  #include <X11/Xlib.h>
  
- static void log(NPP instance, const char* format, ...)
+ extern "C" {

Modified: trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff	2010-10-07 13:24:30 UTC (rev 72214)
+++ trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff	2010-10-07 13:30:03 UTC (rev 72215)
@@ -1,6 +1,6 @@
---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2010-05-04 20:17:41.000000000 +0200
-+++ WebCore/plugins/gtk/PluginViewGtk.cpp	2010-05-04 20:22:10.000000000 +0200
-@@ -59,10 +59,13 @@
+--- WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2010-09-10 06:20:33.000000000 -0700
++++ WebCore/plugins/gtk/PluginViewGtk.cpp	2010-10-06 09:45:37.000000000 -0700
+@@ -60,10 +60,13 @@
  #include "runtime_root.h"
  #include <runtime/JSLock.h>
  #include <runtime/JSValue.h>
@@ -14,7 +14,7 @@
  #if defined(XP_UNIX)
  #include "gtk2xtbin.h"
  #define Bool int // this got undefined somewhere
-@@ -440,9 +443,9 @@
+@@ -441,9 +444,9 @@
          event->setDefaultHandled();
  }
  
@@ -25,7 +25,7 @@
      XEvent npEvent;
      initXEvent(&npEvent);
  
-@@ -452,10 +455,12 @@
+@@ -453,10 +456,12 @@
      event.detail = NotifyDetailNone;
  
      dispatchNPEvent(npEvent);
@@ -38,7 +38,7 @@
      XEvent npEvent;
      initXEvent(&npEvent);
  
-@@ -465,8 +470,8 @@
+@@ -466,8 +471,8 @@
      event.detail = NotifyDetailNone;
  
      dispatchNPEvent(npEvent);
@@ -48,7 +48,7 @@
  
  void PluginView::setParent(ScrollView* parent)
  {
-@@ -794,8 +799,8 @@
+@@ -797,8 +802,8 @@
      }
  
      if (m_isWindowed) {

Modified: trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff	2010-10-07 13:24:30 UTC (rev 72214)
+++ trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff	2010-10-07 13:30:03 UTC (rev 72215)
@@ -1,5 +1,5 @@
---- WebCore/plugins/gtk/gtk2xtbin.c.orig	2010-05-04 20:18:00.000000000 +0200
-+++ WebCore/plugins/gtk/gtk2xtbin.c	2010-05-04 20:22:36.000000000 +0200
+--- WebCore/plugins/gtk/gtk2xtbin.c.orig	2010-09-10 06:20:33.000000000 -0700
++++ WebCore/plugins/gtk/gtk2xtbin.c	2010-10-06 09:45:37.000000000 -0700
 @@ -41,7 +41,7 @@
   * The GtkXtBin widget allows for Xt toolkit code to be used
   * inside a GTK application.  
@@ -9,7 +9,7 @@
  #include "GtkVersioning.h"
  #include "xembed.h"
  #include "gtk2xtbin.h"
-@@ -942,3 +942,4 @@
+@@ -951,3 +951,4 @@
  
    return;
  }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101007/70af2277/attachment.html>

More information about the macports-changes mailing list