diff options
| -rw-r--r-- | www/webkit-gtk2/Makefile | 15 | ||||
| -rw-r--r-- | www/webkit-gtk2/distinfo | 6 | ||||
| -rw-r--r-- | www/webkit-gtk2/files/extra-patch-WebCore_platform_text_TextBreakIterator.h | 15 | ||||
| -rw-r--r-- | www/webkit-gtk2/pkg-plist | 12 |
4 files changed, 35 insertions, 13 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index fc18b830d..b558a2f96 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.54 2010/01/27 22:28:45 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.55 2010/01/28 13:32:16 avl Exp $ # PORTNAME= webkit -PORTVERSION= 1.1.19 -PORTREVISION= 1 +PORTVERSION= 1.1.21 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 @@ -19,8 +18,7 @@ COMMENT= An opensource browser engine BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup -LIB_DEPENDS= icutu.38:${PORTSDIR}/devel/icu \ - enchant.1:${PORTSDIR}/textproc/enchant \ +LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ curl.5:${PORTSDIR}/ftp/curl \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ soup-2.4.1:${PORTSDIR}/devel/libsoup @@ -55,6 +53,13 @@ OPTIONS= VIDEO "Enable video support" on \ .include <bsd.port.pre.mk> +.if exists (${LOCALBASE}/lib/libicutu.so.43) +LIB_DEPENDS+= icutu.43:${PORTSDIR}/devel/icu4 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-WebCore_platform_text_TextBreakIterator.h +.else +LIB_DEPENDS+= icutu.38:${PORTSDIR}/devel/icu +.endif + .if defined(WITH_VIDEO) USE_GSTREAMER+= yes CONFIGURE_ARGS+=--enable-video diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index 08affc5a7..4d975dab7 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (webkit-1.1.19.tar.gz) = fd91bdded2d58e64271806cf165415a3 -SHA256 (webkit-1.1.19.tar.gz) = fbc7ec8ef31e15c977e6e2c0ed41024b713f1cc83e2d74196c21f4f8ff0cd9ac -SIZE (webkit-1.1.19.tar.gz) = 6885984 +MD5 (webkit-1.1.21.tar.gz) = 8957bcffd0a0394a75f8f7936ab270bc +SHA256 (webkit-1.1.21.tar.gz) = 26bd4627e196817024e444dacd3c67d1e2e41f13b828e98c96cd987de0ed1845 +SIZE (webkit-1.1.21.tar.gz) = 6150157 diff --git a/www/webkit-gtk2/files/extra-patch-WebCore_platform_text_TextBreakIterator.h b/www/webkit-gtk2/files/extra-patch-WebCore_platform_text_TextBreakIterator.h new file mode 100644 index 000000000..a86503535 --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-WebCore_platform_text_TextBreakIterator.h @@ -0,0 +1,15 @@ +Pr 143718, fix build with icu 4.3 + +--- WebCore/platform/text/TextBreakIterator.h.orig 2009-09-22 18:29:21.000000000 +0300 ++++ WebCore/platform/text/TextBreakIterator.h 2010-02-10 08:49:59.000000000 +0200 +@@ -26,7 +26,7 @@ + + namespace WebCore { + +- class TextBreakIterator; ++ typedef struct UBreakIterator TextBreakIterator; + + // Note: The returned iterator is good only until you get another iterator. + + + diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index 1b6a0bde7..8252c27ef 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -68,7 +68,6 @@ share/webkit-1.0/webinspector/AuditsPanel.js share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js share/webkit-1.0/webinspector/Breakpoint.js share/webkit-1.0/webinspector/BreakpointsSidebarPane.js -share/webkit-1.0/webinspector/CSSSourceSyntaxHighlighter.js share/webkit-1.0/webinspector/CallStackSidebarPane.js share/webkit-1.0/webinspector/Callback.js share/webkit-1.0/webinspector/ChangesView.js @@ -80,6 +79,7 @@ share/webkit-1.0/webinspector/CookieItemsView.js share/webkit-1.0/webinspector/DOMAgent.js share/webkit-1.0/webinspector/DOMStorage.js share/webkit-1.0/webinspector/DOMStorageItemsView.js +share/webkit-1.0/webinspector/DOMSyntaxHighlighter.js share/webkit-1.0/webinspector/DataGrid.js share/webkit-1.0/webinspector/Database.js share/webkit-1.0/webinspector/DatabaseQueryView.js @@ -227,10 +227,9 @@ share/webkit-1.0/webinspector/InjectedScript.js share/webkit-1.0/webinspector/InjectedScriptAccess.js share/webkit-1.0/webinspector/InspectorBackendStub.js share/webkit-1.0/webinspector/InspectorFrontendHostStub.js -share/webkit-1.0/webinspector/JavaScriptSourceSyntaxHighlighter.js -share/webkit-1.0/webinspector/JavaScriptTokenizer.js share/webkit-1.0/webinspector/KeyboardShortcut.js share/webkit-1.0/webinspector/MetricsSidebarPane.js +share/webkit-1.0/webinspector/NativeTextViewer.js share/webkit-1.0/webinspector/Object.js share/webkit-1.0/webinspector/ObjectPropertiesSection.js share/webkit-1.0/webinspector/ObjectProxy.js @@ -255,9 +254,11 @@ share/webkit-1.0/webinspector/Section.js share/webkit-1.0/webinspector/Settings.js share/webkit-1.0/webinspector/SidebarPane.js share/webkit-1.0/webinspector/SidebarTreeElement.js +share/webkit-1.0/webinspector/SourceCSSTokenizer.js share/webkit-1.0/webinspector/SourceFrame.js -share/webkit-1.0/webinspector/SourceFrame2.js -share/webkit-1.0/webinspector/SourceSyntaxHighlighter.js +share/webkit-1.0/webinspector/SourceHTMLTokenizer.js +share/webkit-1.0/webinspector/SourceJavaScriptTokenizer.js +share/webkit-1.0/webinspector/SourceTokenizer.js share/webkit-1.0/webinspector/SourceView.js share/webkit-1.0/webinspector/StatusBarButton.js share/webkit-1.0/webinspector/StoragePanel.js @@ -282,6 +283,7 @@ share/webkit-1.0/webinspector/inspector.html share/webkit-1.0/webinspector/inspector.js share/webkit-1.0/webinspector/inspectorSyntaxHighlight.css share/webkit-1.0/webinspector/localizedStrings.js +share/webkit-1.0/webinspector/textEditor.css share/webkit-1.0/webinspector/treeoutline.js share/webkit-1.0/webinspector/utilities.js @dirrm share/webkit-1.0/webinspector/Images |