Changeset 118229


Ignore:
Timestamp:
Mar 26, 2014, 6:38:39 PM (7 years ago)
Author:
jeremyhu@…
Message:

webkit-gtk: Version bump to 2.4.0

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

Legend:

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

    r116279 r118229  
    11# -*- 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
    22# $Id$
     3
     4# We have an umbrella radar tracking webkit-gtk issues on OS X.  Please relate
     5# any future issues with this tracker.
     6# http://bugs.webkit.org/show_bug.cgi?id=126492
    37
    48PortSystem  1.0
     
    913name        webkit-gtk
    1014epoch       2
    11 version     2.2.3
    12 revision    1
     15version     2.4.0
    1316description Apple's WebKit HTML rendering library for GTK+
    1417long_description ${description}
     
    2326distname    webkitgtk-${version}
    2427
    25 checksums           sha1    57fa31c489e7fd5d405e0753e6e6f15933b143f3 \
    26                     rmd160  8e63661e2ac9e91d24588ac5377967190623c44c \
    27                     sha256  94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605
     28dist_subdir webkit-gtk
     29
     30checksums           sha1    d7dade39ebeded72ddf7ac37a9d9ed17ac68dcba \
     31                    rmd160  a2a17a8c69b614e068af3627169c90b2dca45afc \
     32                    sha256  dc5277cda89ee038408f78c94b1b07f101997f01ef877a142ffedac3b537dfbb
    2833
    2934depends_lib \
     
    5358# quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
    5459# clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
     60# gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
     61# libedit.patch: https://bugs.webkit.org/show_bug.cgi?id=127059
    5562
    5663patchfiles \
     
    6168        quartz-webcore.patch \
    6269        clang-check.patch \
    63         no-WebCoreLayer.a.patch
     70        gstreamer.patch \
     71        libedit.patch
    6472
    6573conflicts_build     google-test
     
    6977
    7078# --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
     79# --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
    7180configure.args  \
    7281        --disable-webkit2 \
     82        --disable-web-audio \
    7383        --enable-introspection \
    7484        --disable-video \
     
    101111
    102112subport webkit-gtk3 {
    103     conflicts   webkit-gtk3-2.0 webkit-gtk3-devel
     113    conflicts   webkit-gtk3-devel webkit-gtk3-2.0
    104114    depends_lib-append      port:gtk3
    105115    configure.args-append   --with-gtk=3.0
     
    119129                set docpath ${workpath}/destroot-${arch}${prefix}/share/gtk-doc/html
    120130                move ${docpath}/webkitgtk ${docpath}/webkitgtk3
     131                move ${docpath}/webkitdomgtk ${docpath}/webkitdomgtk3
    121132                move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
    122133            }
     
    126137           set docpath ${destroot}${prefix}/share/gtk-doc/html
    127138           move ${docpath}/webkitgtk ${docpath}/webkitgtk3
     139           move ${docpath}/webkitdomgtk ${docpath}/webkitdomgtk3
    128140           move ${docpath}/webkitgtk3/webkitgtk.devhelp2 ${docpath}/webkitgtk3/webkitgtk3.devhelp2
    129141        }
     
    132144
    133145if {${name} eq ${subport}} {
    134     conflicts   webkit-gtk-2.0 webkit-gtk-devel
     146    conflicts   webkit-gtk-devel webkit-gtk-2.0
    135147    depends_lib-append      port:gtk2
    136148    configure.args-append   --with-gtk=2.0
     
    156168}
    157169
    158 # In 1.10.1:
    159 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp: In constructor 'WebCore::FFTFrame::FFTFrame(unsigned int)':
    160 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: 'm_complexData' was not declared in this scope
    161 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: 'GstFFTF32Complex' was not declared in this scope
    162 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:48: error: no matching function for call to 'fastNewArray(size_t)'
    163 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:50: error: 'gst_fft_next_fast_length' was not declared in this scope
    164 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'm_fft' was not declared in this scope
    165 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'FALSE' was not declared in this scope
    166 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:51: error: 'gst_fft_f32_new' was not declared in this scope
    167 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'm_inverseFft' was not declared in this scope
    168 # Source/WebCore/platform/audio/gstreamer/FFTFrameGStreamer.cpp:52: error: 'TRUE' was not declared in this scope
    169 #        --enable-web-audio \
    170 
    171170# We don't want to use the headers from the installed WebKit
    172171configure.cppflags-delete -I${prefix}/include
     
    186185
    187186post-patch {
    188     # https://bugs.webkit.org/show_bug.cgi?id=88407
    189     reinplace "s:echo -n:/bin/echo -n:g" \
    190         ${worksrcpath}/Source/WebCore/GNUmakefile.am
    191 
    192     # https://bugs.webkit.org/show_bug.cgi?id=99683
    193     reinplace "s:PLATFORM(MAC):OS(DARWIN):g" \
    194         ${worksrcpath}/Source/JavaScriptCore/heap/VTableSpectrum.cpp \
    195         ${worksrcpath}/Source/JavaScriptCore/jit/ThunkGenerators.cpp \
    196         ${worksrcpath}/Source/JavaScriptCore/tools/CodeProfile.cpp
     187    # https://bugs.webkit.org/show_bug.cgi?id=126433
     188    reinplace "s/def __APPLE__/ 0/" \
     189        ${worksrcpath}/Source/JavaScriptCore/API/WebKitAvailability.h
    197190
    198191    # https://bugs.webkit.org/show_bug.cgi?id=58737
     
    219212#}
    220213
     214# Apple's gnumake (patched 3.81) gets wedged at some point during the build process
     215depends_build-append port:gmake
     216build.cmd ${prefix}/bin/gmake
     217
    221218build.args-append V=1
    222219
     
    257254livecheck.type  regex
    258255livecheck.url   http://webkitgtk.org/?page=download
    259 livecheck.regex webkitgtk-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)
     256livecheck.regex "webkitgtk-(\\d+(?:\\.\\d+)*)${extract.suffix}"
  • trunk/dports/www/webkit-gtk/files/clang-check.patch

    r114233 r118229  
    1 --- Source/autotools/CheckSystemAndBasicDependencies.m4.orig    2013-11-10 17:44:57.000000000 -0800
    2 +++ Source/autotools/CheckSystemAndBasicDependencies.m4 2013-11-10 17:45:57.000000000 -0800
    3 @@ -87,7 +87,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
     1--- Source/autotools/CheckSystemAndBasicDependencies.m4.orig    2014-01-23 08:49:59.000000000 -0800
     2+++ Source/autotools/CheckSystemAndBasicDependencies.m4 2014-02-05 17:29:39.000000000 -0800
     3@@ -92,7 +92,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
    44 #endif
    55 ])], [c_compiler="gcc"], [])
    66 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
    7 -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 2)
    8 +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
     7-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
     8+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
    99 #error Not a supported Clang compiler
    1010 #endif
    1111 ])], [c_compiler="clang"], [])
    12 @@ -106,7 +106,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
     12@@ -111,7 +111,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
    1313 #endif
    1414 ])], [cxx_compiler="g++"], [])
    1515 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
    16 -#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 2)
    17 +#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))))
     16-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3)
     17+#if !(defined(__clang__) && (__apple_build_version__ >= 4250024 || (!defined(__apple_build_version__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3)))))
    1818 #error Not a supported Clang++ compiler
    1919 #endif
Note: See TracChangeset for help on using the changeset viewer.