Ticket #41560: webkit-gtk.patch

File webkit-gtk.patch, 5.3 KB (added by jeremyhu (Jeremy Huddleston Sequoia), 11 years ago)

current patch in progress

  • Portfile

     
    88
    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}
    1414maintainers jeremyhu devans
    … …  
    2121use_xz      yes
    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 \
    2929        path:lib/pkgconfig/glib-2.0.pc:glib2 \
    … …  
    5454# ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
    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 \
    5960        clang-assertions.patch \
    … …  
    6465        ListableHandler.patch \
    6566        ppc.patch \
    6667        tiger.patch \
    67         quartz-webcore.patch
     68        quartz-webcore.patch \
     69        clang-check.patch
    6870
    6971conflicts_build     google-test
    7072
    … …  
    157159
    158160autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
    159161use_autoreconf  yes
    160 autoreconf.args -fi
     162autoreconf.args -fvi
    161163
    162164lappend merger_dont_diff ${prefix}/include/webkitgtk-1.0/webkitdom/WebKitDOMNavigator.h
    163165
    … …  
    175177    # https://bugs.webkit.org/show_bug.cgi?id=58737
    176178    reinplace "s:OS(MAC_OS_X):PLATFORM(MAC):" \
    177179        ${worksrcpath}/Source/WTF/wtf/ThreadingPthreads.cpp
     180
     181    # Emailed to webkit-gtk mailing list 11/26/13
     182    reinplace "s:-stdlib=libstdc\+\+::" \
     183        ${worksrcpath}/Source/autotools/SetupCompilerFlags.m4
     184
     185    # TODO: Email/file a bug
     186    # In file included from Source/JavaScriptCore/runtime/JSGlobalObject.cpp:83:
     187    # ./Source/JavaScriptCore/API/ObjCCallbackFunction.h:32:9: fatal error: 'JavaScriptCore/JSCallbackFunction.h' file not found
     188    # #import <JavaScriptCore/JSCallbackFunction.h>
     189    #         ^
     190    reinplace "/^#define JSC_OBJC_API_ENABLED/s/^.*$/#define JSC_OBJC_API_ENABLED 0/" \
     191        ${worksrcpath}/Source/JavaScriptCore/API/JSBase.h
    178192}
    179193
    180194# TODO: fix this for muniversal

  • files/clang-check.patch

     
     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([
     4 #endif
     5 ])], [c_compiler="gcc"], [])
     6 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)))))
     9 #error Not a supported Clang compiler
     10 #endif
     11 ])], [c_compiler="clang"], [])
     12@@ -106,7 +106,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
     13 #endif
     14 ])], [cxx_compiler="g++"], [])
     15 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)))))
     18 #error Not a supported Clang++ compiler
     19 #endif
     20 ])], [cxx_compiler="clang++"], [])

  • files/execinfo.patch

     
    2828 
    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)
    3535     // The CaptureStackBackTrace function is available in XP, but it is not defined

  • files/quartz-webcore.patch

     
    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
    143@@ -865,7 +865,7 @@