[114232] trunk/dports/www
jeremyhu at macports.org
jeremyhu at macports.org
Tue Dec 3 01:13:01 PST 2013
Revision: 114232
https://trac.macports.org/changeset/114232
Author: jeremyhu at macports.org
Date: 2013-12-03 01:13:01 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
webkit-gtk-2.0: Legacy version of webkit-gtk which supports older C++ runtimes
Added Paths:
-----------
trunk/dports/www/webkit-gtk-2.0/
trunk/dports/www/webkit-gtk-2.0/Portfile
trunk/dports/www/webkit-gtk-2.0/files/
trunk/dports/www/webkit-gtk-2.0/files/ListableHandler.patch
trunk/dports/www/webkit-gtk-2.0/files/case-insensitive.patch
trunk/dports/www/webkit-gtk-2.0/files/clang-assertions.patch
trunk/dports/www/webkit-gtk-2.0/files/execinfo.patch
trunk/dports/www/webkit-gtk-2.0/files/our-icu.patch
trunk/dports/www/webkit-gtk-2.0/files/patch-freetype-includes.diff
trunk/dports/www/webkit-gtk-2.0/files/ppc.patch
trunk/dports/www/webkit-gtk-2.0/files/quartz-duplicate-symbols.patch
trunk/dports/www/webkit-gtk-2.0/files/quartz-include-widgetbackingstorecairo.patch
trunk/dports/www/webkit-gtk-2.0/files/quartz-webcore.patch
trunk/dports/www/webkit-gtk-2.0/files/ruby-1.8.patch
trunk/dports/www/webkit-gtk-2.0/files/tiger.patch
Added: trunk/dports/www/webkit-gtk-2.0/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/Portfile (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/Portfile 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,257 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+PortGroup conflicts_build 1.0
+PortGroup muniversal 1.0
+PortGroup compiler_blacklist_versions 1.0
+
+name webkit-gtk-2.0
+version 2.0.4
+description Apple's WebKit HTML rendering library for GTK+
+long_description ${description}
+maintainers jeremyhu devans
+categories www gnome
+platforms darwin freebsd
+license LGPL-2+ BSD
+homepage http://webkitgtk.org/
+master_sites http://webkitgtk.org/releases/
+
+use_xz yes
+distname webkitgtk-${version}
+
+dist_subdir webkit-gtk
+
+checksums sha1 3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a \
+ rmd160 19643cac3f53928757a7c3fe8ea33f144a581456 \
+ sha256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f
+
+depends_lib \
+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:bison \
+ port:flex \
+ port:enchant \
+ port:geoclue \
+ port:gobject-introspection \
+ port:harfbuzz-icu \
+ port:libxslt \
+ port:libpng \
+ port:libsecret \
+ port:libsoup \
+ port:mesa \
+ port:sqlite3 \
+ port:webp \
+ port:xorg-libXt
+
+depends_build \
+ 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
+# ruby-1.8.patch: http://trac.macports.org/ticket/37740
+# ListableHandler.patch: https://trac.macports.org/ticket/37828
+# 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
+# quartz-webcore.patch: No upstream bug, http://trac.macports.org/ticket/39898
+
+patchfiles \
+ clang-assertions.patch \
+ case-insensitive.patch \
+ our-icu.patch \
+ execinfo.patch \
+ ruby-1.8.patch \
+ ListableHandler.patch \
+ ppc.patch \
+ tiger.patch \
+ quartz-webcore.patch \
+ patch-freetype-includes.diff
+
+conflicts_build google-test
+
+# https://trac.macports.org/ticket/36329
+configure.python /usr/bin/python
+
+configure.args \
+ --disable-webkit2 \
+ --enable-introspection \
+ --disable-video \
+ --enable-svg \
+ --enable-geolocation \
+ --enable-webgl
+
+subport webkit-gtk3-2.0 {
+ conflicts webkit-gtk3
+
+ depends_lib-append port:gtk3
+ configure.args-append --with-gtk=3.0
+
+#
+# move gtk-docs to allow parallel install with webkit-gtk
+#
+ if {[variant_isset universal]} {
+#
+# using diff to merge derived include files sometimes
+# results in a corrupted file due to nested /* */ blocks
+#
+ global merger_dont_diff
+ set merger_dont_diff "${prefix}/include/webkitgtk-3.0/webkitdom/WebKitDOMNavigator.h"
+ merger-post-destroot {
+ foreach arch ${universal_archs_to_use} {
+ set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html
+ move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+ move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
+ }
+ }
+ } else {
+ post-destroot {
+ set docpath ${destroot}${prefix}/share/gtk-doc/html
+ move ${docpath}/webkitgtk ${docpath}/webkitgtk3
+ move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
+ }
+ }
+}
+
+if {${name} == ${subport}} {
+ conflicts webkit-gtk
+
+ depends_lib-append port:gtk2
+ configure.args-append --with-gtk=2.0
+}
+
+# https://bugs.webkit.org/show_bug.cgi?id=94488
+configure.universal_args-delete --disable-dependency-tracking
+
+# configure checks that we're clang 3.0, gcc 4.7, or better
+compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
+compiler.blacklist-append macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
+compiler.blacklist-append {clang < 300} macports-clang-2.9
+
+# gobject-introspection uses g-ir-scanner, which uses $CC from env
+if {[variant_isset universal]} {
+ foreach arch ${configure.universal_archs} {
+ lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
+ lappend merger_destroot_args(${arch}) CC='${configure.cc} -arch ${arch}'
+ }
+} else {
+ build.args-append CC="${configure.cc} ${configure.cc_archflags}"
+ destroot.args-append CC="${configure.cc} ${configure.cc_archflags}"
+}
+
+# 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
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: no matching function for call to 'fastNewArray(size_t)'
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:50: error: 'gst_fft_next_fast_length' was not declared in this scope
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'm_fft' was not declared in this scope
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'FALSE' was not declared in this scope
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'gst_fft_f32_new' was not declared in this scope
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'm_inverseFft' was not declared in this scope
+# Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'TRUE' was not declared in this scope
+# --enable-web-audio \
+
+# 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 -fi
+
+lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
+
+post-patch {
+ # https://bugs.webkit.org/show_bug.cgi?id=88407
+ reinplace "s:echo -n:/bin/echo -n:g" \
+ ${worksrcpath}/Source/WebCore/GNUmakefile.am
+
+ # https://bugs.webkit.org/show_bug.cgi?id=99683
+ reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
+ ${worksrcpath}/Source/JavaScriptCore/heap/VTableSpectrum.cpp \
+ ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
+ ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp
+
+ # https://bugs.webkit.org/show_bug.cgi?id=58737
+ reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
+ ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp
+}
+
+# TODO: fix this for muniversal
+# keep it for debug
+#post-destroot {
+# file copy ${worksrcpath}/Programs/.libs/GtkLauncher ${destroot}${prefix}/bin
+#}
+
+build.args-append V=1
+
+# see bug #24622
+variant quartz {
+ configure.args-append --with-target=quartz
+
+ # TODO: See if this will build with OpenGL.framework
+ configure.args-delete --enable-webgl
+ depends_lib-delete \
+ 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
+}
+
+variant video description {Enable HTML5 video support using gstreamer} {
+ depends_lib-append port:gstreamer1-gst-plugins-base
+ configure.args-delete --disable-video
+ configure.args-append --enable-video
+}
+
+default_variants +video
+
+platform darwin {
+ if {${os.major} < 10} {
+ depends_build-append port:python27
+ # https://trac.macports.org/ticket/35793
+ configure.python ${prefix}/bin/python2.7
+
+ # https://trac.macports.org/ticket/38682
+ configure.optflags-append -fno-blocks
+ }
+
+ if {[string match "*10.5*" ${configure.sdkroot}] ||
+ (${os.major} == 9 && ${configure.sdkroot} == "")} {
+
+ # https://trac.macports.org/ticket/37418
+ configure.cppflags-append -D__MAC_OS_X_VERSION_MAX_ALLOWED=1050
+ }
+
+ if {[string match "*10.4*" ${configure.sdkroot}] ||
+ (${os.major} == 8 && ${configure.sdkroot} == "")} {
+
+ # https://trac.macports.org/ticket/37828
+ configure.cppflags-append -D__MAC_OS_X_VERSION_MAX_ALLOWED=1040
+ }
+
+ if {$macosx_deployment_target == "10.4" ||
+ (${os.major} == 8 && $macosx_deployment_target == "")} {
+
+ # https://trac.macports.org/ticket/37828
+ configure.cppflags-append -D__MAC_OS_X_VERSION_MIN_REQUIRED=1040
+ }
+}
+
+platform powerpc {
+ # https://trac.macports.org/ticket/37839
+ configure.optflags-replace -O2 -Os
+}
+
+if {[string match *clang* ${configure.compiler}]} {
+ configure.cxxflags-append -Wno-c++11-extensions
+}
+
+livecheck.type none
Property changes on: trunk/dports/www/webkit-gtk-2.0/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/www/webkit-gtk-2.0/files/ListableHandler.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/ListableHandler.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/ListableHandler.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,10 @@
+--- Source/JavaScriptCore/heap/ListableHandler.h.orig 2012-11-23 14:12:16.000000000 -0600
++++ Source/JavaScriptCore/heap/ListableHandler.h 2013-01-31 20:00:22.000000000 -0600
+@@ -55,6 +55,7 @@
+ friend class GCThreadSharedData;
+ friend class SlotVisitor;
+
++public:
+ class List {
+ WTF_MAKE_NONCOPYABLE(List);
+ public:
Added: trunk/dports/www/webkit-gtk-2.0/files/case-insensitive.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/case-insensitive.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/case-insensitive.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,13 @@
+--- Source/WebCore/platform/text/TextCodecUTF8.h.orig 2012-04-12 17:24:24.000000000 -0700
++++ Source/WebCore/platform/text/TextCodecUTF8.h 2012-04-12 17:46:05.000000000 -0700
+@@ -28,6 +28,9 @@
+
+ #include "TextCodec.h"
+
++/* https://bugs.webkit.org/show_bug.cgi?id=65811 */
++#include "../../../JavaScriptCore/icu/unicode/utf8.h"
++
+ namespace WebCore {
+
+ class TextCodecUTF8 : public TextCodec {
+
Added: trunk/dports/www/webkit-gtk-2.0/files/clang-assertions.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/clang-assertions.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/clang-assertions.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -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();
+ }
Added: trunk/dports/www/webkit-gtk-2.0/files/execinfo.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/execinfo.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/execinfo.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,35 @@
+diff -Naurp webkitgtk-1.10.2.orig/Source/JavaScriptCore/tools/CodeProfile.cpp webkitgtk-1.10.2/Source/JavaScriptCore/tools/CodeProfile.cpp
+--- Source/JavaScriptCore/tools/CodeProfile.cpp 2013-01-31 22:39:07.000000000 -0800
++++ Source/JavaScriptCore/tools/CodeProfile.cpp 2013-01-31 22:42:01.000000000 -0800
+@@ -36,7 +36,6 @@
+ #if OS(DARWIN)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+-#include <execinfo.h>
+ #endif
+
+ namespace JSC {
+diff -Naurp webkitgtk-1.10.2.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-1.10.2/Source/WTF/wtf/Assertions.cpp
+--- Source/WTF/wtf/Assertions.cpp 2012-11-23 12:12:16.000000000 -0800
++++ Source/WTF/wtf/Assertions.cpp 2013-01-31 22:43:57.000000000 -0800
+@@ -61,8 +61,11 @@
+ #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
++#include <AvailabilityMacros.h>
++#if !OS(DARWIN) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
+ #include <execinfo.h>
+ #endif
++#endif
+
+ #if OS(ANDROID)
+ #include "android/log.h"
+@@ -242,7 +245,7 @@ void WTFReportArgumentAssertionFailure(c
+
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#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
Added: trunk/dports/www/webkit-gtk-2.0/files/our-icu.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/our-icu.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/our-icu.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,13 @@
+--- 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"
Added: trunk/dports/www/webkit-gtk-2.0/files/patch-freetype-includes.diff
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/patch-freetype-includes.diff (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/patch-freetype-includes.diff 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,14 @@
+--- Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp 2013-02-12 08:22:45.000000000 -0800
++++ Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp.orig 2013-11-28 23:57:49.000000000 -0800
+@@ -39,8 +39,9 @@
+ #include "TextEncoding.h"
+ #include <cairo-ft.h>
+ #include <cairo.h>
+-#include <freetype/freetype.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_TRUETYPE_TABLES_H
+ #include <hb.h>
+ #include <wtf/text/CString.h>
+
Added: trunk/dports/www/webkit-gtk-2.0/files/ppc.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/ppc.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/ppc.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,15 @@
+--- Source/WebCore/platform/Length.cpp.orig 2012-11-23 14:12:17.000000000 -0600
++++ Source/WebCore/platform/Length.cpp 2013-01-28 15:38:17.000000000 -0600
+@@ -249,10 +249,12 @@
+ return isCalculated() && (calculationValue() == o.calculationValue() || *calculationValue() == *o.calculationValue());
+ }
+
++#ifndef __ppc__
+ struct SameSizeAsLength {
+ int32_t value;
+ int32_t metaData;
+ };
+ COMPILE_ASSERT(sizeof(Length) == sizeof(SameSizeAsLength), length_should_stay_small);
++#endif
+
+ } // namespace WebCore
Added: trunk/dports/www/webkit-gtk-2.0/files/quartz-duplicate-symbols.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/quartz-duplicate-symbols.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/quartz-duplicate-symbols.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,13 @@
+--- Source/WebCore/plugins/PluginPackageNone.cpp.orig 2012-10-29 20:40:46.000000000 -0400
++++ Source/WebCore/plugins/PluginPackageNone.cpp 2012-10-29 20:40:46.000000000 -0400
+@@ -28,10 +28,6 @@
+
+ namespace WebCore {
+
+-void PluginPackage::determineQuirks(const String&)
+-{
+-}
+-
+ bool PluginPackage::fetchInfo()
+ {
+ return false;
Added: trunk/dports/www/webkit-gtk-2.0/files/quartz-include-widgetbackingstorecairo.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/quartz-include-widgetbackingstorecairo.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/quartz-include-widgetbackingstorecairo.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,12 @@
+--- Source/WebCore/GNUmakefile.list.am.old 2013-02-24 19:01:51.000000000 +0100
++++ Source/WebCore/GNUmakefile.list.am 2013-02-24 19:03:41.000000000 +0100
+@@ -5949,6 +5949,9 @@
+ webcore_sources += \
+ Source/WebCore/plugins/PluginPackageNone.cpp \
+ Source/WebCore/plugins/PluginViewNone.cpp
++# in quartz mode include cairo widgetbackingstore implementation also
++webcoregtk_sources += \
++ Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
+ endif # END TARGET_WIN32
+ endif # END TARGET_X11
+
Added: trunk/dports/www/webkit-gtk-2.0/files/quartz-webcore.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/quartz-webcore.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/quartz-webcore.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,33 @@
+--- Source/WebCore/bridge/npruntime_internal-orig.h 2013-07-19 00:04:01.000000000 -0700
++++ Source/WebCore/bridge/npruntime_internal.h 2013-08-12 16:04:17.000000000 -0700
+@@ -29,7 +29,7 @@
+ #include "npfunctions.h"
+ #include "npruntime.h"
+
+-#ifdef XP_UNIX
++#if PLATFORM(X11)
+ #include <X11/Xresource.h>
+
+ #undef None
+--- Source/WebCore/plugins/PluginView-orig.cpp 2013-07-19 00:04:11.000000000 -0700
++++ Source/WebCore/plugins/PluginView.cpp 2013-08-12 17:48:20.000000000 -0700
+@@ -865,7 +865,7 @@
+ , m_contextRef(0)
+ , m_fakeWindow(0)
+ #endif
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+ , m_hasPendingGeometryChange(true)
+ , m_drawable(0)
+ , m_visual(0)
+--- Source/WebCore/plugins/PluginView-orig.h 2013-07-19 00:04:11.000000000 -0700
++++ Source/WebCore/plugins/PluginView.h 2013-08-12 16:09:21.000000000 -0700
+@@ -427,7 +427,7 @@
+ Point mousePosForPlugin(MouseEvent* event = 0) const;
+ #endif
+
+-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
++#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+ bool m_hasPendingGeometryChange;
+ Pixmap m_drawable;
+ Visual* m_visual;
Added: trunk/dports/www/webkit-gtk-2.0/files/ruby-1.8.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/ruby-1.8.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/ruby-1.8.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,15 @@
+--- Source/JavaScriptCore/offlineasm/offsets.rb.orig 2012-11-23 14:12:16.000000000 -0600
++++ Source/JavaScriptCore/offlineasm/offsets.rb 2013-01-22 19:35:47.000000000 -0600
+@@ -109,7 +109,11 @@
+ File.open(file, "r") {
+ | inp |
+ loop {
+- byte = inp.getbyte
++ if RUBY_VERSION >= '1.8.7'
++ byte = inp.getbyte
++ else
++ byte = inp.getc
++ end
+ break unless byte
+ fileBytes << byte
+ }
Added: trunk/dports/www/webkit-gtk-2.0/files/tiger.patch
===================================================================
--- trunk/dports/www/webkit-gtk-2.0/files/tiger.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/tiger.patch 2013-12-03 09:13:01 UTC (rev 114232)
@@ -0,0 +1,14 @@
+--- Source/WTF/wtf/Platform.h.orig 2012-10-17 21:57:04.000000000 -0700
++++ Source/WTF/wtf/Platform.h 2012-10-17 21:57:40.000000000 -0700
+@@ -321,8 +321,10 @@
+ #ifdef __APPLE__
+ #define WTF_OS_DARWIN 1
+
+-#include <Availability.h>
+ #include <AvailabilityMacros.h>
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
++#include <Availability.h>
++#endif
+ #include <TargetConditionals.h>
+ #endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131203/cb111d85/attachment-0001.html>
More information about the macports-changes
mailing list