[104700] trunk/dports/www/webkit-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Sun Mar 31 17:56:52 PDT 2013
Revision: 104700
https://trac.macports.org/changeset/104700
Author: jeremyhu at macports.org
Date: 2013-03-31 17:56:51 -0700 (Sun, 31 Mar 2013)
Log Message:
-----------
webkit-gtk: Bump to 2.0.0
Modified Paths:
--------------
trunk/dports/www/webkit-gtk/Portfile
trunk/dports/www/webkit-gtk/files/execinfo.patch
trunk/dports/www/webkit-gtk/files/our-icu.patch
Added Paths:
-----------
trunk/dports/www/webkit-gtk/files/clang-assertions.patch
Removed Paths:
-------------
trunk/dports/www/webkit-gtk/files/optflags.patch
trunk/dports/www/webkit-gtk/files/xrender-check.patch
Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile 2013-03-31 23:40:48 UTC (rev 104699)
+++ trunk/dports/www/webkit-gtk/Portfile 2013-04-01 00:56:51 UTC (rev 104700)
@@ -6,9 +6,8 @@
PortGroup muniversal 1.0
name webkit-gtk
-epoch 2
-version 1.10.2
-revision 2
+epoch 1
+version 2.0.0
description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers jeremyhu devans
@@ -21,48 +20,44 @@
use_xz yes
distname webkitgtk-${version}
-checksums sha1 733ca23157eb8dd072d57becf325799c00bde630 \
- rmd160 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e \
- sha256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c
+checksums sha1 dd216769fec6039b9471ca57fcef70b9e8603892 \
+ rmd160 f718bf1d641ebeabdc7f3b306263382a70ed185c \
+ sha256 454cdc4beffc2010f83661059178e33b6d9a07bcd60d09eabdf5d7cda17b88e4
depends_lib \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:enchant \
+ port:geoclue \
port:gtk2 \
- port:libsoup \
+ port:harfbuzz \
port:icu \
- port:jpeg \
port:libxslt \
port:libpng \
+ port:libsecret \
+ port:libsoup \
+ port:mesa \
port:sqlite3 \
- port:enchant \
- port:xorg-libXt \
- port:geoclue \
- port:mesa
+ port:xorg-libXt
depends_build \
- port:pkgconfig \
- port:gtk-doc
+ port:gtk-doc \
+ port:pkgconfig
# case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
# our-icu.patch: No upstream bug report, probably not wanted
-# xrender-check.patch: https://bugs.webkit.org/show_bug.cgi?id=84095
-# bison-2.6.patch: http://trac.webkit.org/changeset/124099
+# ruby-1.8.patch: http://trac.macports.org/ticket/37740
# ListableHandler.patch: https://trac.macports.org/ticket/37828
-# optflags.patch: https://trac.macports.org/ticket/37839
# execinfo.patch: https://trac.macports.org/ticket/37882
# ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
# tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
-# bison-2.6.patch \
-
patchfiles \
+ clang-assertions.patch \
case-insensitive.patch \
our-icu.patch \
execinfo.patch \
- xrender-check.patch \
ruby-1.8.patch \
ListableHandler.patch \
- optflags.patch \
ppc.patch \
tiger.patch
@@ -75,68 +70,16 @@
--with-gtk=2.0 \
--disable-webkit2 \
--disable-introspection \
- --enable-link-prefetch \
- --enable-image-resizer \
--disable-video \
- --enable-media-statistics \
- --enable-media-stream \
--enable-svg \
--enable-geolocation \
- --enable-webgl \
- --enable-page-visibility-api \
- --enable-datagrid \
- --enable-mathml \
- --enable-web-timing \
- --enable-mhtml \
- --enable-microdata \
- --enable-mutation-observers
+ --enable-media-stream \
+ --enable-webgl
# https://bugs.webkit.org/show_bug.cgi?id=94488
configure.universal_args-delete --disable-dependency-tracking
-# Not enabled because marked as expirimental
-# --with-accelerated-compositing \
-# --enable-animation-api \
-# --enable-register-protocol-handler \
-
# In 1.10.1:
-# https://bugs.webkit.org/show_bug.cgi?id=99732
-configure.args-append --disable-jit
-
-# In 1.8.2:
-# ./Source/WebCore/workers/WorkerContext.h:225: error: 'IDBFactoryBackendInterface' was not declared in this scope
-# https://bugs.webkit.org/show_bug.cgi?id=94495
-# --enable-indexed-database \
-
-# In 1.8.2:
-# Source/WebCore/platform/gtk/ClipboardGtk.h:46: error: cannot allocate an object of abstract type 'WebCore::ClipboardGtk'
-# https://bugs.webkit.org/show_bug.cgi?id=94496
-# --enable-data-transfer-items \
-
-# In 1.8.2:
-# AsyncFileSystemCallbacks.h is missing
-# https://bugs.webkit.org/show_bug.cgi?id=94413
-# --enable-file-system \
-
-# 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*)
-# https://bugs.webkit.org/show_bug.cgi?id=94497
-# --enable-directory-upload \
-
-# In 1.8.2:
-# ./DerivedSources/webkit/WebKitDOMHTMLMediaElement.h:101: error: 'WebKitDOMUint8Array' has not been declared
-# --enable-media-source \
-
-# In 1.8.2:
-# ./DerivedSources/webkit/WebKitDOMDOMWindow.h:843: error: expected constructor, destructor, or type conversion before '*' token
-# https://bugs.webkit.org/show_bug.cgi?id=94498
-# https://bugs.webkit.org/show_bug.cgi?id=66477
-# --enable-notifications \
-
-# In 1.10.1:
# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp: In constructor 'WebCore::FFTFrame::FFTFrame(unsigned int)':
# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: 'm_complexData' was not declared in this scope
# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: 'GstFFTF32Complex' was not declared in this scope
@@ -149,22 +92,12 @@
# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'TRUE' was not declared in this scope
# --enable-web-audio \
-# 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'
-# https://bugs.webkit.org/show_bug.cgi?id=94499
-# --enable-input-color \
-
-pre-configure {
- # https://bugs.webkit.org/show_bug.cgi?id=106170
- configure.cppflags-append -I${prefix}/include/pango-1.0
-}
-
# We don't want to use the headers from the installed WebKit
configure.cppflags-delete -I${prefix}/include
+# google-test suite build fix
+configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
+
autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
use_autoreconf yes
autoreconf.args -fvi
@@ -174,17 +107,10 @@
compiler.blacklist-append gcc-4.0
}
-# BUILD FIX TODO: clang C++
-#
-# 1.10.1:
-# HTMLPropertiesCollection.h:52:42: error: 'namedItem' marked 'override' but does not override any member functions
-# https://bugs.webkit.org/show_bug.cgi?id=100618
-compiler.blacklist-append clang
+if {[string match *clang* ${configure.compiler}]} {
+ configure.cxxflags-append -Wno-c++11-extensions
+}
-#if {[string match "*clang*" ${configure.compiler}]} {
-# configure.cxxflags-append -std=c++11 -Wno-error=c++11-narrowing
-#}
-
post-patch {
# https://bugs.webkit.org/show_bug.cgi?id=88407
reinplace "s:echo -n:/bin/echo -n:g" \
@@ -221,28 +147,19 @@
port:mesa \
port:xorg-libXt
- # quartz-include-widgetbackingstorecairo.patch
- # https://trac.macports.org/ticket/38203
- # https://bugs.webkit.org/show_bug.cgi?id=111598
- patchfiles-append quartz-duplicate-symbols.patch \
+ # quartz-include-widgetbackingstorecairo.patch
+ # https://trac.macports.org/ticket/38203
+ # https://bugs.webkit.org/show_bug.cgi?id=111598
+ patchfiles-append quartz-duplicate-symbols.patch \
quartz-include-widgetbackingstorecairo.patch
}
-variant pango description {Use the pango font backend instead of freetype} {
- configure.args-append --with-font-backend=pango
-}
-
variant video description {Enable HTML5 video support using gstreamer} {
- depends_lib-append port:gstreamer010-gst-plugins-base
- configure.args-delete --disable-video
- configure.args-append --enable-video-track
+ depends_lib-append port:gstreamer1-gst-plugins-base
+ configure.args-delete --disable-video
+ configure.args-append --enable-video
}
-variant gnome_keyring description {Enable support for gnomekeyring} {
- depends_lib-append port:libgnome-keyring
- configure.args-append --enable-gnomekeyring
-}
-
default_variants +video
platform darwin {
Added: trunk/dports/www/webkit-gtk/files/clang-assertions.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/clang-assertions.patch (rev 0)
+++ trunk/dports/www/webkit-gtk/files/clang-assertions.patch 2013-04-01 00:56:51 UTC (rev 104700)
@@ -0,0 +1,12 @@
+--- Source/WTF/wtf/Assertions.h.orig 2013-01-18 15:03:57.000000000 -0800
++++ Source/WTF/wtf/Assertions.h 2013-01-18 15:04:46.000000000 -0800
+@@ -381,7 +381,8 @@ while (0)
+ // a function. Hence it uses macro naming convention.
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wmissing-noreturn"
+-static inline void UNREACHABLE_FOR_PLATFORM()
++__attribute__ ((__always_inline__))
++static __inline__ void UNREACHABLE_FOR_PLATFORM()
+ {
+ ASSERT_NOT_REACHED();
+ }
Modified: trunk/dports/www/webkit-gtk/files/execinfo.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/execinfo.patch 2013-03-31 23:40:48 UTC (rev 104699)
+++ trunk/dports/www/webkit-gtk/files/execinfo.patch 2013-04-01 00:56:51 UTC (rev 104700)
@@ -24,12 +24,12 @@
#if OS(ANDROID)
#include "android/log.h"
-@@ -268,7 +271,7 @@ void WTFReportArgumentAssertionFailure(c
+@@ -242,7 +245,7 @@ void WTFReportArgumentAssertionFailure(c
void WTFGetBacktrace(void** stack, int* size)
{
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)|| OS(LINUX)) && !OS(ANDROID)
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined
Deleted: trunk/dports/www/webkit-gtk/files/optflags.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/optflags.patch 2013-03-31 23:40:48 UTC (rev 104699)
+++ trunk/dports/www/webkit-gtk/files/optflags.patch 2013-04-01 00:56:51 UTC (rev 104700)
@@ -1,17 +0,0 @@
---- configure.ac.orig 2012-12-09 12:01:04.000000000 -0600
-+++ configure.ac 2013-01-30 16:08:56.000000000 -0600
-@@ -1215,14 +1215,6 @@
- AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
- fi
-
--# Add the appropriate 'O' level for optimized builds
--if test "$enable_optimizations" = "yes"; then
-- CXXFLAGS="$CXXFLAGS -O2"
-- CFLAGS="$CFLAGS -O2"
--else
-- CXXFLAGS="$CXXFLAGS -O0"
-- CFLAGS="$CFLAGS -O0"
--fi
-
- PKG_CHECK_MODULES([LIBSOUP],
- [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
Modified: trunk/dports/www/webkit-gtk/files/our-icu.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/our-icu.patch 2013-03-31 23:40:48 UTC (rev 104699)
+++ trunk/dports/www/webkit-gtk/files/our-icu.patch 2013-04-01 00:56:51 UTC (rev 104700)
@@ -1,13 +1,13 @@
---- 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
- # 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"
+--- Source/autotools/FindDependencies.m4.orig 2013-03-07 19:18:41.000000000 -0800
++++ Source/autotools/FindDependencies.m4 2013-03-07 19:18:48.000000000 -0800
+@@ -108,10 +108,6 @@ GLIB_GSETTINGS
+
+ # 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/xrender-check.patch
===================================================================
--- trunk/dports/www/webkit-gtk/files/xrender-check.patch 2013-03-31 23:40:48 UTC (rev 104699)
+++ trunk/dports/www/webkit-gtk/files/xrender-check.patch 2013-04-01 00:56:51 UTC (rev 104700)
@@ -1,11 +0,0 @@
---- configure.ac.orig 2012-04-19 23:01:55.000000000 -0700
-+++ configure.ac 2012-04-19 23:02:18.000000000 -0700
-@@ -1020,7 +1020,7 @@ fi
-
- # check for XRender under Linux/Unix. Some linkers require explicit
- # linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender
--if test "$os_win32" = "no"; then
-+if test "$with_target" = "x11"; then
- PKG_CHECK_MODULES([XRENDER], [xrender])
- AC_SUBST([XRENDER_CFLAGS])
- AC_SUBST([XRENDER_LIBS])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130331/1c4a7fad/attachment-0001.html>
More information about the macports-changes
mailing list