[68180] trunk/dports/www/webkit-gtk
elelay at macports.org
elelay at macports.org
Fri May 28 11:05:25 PDT 2010
Revision: 68180
http://trac.macports.org/changeset/68180
Author: elelay at macports.org
Date: 2010-05-28 11:05:22 -0700 (Fri, 28 May 2010)
Log Message:
-----------
updating to 1.2.1 and enabling quartz build, see #24622
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff
Added Paths:
-----------
trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff
trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.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
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2010-05-28 17:47:53 UTC (rev 68179)
+++ trunk/dports/www/webkit-gtk/Portfile 2010-05-28 18:05:22 UTC (rev 68180)
@@ -4,9 +4,8 @@
PortSystem 1.0
name webkit-gtk
-version 1.1.15.4
+version 1.2.1
revision 0
-epoch 1
description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers gmail.com:myschizobuddy devans
@@ -17,12 +16,13 @@
distname webkit-${version}
-checksums md5 47301fb7120421ac38bf714db8f5d428 \
- sha1 0778b130720756d880c2bbe9eeef79f35bcf861a \
- rmd160 dcfae86f7a2fc63b478741b370ac620d1659513e
+checksums md5 eb6f473d8d7be56ecd226e7dd55dcb9b \
+ sha1 ced564514f0be0a88c696e7afd6902d967d532a2 \
+ rmd160 f8c158b67fbcdfd9977edd530d5f8c15e402da6d
patchfiles patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff \
- TextBreakIterator.diff
+ TextBreakIterator.diff\
+ patch-WebCore-config-h.diff
depends_lib \
port:gtk2 \
@@ -39,7 +39,7 @@
# TODO: Use muniversal, so this is detected per arch
configure.args \
- --enable-jit=no
+ --enable-jit=no \
post-patch {
reinplace "s|-licucore|-licui18n -licuuc|" ${worksrcpath}/configure
@@ -48,6 +48,13 @@
file mkdir ${worksrcpath}/DerivedSources
}
+# see bug #24622
+variant quartz {
+ configure.args-append --with-font-backend=pango --with-target=quartz
+ patchfiles-append patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff \
+ patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff
+}
+
#
# video is now enabled by default so make the variant no_video
#
@@ -90,6 +97,12 @@
configure.args-append --disable-svg
}
+# compile bug when building 1.2.1 on Tiger,
+# see https://bugs.webkit.org/show_bug.cgi?id=39847
+platform darwin 8 {
+ patchfiles-append patch-JavascriptCore-wtf-FastMalloc.cpp.diff
+}
+
livecheck.type regex
livecheck.url http://webkitgtk.org/?page=download
livecheck.regex "webkit-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Added: trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-JavascriptCore-wtf-FastMalloc.cpp.diff 2010-05-28 18:05:22 UTC (rev 68180)
@@ -0,0 +1,17 @@
+--- JavaScriptCore/wtf/FastMalloc.cpp.orig 2010-05-27 19:00:10.000000000 +0200
++++ JavaScriptCore/wtf/FastMalloc.cpp 2010-05-27 19:00:40.000000000 +0200
+@@ -1381,14 +1381,12 @@
+ // Bytes allocated from system
+ uint64_t system_bytes_;
+
+-#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
+ // Number of pages kept in free lists that are still committed.
+ Length free_committed_pages_;
+
+ // Minimum number of free committed pages since last scavenge. (Can be 0 if
+ // we've committed new pages since the last scavenge.)
+ Length min_free_committed_pages_since_last_scavenge_;
+-#endif
+
+ bool GrowHeap(Length n);
+
Added: trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff
===================================================================
--- trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-WebCore-config-h.diff 2010-05-28 18:05:22 UTC (rev 68180)
@@ -0,0 +1,11 @@
+--- 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 @@
+ // Also generates errors on wx on Windows, presumably because these functions
+ // are used from wx headers.
+ #if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
+-#include <wtf/DisallowCType.h>
++//#include <wtf/DisallowCType.h>
+ #endif
+
+ #if COMPILER(MSVC)
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-05-28 17:47:53 UTC (rev 68179)
+++ trunk/dports/www/webkit-gtk/files/patch-WebKitTools-DumpRenderTree-gtk-TestNetscapePlugin-TestNetscapePlugin.cpp.diff 2010-05-28 18:05:22 UTC (rev 68180)
@@ -1,5 +1,5 @@
--- WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp.orig 2009-06-11 17:05:32.000000000 -0700
-+++ WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp 2009-06-15 13:59:40.000000000 -0700
++++ WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp 2009-06-15 13:59:40.000000002 -0700
@@ -26,6 +26,13 @@
*/
Added: 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 (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff 2010-05-28 18:05:22 UTC (rev 68180)
@@ -0,0 +1,60 @@
+--- 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 @@
+ #include "runtime_root.h"
+ #include <runtime/JSLock.h>
+ #include <runtime/JSValue.h>
++#include "NotImplemented.h"
+
+ #include <gdkconfig.h>
+ #include <gtk/gtk.h>
+
++#undef XP_UNIX
++
+ #if defined(XP_UNIX)
+ #include "gtk2xtbin.h"
+ #define Bool int // this got undefined somewhere
+@@ -440,9 +443,9 @@
+ event->setDefaultHandled();
+ }
+
+-#if defined(XP_UNIX)
+ void PluginView::handleFocusInEvent()
+ {
++#if defined(XP_UNIX)
+ XEvent npEvent;
+ initXEvent(&npEvent);
+
+@@ -452,10 +455,12 @@
+ event.detail = NotifyDetailNone;
+
+ dispatchNPEvent(npEvent);
++#endif
+ }
+
+ void PluginView::handleFocusOutEvent()
+ {
++#if defined(XP_UNIX)
+ XEvent npEvent;
+ initXEvent(&npEvent);
+
+@@ -465,8 +470,8 @@
+ event.detail = NotifyDetailNone;
+
+ dispatchNPEvent(npEvent);
+-}
+ #endif
++}
+
+ void PluginView::setParent(ScrollView* parent)
+ {
+@@ -794,8 +799,8 @@
+ }
+
+ if (m_isWindowed) {
+-#if defined(XP_UNIX)
+ GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
++#if defined(XP_UNIX)
+
+ if (m_needsXEmbed) {
+ // If our parent is not anchored the startup process will
Added: 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 (rev 0)
+++ trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff 2010-05-28 18:05:22 UTC (rev 68180)
@@ -0,0 +1,16 @@
+--- 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
+@@ -41,7 +41,7 @@
+ * The GtkXtBin widget allows for Xt toolkit code to be used
+ * inside a GTK application.
+ */
+-
++#if 0
+ #include "GtkVersioning.h"
+ #include "xembed.h"
+ #include "gtk2xtbin.h"
+@@ -942,3 +942,4 @@
+
+ return;
+ }
++#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100528/c369855f/attachment.html>
More information about the macports-changes
mailing list