diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-10-10 11:51:56 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-10-10 11:51:56 +0800 |
| commit | e0892e67491e13b499af53e06946e03bb3c13a15 (patch) | |
| tree | 5d8c03e4c586ce571ac9a32dbb7a06ebb67be50d | |
| parent | 52242e92ef3aaf1f3360af05cff39cce73e076a8 (diff) | |
| download | marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.tar marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.tar.gz marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.tar.bz2 marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.tar.lz marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.tar.xz marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.tar.zst marcuscom-ports-e0892e67491e13b499af53e06946e03bb3c13a15.zip | |
Fix the build on 6.X.
Submitted by: bland
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13104 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | www/webkit-gtk2/Makefile | 6 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index d2e8cd0f1..9a5d8888c 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.42 2009/10/01 13:06:02 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.43 2009/10/07 10:23:28 kwm Exp $ # PORTNAME= webkit @@ -68,6 +68,10 @@ PLIST_SUB+= STATIC="" PLIST_SUB+= STATIC="@comment " .endif +.if ${OSVERSION} < 700000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/WebCore/plugins/PluginDatabase.cpp diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h new file mode 100644 index 000000000..c46912d7a --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h @@ -0,0 +1,11 @@ +--- JavaScriptCore/yarr/RegexJIT.h.orig 2009-10-09 23:47:41.000000000 -0400 ++++ JavaScriptCore/yarr/RegexJIT.h 2009-10-09 23:48:19.000000000 -0400 +@@ -73,7 +73,7 @@ public: + + int execute(const UChar* input, unsigned start, unsigned length, int* output) + { +- return reinterpret_cast<RegexJITCode>(m_ref.m_code.executableAddress())(input, start, length, output); ++ return ((RegexJITCode)m_ref.m_code.executableAddress())(input, start, length, output); + } + + private: |