From d74cd52f9a1db7aa06b1f33fddba99c03576a401 Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 28 Jul 2009 11:18:27 +0000 Subject: Add DEBUG option. Fix compilation. Fix webinspector install. [1] Submitted by: [1] Romain Tartiere git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12520 df743ca5-7f9a-e211-a948-0013205c9059 --- www/webkit-gtk2/Makefile | 10 ++++- www/webkit-gtk2/files/patch-GNUmakefile.in | 13 ++++++ ...tch-WebCore_plugins_soup_ResourcehandleSoup.cpp | 11 +++++ www/webkit-gtk2/pkg-plist | 50 ++++++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 www/webkit-gtk2/files/patch-GNUmakefile.in create mode 100644 www/webkit-gtk2/files/patch-WebCore_plugins_soup_ResourcehandleSoup.cpp (limited to 'www/webkit-gtk2') diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index fc93cc0ba..aedd1c079 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.31 2009/06/15 20:16:07 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.32 2009/07/15 11:36:57 avl Exp $ # PORTNAME= webkit PORTVERSION= 1.1.11 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 @@ -44,6 +45,7 @@ BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS= VIDEO "Enable video support" on \ + DEBUG "Build with debug support" off \ STATIC "Enable building static library" off .include @@ -53,6 +55,12 @@ USE_GSTREAMER+= yes CONFIGURE_ARGS+=--enable-video .endif +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +.else +CONFIGURE_ARGS+=--disable-debug +.endif + .if defined(WITH_STATIC) CONFIGURE_ARGS+=--enable-static PLIST_SUB+= STATIC="" diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in new file mode 100644 index 000000000..53333a520 --- /dev/null +++ b/www/webkit-gtk2/files/patch-GNUmakefile.in @@ -0,0 +1,13 @@ +--- GNUmakefile.in.orig 2009-07-28 12:36:13.000000000 +0200 ++++ GNUmakefile.in 2009-07-28 12:39:13.000000000 +0200 +@@ -8154,7 +8154,9 @@ libWebCoreJS_depfiles := $(patsubst \ + webinspectordir = ${datadir}/webkit-1.0/webinspector + dist_webinspector_DATA = \ + $(WebCore)/English.lproj/localizedStrings.js \ +- $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css}) ++ $(shell ls $(WebCore)/inspector/front-end/*.js) \ ++ $(shell ls $(WebCore)/inspector/front-end/*.html) \ ++ $(shell ls $(WebCore)/inspector/front-end/*.css) + + webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images + dist_webinspectorimages_DATA = \ diff --git a/www/webkit-gtk2/files/patch-WebCore_plugins_soup_ResourcehandleSoup.cpp b/www/webkit-gtk2/files/patch-WebCore_plugins_soup_ResourcehandleSoup.cpp new file mode 100644 index 000000000..72610a3e8 --- /dev/null +++ b/www/webkit-gtk2/files/patch-WebCore_plugins_soup_ResourcehandleSoup.cpp @@ -0,0 +1,11 @@ +--- WebCore/platform/network/soup/ResourceHandleSoup.cpp.orig 2009-07-25 01:24:42.000000000 +0200 ++++ WebCore/platform/network/soup/ResourceHandleSoup.cpp 2009-07-25 01:25:04.000000000 +0200 +@@ -530,7 +530,7 @@ bool ResourceHandle::startHttp(String ur + + SoupBuffer* soupBuffer = soup_buffer_new_with_owner(g_mapped_file_get_contents(fileMapping), + g_mapped_file_get_length(fileMapping), +- fileMapping, reinterpret_cast(g_mapped_file_free)); ++ fileMapping, reinterpret_cast(g_mapped_file_unref)); + soup_message_body_append_buffer(d->m_msg->request_body, soupBuffer); + soup_buffer_free(soupBuffer); + } diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index 6af60ccd9..fe8ebda35 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -47,6 +47,23 @@ share/webkit-1.0/images/panIcon.png share/webkit-1.0/images/textAreaResizeCorner.png share/webkit-1.0/images/urlIcon.png share/webkit-1.0/resources/error.html +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/CallStackSidebarPane.js +share/webkit-1.0/webinspector/Console.js +share/webkit-1.0/webinspector/DOMStorage.js +share/webkit-1.0/webinspector/DOMStorageDataGrid.js +share/webkit-1.0/webinspector/DOMStorageItemsView.js +share/webkit-1.0/webinspector/DataGrid.js +share/webkit-1.0/webinspector/Database.js +share/webkit-1.0/webinspector/DatabaseQueryView.js +share/webkit-1.0/webinspector/DatabaseTableView.js +share/webkit-1.0/webinspector/DatabasesPanel.js +share/webkit-1.0/webinspector/ElementsPanel.js +share/webkit-1.0/webinspector/ElementsTreeOutline.js +share/webkit-1.0/webinspector/FontView.js +share/webkit-1.0/webinspector/ImageView.js share/webkit-1.0/webinspector/Images/back.png share/webkit-1.0/webinspector/Images/checker.png share/webkit-1.0/webinspector/Images/clearConsoleButtons.png @@ -162,7 +179,40 @@ share/webkit-1.0/webinspector/Images/userInputResultIcon.png share/webkit-1.0/webinspector/Images/warningIcon.png share/webkit-1.0/webinspector/Images/warningMediumIcon.png share/webkit-1.0/webinspector/Images/warningsErrors.png +share/webkit-1.0/webinspector/KeyboardShortcut.js +share/webkit-1.0/webinspector/MetricsSidebarPane.js +share/webkit-1.0/webinspector/Object.js +share/webkit-1.0/webinspector/ObjectPropertiesSection.js +share/webkit-1.0/webinspector/Panel.js +share/webkit-1.0/webinspector/PanelEnablerView.js +share/webkit-1.0/webinspector/Placard.js +share/webkit-1.0/webinspector/ProfileDataGridTree.js +share/webkit-1.0/webinspector/ProfileView.js +share/webkit-1.0/webinspector/ProfilesPanel.js +share/webkit-1.0/webinspector/PropertiesSection.js +share/webkit-1.0/webinspector/PropertiesSidebarPane.js +share/webkit-1.0/webinspector/Resource.js +share/webkit-1.0/webinspector/ResourceCategory.js +share/webkit-1.0/webinspector/ResourceView.js +share/webkit-1.0/webinspector/ResourcesPanel.js +share/webkit-1.0/webinspector/ScopeChainSidebarPane.js +share/webkit-1.0/webinspector/Script.js +share/webkit-1.0/webinspector/ScriptView.js +share/webkit-1.0/webinspector/ScriptsPanel.js +share/webkit-1.0/webinspector/SidebarPane.js +share/webkit-1.0/webinspector/SidebarTreeElement.js +share/webkit-1.0/webinspector/SourceFrame.js +share/webkit-1.0/webinspector/SourceView.js +share/webkit-1.0/webinspector/StylesSidebarPane.js +share/webkit-1.0/webinspector/TextPrompt.js +share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js +share/webkit-1.0/webinspector/View.js +share/webkit-1.0/webinspector/inspector.css +share/webkit-1.0/webinspector/inspector.html +share/webkit-1.0/webinspector/inspector.js share/webkit-1.0/webinspector/localizedStrings.js +share/webkit-1.0/webinspector/treeoutline.js +share/webkit-1.0/webinspector/utilities.js @dirrm share/webkit-1.0/webinspector/Images @dirrm share/webkit-1.0/webinspector @dirrm share/webkit-1.0/resources -- cgit v1.2.3