[96758] trunk/dports/www/webkit-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Sat Aug 18 02:22:04 PDT 2012
Revision: 96758
https://trac.macports.org/changeset/96758
Author: jeremyhu at macports.org
Date: 2012-08-18 02:22:00 -0700 (Sat, 18 Aug 2012)
Log Message:
-----------
webkit-gtk: Bump to 1.8.2
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
trunk/dports/www/webkit-gtk/files/our-icu.patch
Removed Paths:
-------------
trunk/dports/www/webkit-gtk/files/glib-2.32.patch
trunk/dports/www/webkit-gtk/files/pango.patch
trunk/dports/www/webkit-gtk/files/quartz.patch
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2012-08-18 06:51:13 UTC (rev 96757)
+++ trunk/dports/www/webkit-gtk/Portfile 2012-08-18 09:22:00 UTC (rev 96758)
@@ -6,23 +6,22 @@
name webkit-gtk
epoch 1
-version 1.6.3
-revision 5
+version 1.8.2
description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers devans
categories www gnome
platforms darwin freebsd
-license LGPL-2+ BSD
+license LGPL-2+ BSD
homepage http://webkitgtk.org/
master_sites http://webkitgtk.org/releases/
use_xz yes
distname webkit-${version}
-checksums md5 c476d9335419df061510d31e21175df1 \
- sha1 7df69608ef2ce9dd7328353b4ee34f69271cd43b \
- rmd160 cc319ffe4c2810663ae05b90e69d9495f5c3f0aa
+checksums sha1 138f86894e0a7ed0a41c18c4ac30fcaf961d8d79 \
+ rmd160 e8b3b77143ba8a0711b9ff68872223b7a39af6ce \
+ sha256 0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6
depends_lib \
port:gtk2 \
@@ -32,7 +31,6 @@
port:sqlite3 \
port:enchant \
port:xorg-libXt \
- port:libgeoip \
port:geoclue
depends_build \
@@ -43,9 +41,6 @@
case-insensitive.patch \
our-icu.patch \
xrender-check.patch \
- pango.patch \
- quartz.patch \
- glib-2.32.patch \
bison-2.6.patch
configure.args \
@@ -56,64 +51,63 @@
--disable-video \
--enable-svg \
--enable-geolocation \
- --enable-client-based-geolocation \
--enable-webgl \
--enable-page-visibility-api \
--enable-datagrid \
--enable-mathml \
- --enable-web-timing
+ --enable-web-timing \
+ --enable-mhtml \
+ --enable-microdata \
+ --enable-mutation-observers
# Not enabled because marked as expirimental
-# --enable-3d-rendering \
+# --with-accelerated-compositing \
# --enable-animation-api \
+# --enable-register-protocol-handler \
-
-# In 1.6.3:
-# Source/WebCore/bindings/js/JSDOMBinding.h:242: error: no matching function for call to 'toJS(JSC::ExecState*&, WebCore::JSDOMGlobalObject*&, WebCore::IDBDatabaseException*)'
+# In 1.8.2:
+# ./Source/WebCore/workers/WorkerContext.h:225: error: 'IDBFactoryBackendInterface' was not declared in this scope
# --enable-indexed-database \
-# In 1.6.3:
+# In 1.8.2:
# Source/WebCore/platform/gtk/ClipboardGtk.h:46: error: cannot allocate an object of abstract type 'WebCore::ClipboardGtk'
# --enable-data-transfer-items \
-# In 1.6.3:
-# Source/WebCore/bindings/js/JSEntrySyncCustom.cpp:53: error: 'getDOMObjectWrapper' was not declared in this scope
+# In 1.8.2:
+# AsyncFileSystemCallbacks.h is missing
+# https://bugs.webkit.org/show_bug.cgi?id=94413
# --enable-file-system \
-# In 1.6.3:
-# Source/WebKit/gtk/webkit/webkitwebview.cpp:3397: error: cannot allocate an object of abstract type 'WebKit::ChromeClient'
+# In 1.8.2:
+# Source/WebKit/gtk/webkit/webkitwebview.cpp: In function 'void webkit_web_view_init(WebKitWebView*)':
+# Source/WebKit/gtk/webkit/webkitwebview.cpp:3422: error: cannot allocate an object of abstract type 'WebKit::ChromeClient'
+# ./Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h:43: note: because the following virtual functions are pure within 'WebKit::ChromeClient':
+# ./Source/WebCore/page/ChromeClient.h:232: note: virtual void WebCore::ChromeClient::enumerateChosenDirectory(WebCore::FileChooser*)
# --enable-directory-upload \
-# In 1.6.3:
+# In 1.8.2:
# ./DerivedSources/webkit/WebKitDOMHTMLMediaElement.h:101: error: 'WebKitDOMUint8Array' has not been declared
# --enable-media-source \
# --enable-media-statistics \
# --enable-media-stream \
-# In 1.6.3:
-# Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp:762: error: 'fatal' was not declared in this scope
-# --enable-xhtmlmp \
-
-# In 1.6.3:
-# ./DerivedSources/webkit/WebKitDOMDOMWindow.h:821: error: expected constructor, destructor, or type conversion before '*' token
+# In 1.8.2:
+# ./DerivedSources/webkit/WebKitDOMDOMWindow.h:843: error: expected constructor, destructor, or type conversion before '*' token
# --enable-notifications \
# In 1.6.3:
-# AudioSourceProvider.h is missing. It is present in 1.9.6, so we should try again when a newer version is working
+# AudioBufferCallback.h is missing
# --enable-web-audio \
-# In 1.6.3:
-# Source/WebCore/html/ColorInputType.cpp:124: error: declaration of 'virtual void WebCore::ColorInputType::setValue(const WTF::String&, bool, bool)' outside of class is not definition
-# Source/WebCore/html/ColorInputType.cpp:125: error: expected unqualified-id before '{' token
-# Source/WebCore/html/ColorInputType.cpp:211: error: expected `}' at end of input
+# In 1.8.2:
+# Source/WebCore/html/ColorInputType.cpp: In member function 'virtual void WebCore::ColorInputType::createShadowSubtree()':
+# Source/WebCore/html/ColorInputType.cpp:119: error: 'class WebCore::HTMLInputElement' has no member named 'shadowRoot'
+# Source/WebCore/html/ColorInputType.cpp: In member function 'WebCore::HTMLElement* WebCore::ColorInputType::shadowColorSwatch() const':
+# Source/WebCore/html/ColorInputType.cpp:188: error: 'class WebCore::HTMLInputElement' has no member named 'shadowRoot'
# --enable-input-color \
-# In 1.6.3:
-# Source/WebCore/html/HTMLInputElement.cpp:1698: error: '((const WebCore::HTMLInputElement*)this)->WebCore::HTMLInputElement::m_maxInputCharsAllowed' cannot be used as a function
-# --enable-wcss \
-
-# In 1.6.3
-# DerivedSources/WebCore/JSStorageInfoQuotaCallback.cpp:67: error: no matching function for call to 'toJS(JSC::ExecState*&, WebCore::JSDOMGlobalObject*, long long unsigned int&)'
+# In 1.8.2
+# DerivedSources/WebCore/JSDOMWindow.cpp:6255: error: no matching function for call to 'toJS(JSC::ExecState*&, WebCore::JSDOMGlobalObject*, WebCore::StorageInfo*)'
# --enable-quota \
# We don't want to use the headers from the installed WebKit
@@ -125,6 +119,9 @@
# BUILD FIX TODO: clang C++
# clang has trouble with webkit-1.6.3's C++ as of 2012.04.19
+#
+# 1.8.2:
+# ./Source/WebCore/editing/Editor.h:388:18: error: 'willDetachPage' marked 'override' but does not override any member functions
if {${configure.compiler} == "clang"} {
configure.compiler llvm-gcc-4.2
}
@@ -140,6 +137,10 @@
reinplace "s/mkdir_p/MKDIR_P/" \
${worksrcpath}/GNUmakefile.am \
${worksrcpath}/Source/WebKit/gtk/po/GNUmakefile.am
+
+ # https://bugs.webkit.org/show_bug.cgi?id=88407
+ reinplace "s:echo -n:/bin/echo -n:g" \
+ ${worksrcpath}/Source/WebCore/GNUmakefile.am
}
# TODO: fix this for muniversal
@@ -161,6 +162,7 @@
variant video description {Enable HTML5 video support using gstreamer} {
depends_lib-append port:gst-plugins-base
configure.args-delete --disable-video
+ configure.args-append --enable-video-track
}
variant gnome_keyring description {Enable support for gnomekeyring} {
Deleted: trunk/dports/www/webkit-gtk/files/glib-2.32.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/glib-2.32.patch 2012-08-18 06:51:13 UTC (rev 96757)
+++ trunk/dports/www/webkit-gtk/files/glib-2.32.patch 2012-08-18 09:22:00 UTC (rev 96758)
@@ -1,12 +0,0 @@
---- Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.orig 2012-04-12 18:11:26.000000000 -0700
-+++ Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2012-04-12 18:11:49.000000000 -0700
-@@ -28,6 +28,9 @@
- #include <wtf/Assertions.h>
- #include <wtf/Noncopyable.h>
-
-+#include <glib.h>
-+#include <gio/gio.h>
-+
- extern "C" void g_free(void*);
-
- namespace WTF {
Modified: trunk/dports/www/webkit-gtk/files/our-icu.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/our-icu.patch 2012-08-18 06:51:13 UTC (rev 96757)
+++ trunk/dports/www/webkit-gtk/files/our-icu.patch 2012-08-18 09:22:00 UTC (rev 96758)
@@ -1,13 +1,13 @@
---- Source/autotools/webkit.m4.orig 2012-02-01 12:37:41.000000000 -0800
-+++ Source/autotools/webkit.m4 2012-06-03 12:05:52.000000000 -0700
-@@ -134,10 +134,6 @@ AC_MSG_RESULT([$with_unicode_backend])
-
+--- configure.ac.orig 2012-08-06 06:45:10.000000000 -0700
++++ configure.ac 2012-08-17 16:40:51.000000000 -0700
+@@ -409,10 +409,6 @@ AC_MSG_RESULT([$with_unicode_backend])
if test "$with_unicode_backend" = "icu"; then
- case "$host" in
-- *-*-darwin*)
-- UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
-- UNICODE_LIBS="-licucore"
-- ;;
- *-*-mingw*)
- UNICODE_CFLAGS=""
- UNICODE_LIBS="-licuin -licuuc"
+ # TODO: use pkg-config (after CFLAGS in their .pc files are cleaned up)
+ case "$host" in
+- *-*-darwin*)
+- UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
+- UNICODE_LIBS="-licucore"
+- ;;
+ *-*-mingw*)
+ UNICODE_CFLAGS=""
+ UNICODE_LIBS="-licui18n -licuuc"
Deleted: trunk/dports/www/webkit-gtk/files/pango.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/pango.patch 2012-08-18 06:51:13 UTC (rev 96757)
+++ trunk/dports/www/webkit-gtk/files/pango.patch 2012-08-18 09:22:00 UTC (rev 96758)
@@ -1,26 +0,0 @@
---- Source/WebCore/GNUmakefile.am (revision 106782)
-+++ Source/WebCore/GNUmakefile.am (revision 106847)
-@@ -836,4 +836,5 @@
- $(LIBXML_CFLAGS) \
- $(LIBXSLT_CFLAGS) \
-+ $(PANGO_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(UNICODE_CFLAGS) \
---- Tools/GNUmakefile.am (revision 106786)
-+++ Tools/GNUmakefile.am (revision 106847)
-@@ -66,4 +66,5 @@
- $(CAIRO_CFLAGS) \
- $(LIBSOUP_CFLAGS) \
-+ $(PANGO_CFLAGS) \
- -I$(top_builddir)/DerivedSources \
- -I$(top_builddir)/DerivedSources/WebCore
---- Source/WebCore/GNUmakefile.am.orig 2012-04-19 22:57:39.000000000 -0700
-+++ Source/WebCore/GNUmakefile.am 2012-04-19 22:58:17.000000000 -0700
-@@ -134,6 +134,7 @@ endif # END USE_FREETYPE
- # ---
- if USE_PANGO
- webcoregtk_cppflags += \
-+ $(PANGO_CFLAGS) \
- -DWTF_USE_PANGO=1 \
- -I$(srcdir)/Source/WebCore/platform/graphics/pango
- endif # END USE_PANGO
Deleted: trunk/dports/www/webkit-gtk/files/quartz.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/quartz.patch 2012-08-18 06:51:13 UTC (rev 96757)
+++ trunk/dports/www/webkit-gtk/files/quartz.patch 2012-08-18 09:22:00 UTC (rev 96758)
@@ -1,25 +0,0 @@
---- Source/WebCore/GNUmakefile.list.am.orig 2011-10-15 01:27:23.000000000 -0400
-+++ Source/WebCore/GNUmakefile.list.am 2012-04-20 13:58:55.000000000 -0400
-@@ -3986,7 +3986,6 @@
- Source/WebCore/platform/gtk/GtkUtilities.cpp \
- Source/WebCore/platform/gtk/GtkUtilities.h \
- Source/WebCore/platform/gtk/GtkWidgetBackingStoreCairo.cpp \
-- Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
- Source/WebCore/platform/gtk/GeolocationServiceGtk.cpp \
- Source/WebCore/platform/gtk/GeolocationServiceGtk.h \
- Source/WebCore/platform/gtk/GOwnPtrGtk.cpp \
-@@ -4031,11 +4030,12 @@
- Source/WebCore/platform/gtk/WidgetGtk.cpp \
- Source/WebCore/platform/gtk/WidgetRenderingContext.cpp \
- Source/WebCore/platform/gtk/WidgetRenderingContext.h \
-- Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
-- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+ Source/WebCore/plugins/gtk/PluginPackageGtk.cpp
-
- if TARGET_X11
- webcoregtk_sources += \
-+ Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
-+ Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
- Source/WebCore/plugins/gtk/gtk2xtbin.c \
- Source/WebCore/plugins/gtk/gtk2xtbin.h \
- Source/WebCore/plugins/gtk/xembed.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120818/c0d9840e/attachment-0001.html>
More information about the macports-changes
mailing list