Ignore:
Timestamp:
Dec 3, 2013, 9:16:36 AM (5 years ago)
Author:
jeremyhu@…
Message:

webkit-gtk: Bump to 2.2.2

Location:
trunk/dports/www/webkit-gtk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/webkit-gtk/Portfile

    r114103 r114233  
    99name        webkit-gtk
    1010epoch       2
    11 version     2.0.4
     11version     2.2.2
    1212description Apple's WebKit HTML rendering library for GTK+
    1313long_description ${description}
     
    2222distname    webkitgtk-${version}
    2323
    24 checksums           sha1    3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a \
    25                     rmd160  19643cac3f53928757a7c3fe8ea33f144a581456 \
    26                     sha256  bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f
     24checksums           sha1    6376d7d55802c3389c74a2ca8a33d53efc340c37 \
     25                    rmd160  2f4ec373d71f7912e2315bf09c708df90da5e61c \
     26                    sha256  4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d
    2727
    2828depends_lib \
     
    5555# tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
    5656# quartz-webcore.patch: No upstream bug, http://trac.macports.org/ticket/39898
     57# clang-check.patch: No upstream bug, emailed mailing list
    5758
    5859patchfiles \
     
    6667        tiger.patch \
    6768        quartz-webcore.patch \
    68         patch-freetype-includes.diff
     69        clang-check.patch \
     70        patch-freetype-includes.diff \
     71        no-WebCoreLayer.a.patch
    6972
    7073conflicts_build     google-test
     
    8184        --enable-webgl
    8285
     86platform darwin {
     87    set cxx_stdlib {}
     88
     89    if {[info exists configure.cxx_stdlib] &&
     90        ${configure.cxx_stdlib} ne {} &&
     91        [string match *clang* ${configure.cxx}]} {
     92        set cxx_stdlib ${configure.cxx_stdlib}
     93    } elseif {[string match *clang* ${configure.cxx}] &&
     94              ${os.major} >= 13} {
     95        set cxx_stdlib libc++
     96    } else {
     97        set cxx_stdlib libstdc++
     98    }
     99
     100    if {${cxx_stdlib} == "libstdc++"} {
     101       ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime.  Please use ${subport}-2.0 instead"
     102       error "unsupported configuration"
     103    }
     104}
     105
    83106subport webkit-gtk3 {
    84     revision 2
     107    conflicts   webkit-gtk3-2.0
    85108    depends_lib-append      port:gtk3
    86109    configure.args-append   --with-gtk=3.0
     
    113136
    114137if {${name} == ${subport}} {
    115     revision 1
    116 
     138    conflicts   webkit-gtk-2.0
    117139    depends_lib-append      port:gtk2
    118140    configure.args-append   --with-gtk=2.0
     
    157179configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
    158180
     181# https://trac.macports.org/ticket/41560#comment:2
     182configure.cflags-append -ftemplate-depth=256
     183configure.cxxflags-append -ftemplate-depth=256
     184
    159185autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
    160186use_autoreconf  yes
    161 autoreconf.args -fi
     187autoreconf.args -fvi
    162188
    163189lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
     
    177203    reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
    178204        ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp
     205
     206    # Emailed to webkit-gtk mailing list 11/26/13
     207    reinplace "s:-stdlib=libstdc\+\+::" \
     208        ${worksrcpath}/Source/autotools/SetupCompilerFlags.m4
     209
     210    # TODO: Email/file a bug
     211    # In file included from Source/JavaScriptCore/runtime/JSGlobalObject.cpp:83:
     212    # ./Source/JavaScriptCore/API/ObjCCallbackFunction.h:32:9: fatal error: 'JavaScriptCore/JSCallbackFunction.h' file not found
     213    # #import <JavaScriptCore/JSCallbackFunction.h>
     214    #         ^
     215    reinplace "/^#define JSC_OBJC_API_ENABLED/s/^.*$/#define JSC_OBJC_API_ENABLED 0/" \
     216        ${worksrcpath}/Source/JavaScriptCore/API/JSBase.h
    179217}
    180218
  • trunk/dports/www/webkit-gtk/files/execinfo.patch

    r113168 r114233  
    2929 void WTFGetBacktrace(void** stack, int* size)
    3030 {
    31 -#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
    32 +#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
     31-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
     32+#if (OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) || (OS(LINUX) && !defined(__UCLIBC__))
    3333     *size = backtrace(stack, *size);
    3434 #elif OS(WINDOWS) && !OS(WINCE)
  • trunk/dports/www/webkit-gtk/files/quartz-webcore.patch

    r113168 r114233  
    1 --- Source/WebCore/bridge/npruntime_internal-orig.h     2013-07-19 00:04:01.000000000 -0700
    2 +++ Source/WebCore/bridge/npruntime_internal.h  2013-08-12 16:04:17.000000000 -0700
    3 @@ -29,7 +29,7 @@
    4  #include "npfunctions.h"
    5  #include "npruntime.h"
    6  
    7 -#ifdef XP_UNIX
    8 +#if PLATFORM(X11)
    9      #include <X11/Xresource.h>
    10  
    11      #undef None
    121--- Source/WebCore/plugins/PluginView-orig.cpp  2013-07-19 00:04:11.000000000 -0700
    132+++ Source/WebCore/plugins/PluginView.cpp       2013-08-12 17:48:20.000000000 -0700
Note: See TracChangeset for help on using the changeset viewer.