diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-05-10 21:19:08 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-05-10 21:19:08 +0000 |
| commit | 48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch) | |
| tree | b627baa77f19bb1eab2fa4dee08aab1908131cd0 /www | |
| parent | fbdf96410f8e803568c33397323dd9d8d3af995f (diff) | |
| download | ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.tar.gz ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.zip | |
Notes
Diffstat (limited to 'www')
42 files changed, 292 insertions, 633 deletions
diff --git a/www/Makefile b/www/Makefile index ae4dff66ee90..433ca79b387f 100644 --- a/www/Makefile +++ b/www/Makefile @@ -264,7 +264,6 @@ SUBDIR += geronimo SUBDIR += getleft SUBDIR += gforge - SUBDIR += gir-repository-webkit SUBDIR += gist SUBDIR += glibwww SUBDIR += glpi diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 3ad7badbc5a0..7eaf1e212ff9 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.122 2009/10/19 02:40:50 kwm Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.125 2010/04/02 20:47:49 kwm Exp $ # PORTNAME= epiphany-extensions -PORTVERSION= 2.28.1 -PORTREVISION= 2 +PORTVERSION= 2.30.0 +PORTREVISION= 0 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ COMMENT= A set of add-ons for the Epiphany web browser BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes @@ -30,7 +30,7 @@ USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -EPHY_EXTENSIONS=all,rss +EPHY_EXTENSIONS=really-all EPHY_VERSION= ${PORTVERSION:R} PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION} @@ -41,15 +41,17 @@ OPTIONS= OPENSP "Enable OpenSP SGML support" off .if defined(WITH_OPENSP) CONFIGURE_ARGS+= --enable-opensp=yes +LIB_DEPENDS+= osp.5:${PORTSDIR}/textproc/opensp .else CONFIGURE_ARGS+= --disable-opensp .endif CONFIGURE_ARGS+=--with-extensions="${EPHY_EXTENSIONS}" -pre-everything:: - @${ECHO_MSG} "Epiphany-extensions also supports the following tunable option(s):" - @${ECHO_MSG} " WITH_OPENSP=yes Enable support for OpenSP SGML validation" - @${ECHO_MSG} "" +post-patch: + @${REINPLACE_CMD} -e 's|$$($$PKG_CONFIG --variable=extensionsdir epiphany-$$_epiphany_api_version)|${PREFIX}/lib/epiphany/${PORTVERSION:R}/extensions|g' \ + -e 's|$$($$PKG_CONFIG --variable=icondir epiphany-$$EPIPHANY_API_VERSION)|${PREFIX}/share/epiphany/icons|g' \ + -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 411231617165..1a621f598ba1 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 565d32a8b94fd023f11a82dcef2bf634 -SHA256 (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 0f14413316ebbdba392c9df7468d0d08811376ee26c735d7e523fc4eba44572a -SIZE (gnome2/epiphany-extensions-2.28.1.tar.bz2) = 1389667 +MD5 (gnome2/epiphany-extensions-2.30.0.tar.bz2) = 76dd4f6296a259d09554e693336187a2 +SHA256 (gnome2/epiphany-extensions-2.30.0.tar.bz2) = cf2e7c8ea8cc34740d945ffa7b877dbe9f047b43f8609f6d78c6811ca69efe24 +SIZE (gnome2/epiphany-extensions-2.30.0.tar.bz2) = 1564058 diff --git a/www/epiphany-extensions/pkg-descr b/www/epiphany-extensions/pkg-descr index 06c245526104..309ccdfa876b 100644 --- a/www/epiphany-extensions/pkg-descr +++ b/www/epiphany-extensions/pkg-descr @@ -1,9 +1,12 @@ Epiphany-extensions is a set of plugins for the Epiphany web browser that -extend its base functionality. Currently, the following extensions are -supported: +extend its base functionality. Some of those extensions include: -* Mouse gestures -* Pop-up blocker -* Tabs menu +* Actions +* Ad Blocker +* Certificate Viewer +* Greasemonkey +* Mouse Gestures +* Newsfeed extractor +* and more... WWW: http://www.gnome.org/projects/epiphany/extensions diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index e44956a16b5b..d0a28b1cabe2 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -5,6 +5,8 @@ lib/epiphany/%%VERSION%%/extensions/auto-scroller.ephy-extension lib/epiphany/%%VERSION%%/extensions/certificates.ephy-extension lib/epiphany/%%VERSION%%/extensions/extensions-manager-ui.ephy-extension lib/epiphany/%%VERSION%%/extensions/gestures.ephy-extension +lib/epiphany/%%VERSION%%/extensions/greasemonkey.ephy-extension +lib/epiphany/%%VERSION%%/extensions/html5tube.ephy-extension lib/epiphany/%%VERSION%%/extensions/libactionsextension.la lib/epiphany/%%VERSION%%/extensions/libactionsextension.so lib/epiphany/%%VERSION%%/extensions/libadblockextension.la @@ -19,32 +21,41 @@ lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.la lib/epiphany/%%VERSION%%/extensions/libextensionsmanageruiextension.so lib/epiphany/%%VERSION%%/extensions/libgesturesextension.la lib/epiphany/%%VERSION%%/extensions/libgesturesextension.so +lib/epiphany/%%VERSION%%/extensions/libgreasemonkeyextension.la +lib/epiphany/%%VERSION%%/extensions/libgreasemonkeyextension.so +lib/epiphany/%%VERSION%%/extensions/libhtml5tubeextension.la +lib/epiphany/%%VERSION%%/extensions/libhtml5tubeextension.so +lib/epiphany/%%VERSION%%/extensions/libpermissionsextension.la +lib/epiphany/%%VERSION%%/extensions/libpermissionsextension.so lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.la lib/epiphany/%%VERSION%%/extensions/libpushscrollerextension.so lib/epiphany/%%VERSION%%/extensions/librssextension.la lib/epiphany/%%VERSION%%/extensions/librssextension.so -lib/epiphany/%%VERSION%%/extensions/libsidebarextension.la -lib/epiphany/%%VERSION%%/extensions/libsidebarextension.so -lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.so +lib/epiphany/%%VERSION%%/extensions/libsampleextension.la +lib/epiphany/%%VERSION%%/extensions/libsampleextension.so lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.la +lib/epiphany/%%VERSION%%/extensions/libsoupflyextension.so lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.la lib/epiphany/%%VERSION%%/extensions/libtabgroupsextension.so +lib/epiphany/%%VERSION%%/extensions/libtabkeytabnavigateextension.la +lib/epiphany/%%VERSION%%/extensions/libtabkeytabnavigateextension.so lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.la lib/epiphany/%%VERSION%%/extensions/libtabstatesextension.so +lib/epiphany/%%VERSION%%/extensions/permissions.ephy-extension lib/epiphany/%%VERSION%%/extensions/push-scroller.ephy-extension lib/epiphany/%%VERSION%%/extensions/rss.ephy-extension -lib/epiphany/%%VERSION%%/extensions/sidebar.ephy-extension +lib/epiphany/%%VERSION%%/extensions/sample.ephy-extension lib/epiphany/%%VERSION%%/extensions/soup-fly.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension +lib/epiphany/%%VERSION%%/extensions/tab-key-tab-navigate.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension %%DATADIR%%/adblock-patterns %%DATADIR%%/ephy-gestures.xml -%%DATADIR%%/glade/action-properties.glade -%%DATADIR%%/glade/actions-editor.glade -%%DATADIR%%/glade/adblock.ui -%%DATADIR%%/glade/extensions-manager-ui.ui -%%DATADIR%%/glade/rss-ui.glade -%%DATADIR%%/xml/epiphany-sidebar-ui.xml +%%DATADIR%%/ui/action-properties.ui +%%DATADIR%%/ui/actions-editor.ui +%%DATADIR%%/ui/adblock.ui +%%DATADIR%%/ui/extensions-manager-ui.ui +%%DATADIR%%/ui/rss-ui.ui share/epiphany/icons/hicolor/16x16/status/ad-blocked.png share/epiphany/icons/hicolor/16x16/status/feed-presence.png share/epiphany/icons/hicolor/22x22/status/ad-blocked.png @@ -55,6 +66,7 @@ share/epiphany/icons/hicolor/32x32/status/feed-presence.png share/epiphany/icons/hicolor/scalable/status/feed-presence.svg share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/C/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png @@ -76,6 +88,7 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/C/legal.xml share/gnome/help/epiphany-extensions/de/epiphany-extensions.xml share/gnome/help/epiphany-extensions/de/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/de/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close-2.png @@ -96,6 +109,7 @@ share/gnome/help/epiphany-extensions/de/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/de/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png @@ -116,6 +130,7 @@ share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/fr/epiphany-extensions.xml share/gnome/help/epiphany-extensions/fr/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/fr/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close-2.png @@ -136,6 +151,7 @@ share/gnome/help/epiphany-extensions/fr/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/fr/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png @@ -156,6 +172,7 @@ share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/sv/figures/epi-ext-actions-use.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png @@ -211,9 +228,11 @@ share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/ro/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/rw/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @@ -260,9 +279,7 @@ share/omf/epiphany-extensions/epiphany-extensions-sv.omf @dirrmtry share/epiphany/icons/hicolor/16x16 @dirrmtry share/epiphany/icons/hicolor @dirrmtry share/epiphany/icons -@dirrmtry share/epiphany -@dirrm %%DATADIR%%/xml -@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% @dirrmtry lib/epiphany/%%VERSION%%/extensions @dirrmtry lib/epiphany/%%VERSION%%/plugins diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 5109e28d80bc..d8b0d1318066 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.214 2009/10/25 20:22:54 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.228 2010/05/09 00:11:47 marcus Exp $ # PORTNAME= epiphany -PORTVERSION= 2.28.2 -PORTREVISION?= 3 +PORTVERSION= 2.30.2 +PORTREVISION?= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,13 +17,13 @@ MAINTAINER= gnome@FreeBSD.org COMMENT?= An extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ - ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit + ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ notify.1:${PORTSDIR}/devel/libnotify \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ - ${LOCALBASE}/share/gir-1.0/WebKit-1.0.gir:${PORTSDIR}/www/gir-repository-webkit \ + ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes USE_LDCONFIG= yes @@ -37,7 +37,8 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS+=--enable-introspection +CONFIGURE_ARGS+=--enable-introspection \ + --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" @@ -48,7 +49,7 @@ PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}" MAN1= epiphany.1 OPTIONS= NSS "Import passwords from 2.26 and older on first run" on \ - SEED "Enable seed support" off \ + SEED "Enable seed (JavaScript) support" on \ SPELLCHECK "Enable spell checking by default" on .if defined(PACKAGE_BUILDING) @@ -85,6 +86,7 @@ post-patch: 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \ s|-ldl"$$|"|g' \ + -e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \ ${WRKSRC}/configure post-install: diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 9de591cf7613..055b312cf580 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.28.2.tar.bz2) = cf32404bfe6f0cb4d3f01d0c33c08def -SHA256 (gnome2/epiphany-2.28.2.tar.bz2) = 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490 -SIZE (gnome2/epiphany-2.28.2.tar.bz2) = 5697393 +MD5 (gnome2/epiphany-2.30.2.tar.bz2) = 29b084acfa016540d91d3601ec3dff5c +SHA256 (gnome2/epiphany-2.30.2.tar.bz2) = cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a +SIZE (gnome2/epiphany-2.30.2.tar.bz2) = 5881032 diff --git a/www/epiphany/files/patch-embed_ephy-embed-prefs.c b/www/epiphany/files/patch-embed_ephy-embed-prefs.c new file mode 100644 index 000000000000..2f361fc443b8 --- /dev/null +++ b/www/epiphany/files/patch-embed_ephy-embed-prefs.c @@ -0,0 +1,15 @@ +--- embed/ephy-embed-prefs.c.orig 2010-02-20 04:42:51.000000000 -0500 ++++ embed/ephy-embed-prefs.c 2010-05-08 20:03:20.000000000 -0400 +@@ -322,8 +322,10 @@ webkit_pref_callback_accept_languages (G + langs_str = g_strjoinv (", ", langs); + + /* Update Soup session */ +- session = webkit_get_default_session (); +- g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL); ++ if (strlen (langs_str) > 0) { ++ session = webkit_get_default_session (); ++ g_object_set (G_OBJECT (session), webkit_pref, langs_str, NULL); ++ } + + g_strfreev (langs); + g_free (langs_str); diff --git a/www/epiphany/files/patch-embed_ephy-embed.c b/www/epiphany/files/patch-embed_ephy-embed.c deleted file mode 100644 index f05f072a350d..000000000000 --- a/www/epiphany/files/patch-embed_ephy-embed.c +++ /dev/null @@ -1,72 +0,0 @@ -From 009be331694b442dd859f49c7f02bdef498621ff Mon Sep 17 00:00:00 2001 -From: Gustavo Noronha Silva <gns@gnome.org> -Date: Sun, 25 Oct 2009 20:22:46 +0000 -Subject: Reimplement content type checking - -This brings back proper content type reporting, and the 'Open' button -in the download dialog. - -Bug #598167 ---- - ---- embed/ephy-embed.c.orig 2009-10-17 23:11:58.000000000 +0200 -+++ embed/ephy-embed.c 2009-11-02 12:56:33.000000000 +0100 -@@ -645,27 +645,38 @@ confirm_action_from_mime (WebKitWebView - GAppInfo *helper_app; - const char *suggested_filename; - int default_response; -+ WebKitNetworkResponse *response; -+ SoupMessage *message; - - parent_window = gtk_widget_get_toplevel (GTK_WIDGET(web_view)); - if (!GTK_WIDGET_TOPLEVEL (parent_window)) - parent_window = NULL; - -- /* FIXME: we still have no way of getting the content type from -- * webkit yet; we need to have a proper WebKitNetworkRequest -- * implementation to do this here; see -- * https://bugs.webkit.org/show_bug.cgi?id=18608 -- */ - helper_app = NULL; - mime_description = NULL; - mime_permission = EPHY_MIME_PERMISSION_SAFE; -+ -+ response = webkit_download_get_network_response (download); -+ message = webkit_network_response_get_message (response); -+ -+ if (message) { -+ const char *content_type = soup_message_headers_get_content_type (message->response_headers, NULL); -+ -+ if (content_type) { -+ mime_description = g_content_type_get_description (content_type); -+ helper_app = g_app_info_get_default_for_type (content_type, FALSE); -+ -+ if (helper_app) { -+ action = DOWNLOAD_ACTION_OPEN; -+ } -+ } -+ } -+ - if (mime_description == NULL) { - mime_description = g_strdup (C_("file type", "Unknown")); - action = DOWNLOAD_ACTION_OPEN_LOCATION; - } - -- /* OPEN will never happen here, for now; see comment about -- * WebKitNetworkRequest above! -- */ - action_label = (action == DOWNLOAD_ACTION_OPEN) ? GTK_STOCK_OPEN : STOCK_DOWNLOAD; - suggested_filename = webkit_download_get_suggested_filename (download); - -@@ -757,11 +768,6 @@ download_status_changed_cb (GObject *obj - return; - } - -- /* FIXME: when we are able to obtain the MIME information from -- * WebKit, we will want to decide earlier whether we want to open or -- * open the location to where the file was downloaded. See -- * perform_auto_download, too. -- */ - g_object_ref (download); /* balanced in confirm_action_response_cb */ - confirm_action_from_mime (web_view, download, DOWNLOAD_ACTION_DOWNLOAD); - } diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index 265cf986aa97..ed5adcca9d3a 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -33,13 +33,13 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-web-view.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h @comment libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc -libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc +libdata/pkgconfig/epiphany-2.30.pc share/aclocal/epiphany.m4 share/applications/bme.desktop share/applications/epiphany.desktop share/dbus-1/services/org.gnome.Epiphany.service -lib/girepository-1.0/Epiphany-2.28.typelib -share/gir-1.0/Epiphany-2.28.gir +lib/girepository-1.0/Epiphany-2.30.typelib +share/gir-1.0/Epiphany-2.30.gir %%DOCSDIR%%/EphyCommandManager.html %%DOCSDIR%%/EphyEmbed.html %%DOCSDIR%%/EphyLocationEntry.html @@ -71,7 +71,6 @@ share/gir-1.0/Epiphany-2.28.gir %%DOCSDIR%%/up.png %%DATADIR%%/about.ini %%DATADIR%%/default-bookmarks.rdf -%%DATADIR%%/ephy-xml2ini.xsl %%DATADIR%%/epiphany-bookmark-editor-ui.xml %%DATADIR%%/epiphany-bookmarks-html.xsl %%DATADIR%%/epiphany-bookmarksbar.xml @@ -244,6 +243,7 @@ share/locale/dz/LC_MESSAGES/epiphany.mo share/locale/el/LC_MESSAGES/epiphany.mo share/locale/en_CA/LC_MESSAGES/epiphany.mo share/locale/en_GB/LC_MESSAGES/epiphany.mo +share/locale/en@shaw/LC_MESSAGES/epiphany.mo share/locale/es/LC_MESSAGES/epiphany.mo share/locale/et/LC_MESSAGES/epiphany.mo share/locale/eu/LC_MESSAGES/epiphany.mo @@ -279,6 +279,7 @@ share/locale/mn/LC_MESSAGES/epiphany.mo share/locale/mr/LC_MESSAGES/epiphany.mo share/locale/ms/LC_MESSAGES/epiphany.mo share/locale/nb/LC_MESSAGES/epiphany.mo +share/locale/nds/LC_MESSAGES/epiphany.mo share/locale/ne/LC_MESSAGES/epiphany.mo share/locale/nl/LC_MESSAGES/epiphany.mo share/locale/nn/LC_MESSAGES/epiphany.mo @@ -411,6 +412,10 @@ share/omf/epiphany/epiphany-uk.omf @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/yo/LC_MESSAGES +@dirrmtry share/locale/yo +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@latin/LC_MESSAGES @@ -423,6 +428,8 @@ share/omf/epiphany/epiphany-uk.omf @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @@ -433,6 +440,12 @@ share/omf/epiphany/epiphany-uk.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ig/LC_MESSAGES +@dirrmtry share/locale/ig +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index eacfc6485e38..2964d905213e 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@rainbow-runner.nl> # # $FreeBSD$ -# $MCom: ports/www/evolution-webcal/Makefile,v 1.64 2009/09/22 11:30:13 avl Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.66 2010/04/01 12:38:24 kwm Exp $ # PORTNAME= evolution-webcal -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= www gnome MASTER_SITES= GNOME DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index b58ca34c74b4..8a4d1a0f3f74 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.28.0.tar.bz2) = 7b506d06c56b579977d4ebc56463ff23 -SHA256 (evolution-webcal-2.28.0.tar.bz2) = 0518327536f1e43e14a19f0957e38a7c6cde224a971562a5a2c00cc7438cb7bd -SIZE (evolution-webcal-2.28.0.tar.bz2) = 158384 +MD5 (evolution-webcal-2.28.1.tar.bz2) = c5bdefc1ad9128dab4fc2ec2e86ef07d +SHA256 (evolution-webcal-2.28.1.tar.bz2) = eeff6d0c9f45647ee1bc19585fd17f81caa87e99b95501f87d7ab1cdac1060c1 +SIZE (evolution-webcal-2.28.1.tar.bz2) = 162470 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index f7662efc2861..15866fd36d31 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -2,6 +2,7 @@ libexec/evolution-webcal share/locale/af/LC_MESSAGES/evolution-webcal.mo share/locale/ar/LC_MESSAGES/evolution-webcal.mo share/locale/as/LC_MESSAGES/evolution-webcal.mo +share/locale/ast/LC_MESSAGES/evolution-webcal.mo share/locale/az/LC_MESSAGES/evolution-webcal.mo share/locale/be@latin/LC_MESSAGES/evolution-webcal.mo share/locale/bg/LC_MESSAGES/evolution-webcal.mo @@ -16,6 +17,7 @@ share/locale/da/LC_MESSAGES/evolution-webcal.mo share/locale/de/LC_MESSAGES/evolution-webcal.mo share/locale/dz/LC_MESSAGES/evolution-webcal.mo share/locale/el/LC_MESSAGES/evolution-webcal.mo +share/locale/en@shaw/LC_MESSAGES/evolution-webcal.mo share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo share/locale/es/LC_MESSAGES/evolution-webcal.mo @@ -46,6 +48,7 @@ share/locale/ml/LC_MESSAGES/evolution-webcal.mo share/locale/mr/LC_MESSAGES/evolution-webcal.mo share/locale/ms/LC_MESSAGES/evolution-webcal.mo share/locale/nb/LC_MESSAGES/evolution-webcal.mo +share/locale/nds/LC_MESSAGES/evolution-webcal.mo share/locale/ne/LC_MESSAGES/evolution-webcal.mo share/locale/nl/LC_MESSAGES/evolution-webcal.mo share/locale/nn/LC_MESSAGES/evolution-webcal.mo @@ -95,6 +98,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @@ -103,6 +108,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -111,5 +118,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/gir-repository-webkit/Makefile b/www/gir-repository-webkit/Makefile deleted file mode 100644 index 92ea9c5b7bac..000000000000 --- a/www/gir-repository-webkit/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: gir-repository-webkit -# Date created: 07 September 2009 -# Whom: Alexander Logvinov <avl@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/gir-repository-webkit/Makefile,v 1.2 2009/09/23 13:47:06 avl Exp $ -# - -CATEGORIES= www -PORTREVISION= 6 - -MASTERDIR= ${.CURDIR}/../../devel/gir-repository - -PKGNAMESUFFIX= -webkit - -.include "${MASTERDIR}/bsd.gir.mk" diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index 30a51da2e16d..a7ffc8dd9a74 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gnome-user-share/Makefile,v 1.17 2009/10/27 11:20:53 kwm Exp $ +# $MCom: ports/www/gnome-user-share/Makefile,v 1.21 2010/04/01 21:10:51 kwm Exp $ # PORTNAME= gnome-user-share -PORTVERSION= 2.28.2 -PORTREVISION= 5 +PORTVERSION= 2.30.0 CATEGORIES= www deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,14 +20,14 @@ LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app \ notify.1:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd \ - console-kit-daemon:${PORTSDIR}/sysutils/consolekit + console-kit-daemon:${PORTSDIR}/sysutils/consolekit USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_APACHE= 2.2+ USE_XORG= sm -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gconf2 gnomedocutils nautilus2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --with-modules-path=${LOCALBASE}/${APACHEMODDIR} diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo index 0d401c89b986..c0d7485256ba 100644 --- a/www/gnome-user-share/distinfo +++ b/www/gnome-user-share/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-share-2.28.2.tar.bz2) = 4a82f83ddf90c57dcfd1c79cba2bbd3f -SHA256 (gnome2/gnome-user-share-2.28.2.tar.bz2) = b3250a8fcccf9f750cfa83f06d9d89abf193df1b689e27bbc802299d6875cfd2 -SIZE (gnome2/gnome-user-share-2.28.2.tar.bz2) = 915004 +MD5 (gnome2/gnome-user-share-2.30.0.tar.bz2) = a736a1bebc1782d3d6e7a7239158f189 +SHA256 (gnome2/gnome-user-share-2.30.0.tar.bz2) = 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163 +SIZE (gnome2/gnome-user-share-2.30.0.tar.bz2) = 944583 diff --git a/www/gnome-user-share/files/patch-configure b/www/gnome-user-share/files/patch-configure index 52ca647a5e2f..27fe70c56841 100644 --- a/www/gnome-user-share/files/patch-configure +++ b/www/gnome-user-share/files/patch-configure @@ -1,38 +1,38 @@ ---- configure.orig 2009-10-27 12:12:48.000000000 +0100 -+++ configure 2009-10-27 12:15:00.000000000 +0100 -@@ -15214,12 +15214,12 @@ +--- configure.orig 2010-03-16 13:46:47.000000000 +0100 ++++ configure 2010-03-16 13:46:47.000000000 +0100 +@@ -13261,12 +13261,12 @@ pkg_cv_USER_SHARE_CFLAGS="$USER_SHARE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null` + pkg_cv_USER_SHARE_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null` else pkg_failed=yes fi -@@ -15230,12 +15230,12 @@ +@@ -13277,12 +13277,12 @@ pkg_cv_USER_SHARE_LIBS="$USER_SHARE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES \"") >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk \$DBUS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then - pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2" 2>/dev/null` + pkg_cv_USER_SHARE_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES" 2>/dev/null` else pkg_failed=yes fi -@@ -15253,14 +15253,14 @@ +@@ -13300,14 +13300,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -45,17 +45,8 @@ # Put the nasty error message in config.log where it belongs echo "$USER_SHARE_PKG_ERRORS" >&5 -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: - - $USER_SHARE_PKG_ERRORS - -@@ -15271,7 +15271,7 @@ - and USER_SHARE_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: -+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: +- as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES gnome-bluetooth-1.0 >= 2.27.7.2) were not met: ++ as_fn_error "Package requirements (glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk $DBUS_MODULES) were not met: $USER_SHARE_PKG_ERRORS diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist index 9d64b7329e80..6423483af4d5 100644 --- a/www/gnome-user-share/pkg-plist +++ b/www/gnome-user-share/pkg-plist @@ -1,5 +1,7 @@ bin/gnome-file-share-properties etc/xdg/autostart/gnome-user-share.desktop +lib/nautilus/extensions-2.0/libnautilus-share-extension.la +lib/nautilus/extensions-2.0/libnautilus-share-extension.so libexec/gnome-user-share share/applications/gnome-user-share-properties.desktop %%DATADIR%%/dav_groupfile @@ -78,6 +80,7 @@ share/icons/hicolor/32x32/apps/gnome-obex-server.png share/icons/hicolor/48x48/apps/gnome-obex-server.png share/locale/ar/LC_MESSAGES/gnome-user-share.mo share/locale/as/LC_MESSAGES/gnome-user-share.mo +share/locale/ast/LC_MESSAGES/gnome-user-share.mo share/locale/bg/LC_MESSAGES/gnome-user-share.mo share/locale/bn/LC_MESSAGES/gnome-user-share.mo share/locale/bn_IN/LC_MESSAGES/gnome-user-share.mo @@ -88,6 +91,7 @@ share/locale/da/LC_MESSAGES/gnome-user-share.mo share/locale/de/LC_MESSAGES/gnome-user-share.mo share/locale/dz/LC_MESSAGES/gnome-user-share.mo share/locale/el/LC_MESSAGES/gnome-user-share.mo +share/locale/en@shaw/LC_MESSAGES/gnome-user-share.mo share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo share/locale/eu/LC_MESSAGES/gnome-user-share.mo @@ -106,6 +110,7 @@ share/locale/ja/LC_MESSAGES/gnome-user-share.mo share/locale/kn/LC_MESSAGES/gnome-user-share.mo share/locale/ko/LC_MESSAGES/gnome-user-share.mo share/locale/lt/LC_MESSAGES/gnome-user-share.mo +share/locale/lv/LC_MESSAGES/gnome-user-share.mo share/locale/mai/LC_MESSAGES/gnome-user-share.mo share/locale/mk/LC_MESSAGES/gnome-user-share.mo share/locale/ml/LC_MESSAGES/gnome-user-share.mo @@ -188,11 +193,15 @@ share/omf/gnome-user-share/gnome-user-share-zh_CN.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 3018547c28ad..5d1f0f53d6d4 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.159 2009/10/18 04:03:22 marcus Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.169 2010/04/26 11:21:29 kwm Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.28.2 -PORTREVISION= 2 +PORTVERSION= 3.30.1 CATEGORIES= www gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index adf1f7062578..b544e2dc9835 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.28.2.tar.bz2) = 0a1b6b27b8b9f6a658c9ab323c95d36e -SHA256 (gnome2/gtkhtml-3.28.2.tar.bz2) = dc1526e2370d3e97d6c20c3fb6627e3148ca68d4b303325c89c678345d3e2ebf -SIZE (gnome2/gtkhtml-3.28.2.tar.bz2) = 1335457 +MD5 (gnome2/gtkhtml-3.30.1.tar.bz2) = f858b359511f1e1437ad826f4ce0eda9 +SHA256 (gnome2/gtkhtml-3.30.1.tar.bz2) = 70c8e2bffaff783408b847e54e9bb68f438dcd488721b9597168f88395a8f703 +SIZE (gnome2/gtkhtml-3.30.1.tar.bz2) = 1350166 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 520bc55ef52a..919730fbe361 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -48,9 +48,11 @@ share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png share/gtkhtml-%%VERSION%%/icons/texture.png share/gtkhtml-%%VERSION%%/icons/transparent.png share/gtkhtml-%%VERSION%%/keybindingsrc.emacs +share/locale/af/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/as/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/ast/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -64,6 +66,7 @@ share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/dz/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/en@shaw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/es/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -152,11 +155,15 @@ share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index 6959c7fae39a..19091f8e309a 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -81,6 +81,8 @@ post-patch: .endif @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-D.*_DISABLE_DEPRECATED=1||g' + @${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \ + ${WRKSRC}/configure pre-install: @${REINPLACE_CMD} -e 's|localen|locale|' \ diff --git a/www/libepc/Makefile b/www/libepc/Makefile index 04e872633065..44ee62a2580d 100644 --- a/www/libepc/Makefile +++ b/www/libepc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libepc -PORTVERSION= 0.3.10 -PORTREVISION= 3 +PORTVERSION= 0.3.11 CATEGORIES= www MASTER_SITES= GNOME @@ -26,5 +25,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --enable-static .include <bsd.port.mk> diff --git a/www/libepc/distinfo b/www/libepc/distinfo index 94cf057cda26..5cd3b04e2d5c 100644 --- a/www/libepc/distinfo +++ b/www/libepc/distinfo @@ -1,3 +1,3 @@ -MD5 (libepc-0.3.10.tar.bz2) = d5c07dd755305ccdbda9c2b4a2a95d33 -SHA256 (libepc-0.3.10.tar.bz2) = a98dfe2a3d3dd304efc2f5c80ff7a964edd542cf9f917f60c3339bd8adc61804 -SIZE (libepc-0.3.10.tar.bz2) = 407416 +MD5 (libepc-0.3.11.tar.bz2) = b0d63bf93c28a17ed84edd0eacc9781a +SHA256 (libepc-0.3.11.tar.bz2) = ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c +SIZE (libepc-0.3.11.tar.bz2) = 450567 diff --git a/www/libepc/files/patch-configure b/www/libepc/files/patch-configure deleted file mode 100644 index 7cc80526610e..000000000000 --- a/www/libepc/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2008-01-21 11:22:47.000000000 +0100 -+++ configure 2008-03-22 00:28:15.000000000 +0100 -@@ -22421,7 +22421,7 @@ - have_gio=yes - fi - --if test "2.2" == "$LIBSOUP_API" -+if test "2.2" = "$LIBSOUP_API" - then - - cat >>confdefs.h <<\_ACEOF -@@ -22430,7 +22430,7 @@ - - fi - --if test "yes" == "$have_gio" -+if test "yes" = "$have_gio" - then - LIBEPC_CFLAGS="$LIBEPC_CFLAGS $GIO_CFLAGS" - LIBEPC_LIBS="$LIBEPC_LIBS $GIO_LIBS" diff --git a/www/libepc/pkg-plist b/www/libepc/pkg-plist index b326b3659c1c..be26a9d7a3ad 100644 --- a/www/libepc/pkg-plist +++ b/www/libepc/pkg-plist @@ -37,13 +37,13 @@ libdata/pkgconfig/libepc-ui-1.0.pc %%DOCSDIR%%/left.png %%DOCSDIR%%/libepc-1.0.devhelp %%DOCSDIR%%/libepc-1.0.devhelp2 -%%DOCSDIR%%/libepc-1.0-EpcAuthContext.html -%%DOCSDIR%%/libepc-1.0-EpcContents.html -%%DOCSDIR%%/libepc-1.0-EpcProtocol.html -%%DOCSDIR%%/libepc-1.0-EpcServiceInfo.html -%%DOCSDIR%%/libepc-1.0-EpcServiceType.html -%%DOCSDIR%%/libepc-1.0-EpcShell.html -%%DOCSDIR%%/libepc-1.0-EpcTls.html +%%DOCSDIR%%/libepc-10-EpcAuthContext.html +%%DOCSDIR%%/libepc-10-EpcContents.html +%%DOCSDIR%%/libepc-10-EpcProtocol.html +%%DOCSDIR%%/libepc-10-EpcServiceInfo.html +%%DOCSDIR%%/libepc-10-EpcServiceType.html +%%DOCSDIR%%/libepc-10-EpcShell.html +%%DOCSDIR%%/libepc-10-EpcTls.html %%DOCSDIR%%/publishing.html %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css @@ -51,12 +51,15 @@ libdata/pkgconfig/libepc-ui-1.0.pc %%DOCSDIR%%/widgets.html share/locale/ar/LC_MESSAGES/libepc.mo share/locale/ca/LC_MESSAGES/libepc.mo +share/locale/cs/LC_MESSAGES/libepc.mo +share/locale/da/LC_MESSAGES/libepc.mo share/locale/de/LC_MESSAGES/libepc.mo share/locale/el/LC_MESSAGES/libepc.mo share/locale/en_GB/LC_MESSAGES/libepc.mo share/locale/es/LC_MESSAGES/libepc.mo share/locale/fi/LC_MESSAGES/libepc.mo share/locale/fr/LC_MESSAGES/libepc.mo +share/locale/gl/LC_MESSAGES/libepc.mo share/locale/it/LC_MESSAGES/libepc.mo share/locale/ja/LC_MESSAGES/libepc.mo share/locale/nb/LC_MESSAGES/libepc.mo @@ -65,16 +68,7 @@ share/locale/pt_BR/LC_MESSAGES/libepc.mo share/locale/sl/LC_MESSAGES/libepc.mo share/locale/sv/LC_MESSAGES/libepc.mo share/locale/th/LC_MESSAGES/libepc.mo -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca +share/locale/zh_CN/LC_MESSAGES/libepc.mo @dirrm %%DOCSDIR%% @dirrm include/libepc-ui-1.0/libepc-ui @dirrm include/libepc-ui-1.0 diff --git a/www/midori/Makefile b/www/midori/Makefile index abb8e83181f2..4bf77d835e4f 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/midori/Makefile,v 1.19 2009/10/22 21:20:56 kwm Exp $ +# $MCom: ports/www/midori/Makefile,v 1.21 2010/04/05 21:56:26 kwm Exp $ # PORTNAME= midori -PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTVERSION= 0.2.4 CATEGORIES= www MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/ diff --git a/www/midori/distinfo b/www/midori/distinfo index 73611c82cce6..46bafdb862c6 100644 --- a/www/midori/distinfo +++ b/www/midori/distinfo @@ -1,3 +1,3 @@ -MD5 (midori-0.2.2.tar.bz2) = 14f81a7a10f80a173da1b5e88713400b -SHA256 (midori-0.2.2.tar.bz2) = bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07 -SIZE (midori-0.2.2.tar.bz2) = 613546 +MD5 (midori-0.2.4.tar.bz2) = ccd2ae162993c2c92c9e0eac7778c62d +SHA256 (midori-0.2.4.tar.bz2) = 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f +SIZE (midori-0.2.4.tar.bz2) = 645554 diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist index 84ef5f6d2c8e..cafc5de0d7f2 100644 --- a/www/midori/pkg-plist +++ b/www/midori/pkg-plist @@ -3,7 +3,6 @@ etc/xdg/midori/search lib/midori/libadblock.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so -lib/midori/libdnsprefetch.so lib/midori/libfeed-panel.so lib/midori/libformhistory.so lib/midori/libmouse-gestures.so diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index 76d5aa86cadd..180b20cac9eb 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -33,6 +33,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's| @| |;s|-O |$${CFLAGS}|'\ + -e 's|-DGTK_DISABLE_DEPRECATED||g' \ ${WRKSRC}/makefile pre-build: diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile index 4f8641a8e9f4..004d45536478 100644 --- a/www/osb-nrcit/Makefile +++ b/www/osb-nrcit/Makefile @@ -34,6 +34,7 @@ post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g ; \ s|-nostdinc++||g ; \ s|-Werror||g ; \ + s|-DGTK_DISABLE_DEPRECATED||g ; \ s|-nodefaultlibs -lgcc -lc||g' ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 863921e61019..2e06e54b8d0f 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.50 2009/11/28 17:35:07 kwm Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.60 2010/04/05 17:39:13 kwm Exp $ # PORTNAME= webkit -PORTVERSION= 1.1.15.4 -PORTREVISION= 4 +PORTVERSION= 1.2.0 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/ PKGNAMESUFFIX= -gtk2 @@ -16,11 +15,14 @@ PKGNAMESUFFIX= -gtk2 MAINTAINER= gnome@FreeBSD.org COMMENT= An opensource browser engine -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex +BUILD_DEPENDS= ${LOCALBASE}/bin/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= enchant.1:${PORTSDIR}/textproc/enchant \ curl.6:${PORTSDIR}/ftp/curl \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ soup-2.4.1:${PORTSDIR}/devel/libsoup +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup WANT_GSTREAMER= yes MAKE_JOBS_SAFE= yes @@ -38,7 +40,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ ac_cv_path_DOLT_BASH="" CONFIGURE_ARGS= --enable-icon-database \ --enable-svg \ - --enable-svg-fonts + --enable-svg-fonts \ + --enable-introspection MAKEFILE= GNUmakefile BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 @@ -50,10 +53,6 @@ OPTIONS= VIDEO "Enable video support" on \ .include <bsd.port.pre.mk> -.if ${ARCH} == "ia64" -BROKEN= Does not compile on ia64 -.endif - .if exists (${LOCALBASE}/lib/libicutu.so.43) LIB_DEPENDS+= icutu.43:${PORTSDIR}/devel/icu4 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-WebCore_platform_text_TextBreakIterator.h @@ -81,10 +80,7 @@ PLIST_SUB+= STATIC="@comment " .if ${OSVERSION} < 700000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \ - ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h \ - ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubs.cpp + ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h .endif post-patch: diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index 412335d8ad21..0b82171d111b 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (webkit-1.1.15.4.tar.gz) = 47301fb7120421ac38bf714db8f5d428 -SHA256 (webkit-1.1.15.4.tar.gz) = ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f -SIZE (webkit-1.1.15.4.tar.gz) = 6093252 +MD5 (webkit-1.2.0.tar.gz) = b2bfcbc4bbf1d0a51f848cb54c21ee66 +SHA256 (webkit-1.2.0.tar.gz) = 0ce49278970857db374d31fd1831bf42ffb1dca4797ef39911a96d01d8c5e1f7 +SIZE (webkit-1.2.0.tar.gz) = 7554632 diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h index dc03dce02dc1..8bb6f17ce64b 100644 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h @@ -1,11 +1,11 @@ ---- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400 -+++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400 -@@ -69,7 +69,7 @@ public: - - template<typename FunctionType> - explicit FunctionPtr(FunctionType* value) +--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2010-01-14 15:19:17.000000000 +0000 ++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2010-01-14 15:21:00.000000000 +0000 +@@ -74,7 +74,7 @@ public: + // Error: #694: reinterpret_cast cannot cast away const or other type qualifiers + : m_value((void*)(value)) + #else - : m_value(reinterpret_cast<void*>(value)) + : m_value((void*)(value)) + #endif { ASSERT_VALID_CODE_POINTER(m_value); - } diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp deleted file mode 100644 index 6e6ffe831486..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400 -+++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500 -@@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo - emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); - move(ImmPtr(&globalData->exceptionLocation), regT2); - storePtr(regT1, regT2); -- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); -+ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); - emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); - poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); - restoreReturnAddressBeforeReturn(regT2); -@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo - emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); - move(ImmPtr(&globalData->exceptionLocation), regT2); - storePtr(regT1, regT2); -- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); -+ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); - emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); - poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); - restoreReturnAddressBeforeReturn(regT2); diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h deleted file mode 100644 index 4d4a76bce3f0..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h +++ /dev/null @@ -1,65 +0,0 @@ ---- JavaScriptCore/jit/JITStubCall.h.orig 2009-10-18 13:44:09.000000000 -0400 -+++ JavaScriptCore/jit/JITStubCall.h 2009-10-18 13:45:53.000000000 -0400 -@@ -36,7 +36,7 @@ namespace JSC { - public: - JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Cell) - , m_stackIndex(stackIndexStart) - { -@@ -44,7 +44,7 @@ namespace JSC { - - JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Cell) - , m_stackIndex(stackIndexStart) - { -@@ -52,7 +52,7 @@ namespace JSC { - - JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(VoidPtr) - , m_stackIndex(stackIndexStart) - { -@@ -60,7 +60,7 @@ namespace JSC { - - JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Int) - , m_stackIndex(stackIndexStart) - { -@@ -68,7 +68,7 @@ namespace JSC { - - JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Int) - , m_stackIndex(stackIndexStart) - { -@@ -76,7 +76,7 @@ namespace JSC { - - JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Void) - , m_stackIndex(stackIndexStart) - { -@@ -85,7 +85,7 @@ namespace JSC { - #if USE(JSVALUE32_64) - JITStubCall(JIT* jit, EncodedJSValue (JIT_STUB *stub)(STUB_ARGS_DECLARATION)) - : m_jit(jit) -- , m_stub(reinterpret_cast<void*>(stub)) -+ , m_stub((void*)(stub)) - , m_returnType(Value) - , m_stackIndex(stackIndexStart) - { diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp deleted file mode 100644 index 59229e8bc82e..000000000000 --- a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- JavaScriptCore/jit/JITStubs.cpp.orig 2009-10-19 15:13:27.000000000 -0400 -+++ JavaScriptCore/jit/JITStubs.cpp 2009-10-19 15:13:46.000000000 -0400 -@@ -2672,7 +2672,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_ - - if (!handler) { - *stackFrame.exception = exceptionValue; -- STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught)); -+ STUB_SET_RETURN_ADDRESS((void*)(ctiOpThrowNotCaught)); - return JSValue::encode(jsNull()); - } - diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h b/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h index b2fc49091d85..9c32953b9c91 100644 --- a/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h +++ b/www/webkit-gtk2/files/patch-JavaScriptCore-runtime_JSValue.h @@ -1,24 +1,14 @@ ---- JavaScriptCore/runtime/JSValue.h.orig 2010-03-24 09:42:34.000000000 +0100 -+++ JavaScriptCore/runtime/JSValue.h 2010-03-24 09:44:47.000000000 +0100 -@@ -464,13 +464,21 @@ - inline JSValue::JSValue(JSCell* ptr) - { - u.asBits.tag = CellTag; -+#if defined(__sparc64__) +--- JavaScriptCore/runtime/JSValue.h.orig 2010-02-05 17:26:52.000000000 +0100 ++++ JavaScriptCore/runtime/JSValue.h 2010-03-25 21:43:11.000000000 +0100 +@@ -491,7 +491,11 @@ namespace JSC { + u.asBits.tag = CellTag; + else + u.asBits.tag = EmptyValueTag; ++#if defined(__sparc64) + u.asBits.payload = reinterpret_cast<int64_t>(ptr); +#else u.asBits.payload = reinterpret_cast<int32_t>(ptr); +#endif - } - - inline JSValue::JSValue(const JSCell* ptr) - { - u.asBits.tag = CellTag; -+#if defined(__sparc64__) -+ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr)); -+#else - u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); -+#endif - } - - inline JSValue::operator bool() const + #if ENABLE(JSC_ZOMBIES) + ASSERT(!isZombie()); + #endif diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h deleted file mode 100644 index 1b4d9eec188f..000000000000 --- a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- JavaScriptCore/wtf/Platform.h.orig 2009-09-20 01:06:03.000000000 +0200 -+++ JavaScriptCore/wtf/Platform.h 2009-09-21 22:01:16.000000000 +0200 -@@ -626,7 +626,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX)) -+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD)) - #define WTF_USE_JSVALUE64 1 - #elif PLATFORM(ARM) || PLATFORM(PPC64) - #define WTF_USE_JSVALUE32 1 diff --git a/www/webkit-gtk2/files/patch-add-gzip b/www/webkit-gtk2/files/patch-add-gzip deleted file mode 100644 index 47ad365a3f08..000000000000 --- a/www/webkit-gtk2/files/patch-add-gzip +++ /dev/null @@ -1,35 +0,0 @@ -Committed to webkit trunk. Use libsoup 2.28.2 gzip encoding. -http://trac.webkit.org/changeset/52208 - -diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp -index 6367a3e..5a229b8 100644 ---- WebCore/platform/network/soup/ResourceHandleSoup.cpp -+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp -@@ -548,12 +548,6 @@ static bool startHttp(ResourceHandle* handle) - // balanced by a deref() in finishedCallback, which should always run - handle->ref(); - -- // FIXME: For now, we cannot accept content encoded in anything -- // other than identity, so force servers to do it our way. When -- // libsoup gets proper Content-Encoding support we will want to -- // use it here instead. -- soup_message_headers_replace(d->m_msg->request_headers, "Accept-Encoding", "identity"); -- - // Balanced in ResourceHandleInternal's destructor; we need to - // keep our own ref, because after queueing the message, the - // session owns the initial reference. - -diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp -index c80160c..95a5717 100644 ---- WebKit/gtk/webkit/webkitprivate.cpp -+++ WebKit/gtk/webkit/webkitprivate.cpp -@@ -280,6 +280,8 @@ void webkit_init() - SoupSessionFeature* sniffer = static_cast<SoupSessionFeature*>(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL)); - soup_session_add_feature(session, sniffer); - g_object_unref(sniffer); -+ -+ soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER); - } - - void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains) - diff --git a/www/webkit-gtk2/files/patch-webkitnetworkresponse b/www/webkit-gtk2/files/patch-webkitnetworkresponse deleted file mode 100644 index 7b17a498200b..000000000000 --- a/www/webkit-gtk2/files/patch-webkitnetworkresponse +++ /dev/null @@ -1,215 +0,0 @@ -From d42f4dd5b4ead39771d8822ac4c67a0d48a41040 Mon Sep 17 00:00:00 2001 -From: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> -Date: Sun, 25 Oct 2009 18:29:35 -0200 -Subject: [PATCH] Use WebKitNetworkResponse - - WebKit/gtk/ChangeLog | 26 +++++++++++++ - WebKit/gtk/webkit/webkitdownload.cpp | 67 +++++++++++++++++++++++++++++----- - WebKit/gtk/webkit/webkitdownload.h | 3 ++ - 3 files changed, 86 insertions(+), 10 deletions(-) - -2009-10-25 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> - - Reviewed by NOBODY (OOPS!). - - https://bugs.webkit.org/show_bug.cgi?id=30759 - [GTK] Should use WebKitNetworkResponse, and expose it - - WebKitDownload now uses our WebKitNetworkResponse instead of using - ResourceResponse directly. By exposing the response, like we do - with the request, we give our users the ability to look at the - response headers, status code, and so on, through the SoupMessage - object. - - * webkit/webkitdownload.cpp: - (webkit_download_dispose): - (webkit_download_finalize): - (webkit_download_get_property): - (webkit_download_set_property): - (webkit_download_class_init): - (webkit_download_get_network_response): - (webkit_download_set_response): - (webkit_download_get_total_size): - (webkit_download_get_progress): - (webkit_download_received_data): - * webkit/webkitdownload.h: - ---- -diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp -index 568378c..dd6629b 100644 ---- WebKit/gtk/webkit/webkitdownload.cpp -+++ WebKit/gtk/webkit/webkitdownload.cpp -@@ -31,6 +31,7 @@ - #include "webkitdownload.h" - #include "webkitenumtypes.h" - #include "webkitmarshal.h" -+#include "webkitnetworkresponse.h" - #include "webkitprivate.h" - - #include <glib/gstdio.h> -@@ -74,7 +75,7 @@ struct _WebKitDownloadPrivate { - GFileOutputStream* outputStream; - DownloadClient* downloadClient; - WebKitNetworkRequest* networkRequest; -- ResourceResponse* networkResponse; -+ WebKitNetworkResponse* networkResponse; - RefPtr<ResourceHandle> resourceHandle; - }; - -@@ -95,7 +96,8 @@ enum { - PROP_PROGRESS, - PROP_STATUS, - PROP_CURRENT_SIZE, -- PROP_TOTAL_SIZE -+ PROP_TOTAL_SIZE, -+ PROP_NETWORK_RESPONSE - }; - - G_DEFINE_TYPE(WebKitDownload, webkit_download, G_TYPE_OBJECT); -@@ -119,6 +121,11 @@ static void webkit_download_dispose(GObject* object) - priv->networkRequest = NULL; - } - -+ if (priv->networkResponse) { -+ g_object_unref(priv->networkResponse); -+ priv->networkResponse = NULL; -+ } -+ - G_OBJECT_CLASS(webkit_download_parent_class)->dispose(object); - } - -@@ -138,7 +145,6 @@ static void webkit_download_finalize(GObject* object) - } - - delete priv->downloadClient; -- delete priv->networkResponse; - - // The download object may never have _start called on it, so we - // need to make sure timer is non-NULL. -@@ -159,6 +165,9 @@ static void webkit_download_get_property(GObject* object, guint prop_id, GValue* - case PROP_NETWORK_REQUEST: - g_value_set_object(value, webkit_download_get_network_request(download)); - break; -+ case PROP_NETWORK_RESPONSE: -+ g_value_set_object(value, webkit_download_get_network_response(download)); -+ break; - case PROP_DESTINATION_URI: - g_value_set_string(value, webkit_download_get_destination_uri(download)); - break; -@@ -191,6 +200,9 @@ static void webkit_download_set_property(GObject* object, guint prop_id, const G - case PROP_NETWORK_REQUEST: - priv->networkRequest = WEBKIT_NETWORK_REQUEST(g_value_dup_object(value)); - break; -+ case PROP_NETWORK_RESPONSE: -+ priv->networkResponse = WEBKIT_NETWORK_RESPONSE(g_value_dup_object(value)); -+ break; - case PROP_DESTINATION_URI: - webkit_download_set_destination_uri(download, g_value_get_string(value)); - break; -@@ -252,6 +264,21 @@ static void webkit_download_class_init(WebKitDownloadClass* downloadClass) - (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); - - /** -+ * WebKitDownload:network-response -+ * -+ * The #WebKitNetworkResponse instance associated with the download. -+ * -+ * Since: 1.1.16 -+ */ -+ g_object_class_install_property(objectClass, -+ PROP_NETWORK_RESPONSE, -+ g_param_spec_object("network-response", -+ _("Network Response"), -+ _("The network response for the URI that should be downloaded"), -+ WEBKIT_TYPE_NETWORK_RESPONSE, -+ (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); -+ -+ /** - * WebKitDownload:destination-uri - * - * The URI of the save location for this download. -@@ -530,11 +557,29 @@ WebKitNetworkRequest* webkit_download_get_network_request(WebKitDownload* downlo - return priv->networkRequest; - } - -+/** -+ * webkit_download_get_network_response: -+ * @download: the #WebKitDownload -+ * -+ * Retrieves the #WebKitNetworkResponse object that backs the download -+ * process. -+ * -+ * Returns: the #WebKitNetworkResponse instance -+ * -+ * Since: 1.1.16 -+ */ -+WebKitNetworkResponse* webkit_download_get_network_response(WebKitDownload* download) -+{ -+ g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), NULL); -+ -+ WebKitDownloadPrivate* priv = download->priv; -+ return priv->networkResponse; -+} -+ - static void webkit_download_set_response(WebKitDownload* download, const ResourceResponse& response) - { -- // FIXME Use WebKitNetworkResponse when it's merged. - WebKitDownloadPrivate* priv = download->priv; -- priv->networkResponse = new ResourceResponse(response); -+ priv->networkResponse = webkit_network_response_new_with_core_response(response); - - if (!response.isNull() && !response.suggestedFilename().isEmpty()) - webkit_download_set_suggested_filename(download, response.suggestedFilename().utf8().data()); -@@ -704,10 +749,12 @@ guint64 webkit_download_get_total_size(WebKitDownload* download) - g_return_val_if_fail(WEBKIT_IS_DOWNLOAD(download), 0); - - WebKitDownloadPrivate* priv = download->priv; -- if (!priv->networkResponse) -+ SoupMessage* message = priv->networkResponse ? webkit_network_response_get_message(priv->networkResponse) : NULL; -+ -+ if (!message) - return 0; - -- return MAX(priv->currentSize, priv->networkResponse->expectedContentLength()); -+ return MAX(priv->currentSize, soup_message_headers_get_content_length(message->response_headers)); - } - - /** -@@ -744,9 +791,9 @@ gdouble webkit_download_get_progress(WebKitDownload* download) - - WebKitDownloadPrivate* priv = download->priv; - if (!priv->networkResponse) -- return 0; -+ return 0.0; - -- gdouble total_size = (gdouble)priv->networkResponse->expectedContentLength(); -+ gdouble total_size = static_cast<gdouble>(webkit_download_get_total_size(download)); - - if (total_size == 0) - return 1.0; -@@ -803,7 +850,7 @@ static void webkit_download_received_data(WebKitDownload* download, const gchar* - g_object_notify(G_OBJECT(download), "current-size"); - - ASSERT(priv->networkResponse); -- if (priv->currentSize > priv->networkResponse->expectedContentLength()) -+ if (priv->currentSize > webkit_download_get_total_size(download)) - g_object_notify(G_OBJECT(download), "total-size"); - - gdouble lastProgress = webkit_download_get_progress(download); -diff --git a/WebKit/gtk/webkit/webkitdownload.h b/WebKit/gtk/webkit/webkitdownload.h -index 6e7f38b..a732a57 100644 ---- WebKit/gtk/webkit/webkitdownload.h -+++ WebKit/gtk/webkit/webkitdownload.h -@@ -84,6 +84,9 @@ webkit_download_get_uri (WebKitDownload *download); - WEBKIT_API WebKitNetworkRequest* - webkit_download_get_network_request (WebKitDownload *download); - -+WEBKIT_API WebKitNetworkResponse* -+webkit_download_get_network_response (WebKitDownload *download); -+ - WEBKIT_API const gchar* - webkit_download_get_suggested_filename (WebKitDownload *download); - --- -1.6.5 - diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index 3e9628ce253a..7a56fc23b207 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -14,6 +14,7 @@ include/webkit-1.0/webkit/webkitdefines.h include/webkit-1.0/webkit/webkitdownload.h include/webkit-1.0/webkit/webkitenumtypes.h include/webkit-1.0/webkit/webkiterror.h +include/webkit-1.0/webkit/webkitgeolocationpolicydecision.h include/webkit-1.0/webkit/webkithittestresult.h include/webkit-1.0/webkit/webkitnetworkrequest.h include/webkit-1.0/webkit/webkitnetworkresponse.h @@ -33,21 +34,34 @@ include/webkit-1.0/webkit/webkitwebsettings.h include/webkit-1.0/webkit/webkitwebview.h include/webkit-1.0/webkit/webkitwebwindowfeatures.h %%STATIC%%lib/libwebkit-1.0.a +lib/girepository-1.0/JSCore-1.0.typelib +lib/girepository-1.0/WebKit-1.0.typelib lib/libwebkit-1.0.la lib/libwebkit-1.0.so lib/libwebkit-1.0.so.13 libdata/pkgconfig/webkit-1.0.pc +share/gir-1.0/JSCore-1.0.gir +share/gir-1.0/WebKit-1.0.gir +share/locale/cs/LC_MESSAGES/webkit.mo share/locale/de/LC_MESSAGES/webkit.mo share/locale/en_GB/LC_MESSAGES/webkit.mo share/locale/es/LC_MESSAGES/webkit.mo +share/locale/et/LC_MESSAGES/webkit.mo +share/locale/gu/LC_MESSAGES/webkit.mo +share/locale/he/LC_MESSAGES/webkit.mo share/locale/it/LC_MESSAGES/webkit.mo share/locale/lt/LC_MESSAGES/webkit.mo +share/locale/lv/LC_MESSAGES/webkit.mo share/locale/nl/LC_MESSAGES/webkit.mo +share/locale/pa/LC_MESSAGES/webkit.mo +share/locale/pt/LC_MESSAGES/webkit.mo share/locale/pt_BR/LC_MESSAGES/webkit.mo share/locale/ru/LC_MESSAGES/webkit.mo +share/locale/sl/LC_MESSAGES/webkit.mo share/locale/sr/LC_MESSAGES/webkit.mo share/locale/sr@latin/LC_MESSAGES/webkit.mo share/locale/sv/LC_MESSAGES/webkit.mo +share/locale/uk/LC_MESSAGES/webkit.mo share/locale/vi/LC_MESSAGES/webkit.mo share/locale/zh_CN/LC_MESSAGES/webkit.mo share/webkit-1.0/images/deleteButton.png @@ -57,19 +71,28 @@ 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/AbstractTimelinePanel.js +share/webkit-1.0/webinspector/AuditCategories.js +share/webkit-1.0/webinspector/AuditLauncherView.js +share/webkit-1.0/webinspector/AuditResultView.js +share/webkit-1.0/webinspector/AuditRules.js +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/CallStackSidebarPane.js share/webkit-1.0/webinspector/Callback.js share/webkit-1.0/webinspector/ChangesView.js +share/webkit-1.0/webinspector/Checkbox.js share/webkit-1.0/webinspector/Color.js +share/webkit-1.0/webinspector/ConsolePanel.js share/webkit-1.0/webinspector/ConsoleView.js +share/webkit-1.0/webinspector/ContextMenu.js 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/DOMStorageDataGrid.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 @@ -77,13 +100,22 @@ share/webkit-1.0/webinspector/DatabaseTableView.js share/webkit-1.0/webinspector/Drawer.js share/webkit-1.0/webinspector/ElementsPanel.js share/webkit-1.0/webinspector/ElementsTreeOutline.js +share/webkit-1.0/webinspector/EventListenersSidebarPane.js share/webkit-1.0/webinspector/FontView.js share/webkit-1.0/webinspector/ImageView.js +share/webkit-1.0/webinspector/Images/auditsIcon.png share/webkit-1.0/webinspector/Images/back.png +share/webkit-1.0/webinspector/Images/breakpointBorder.png +share/webkit-1.0/webinspector/Images/breakpointConditionalBorder.png +share/webkit-1.0/webinspector/Images/breakpointConditionalCounterBorder.png +share/webkit-1.0/webinspector/Images/breakpointCounterBorder.png +share/webkit-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png +share/webkit-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png share/webkit-1.0/webinspector/Images/checker.png share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png share/webkit-1.0/webinspector/Images/closeButtons.png share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png +share/webkit-1.0/webinspector/Images/consoleIcon.png share/webkit-1.0/webinspector/Images/cookie.png share/webkit-1.0/webinspector/Images/database.png share/webkit-1.0/webinspector/Images/databaseTable.png @@ -107,9 +139,11 @@ share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png share/webkit-1.0/webinspector/Images/errorIcon.png share/webkit-1.0/webinspector/Images/errorMediumIcon.png +share/webkit-1.0/webinspector/Images/errorRedDot.png share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png share/webkit-1.0/webinspector/Images/focusButtonGlyph.png share/webkit-1.0/webinspector/Images/forward.png +share/webkit-1.0/webinspector/Images/gearButtonGlyph.png share/webkit-1.0/webinspector/Images/glossyHeader.png share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png @@ -117,6 +151,7 @@ share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png share/webkit-1.0/webinspector/Images/goArrow.png share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png +share/webkit-1.0/webinspector/Images/grayConnectorPoint.png share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png share/webkit-1.0/webinspector/Images/localStorage.png share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png @@ -126,11 +161,14 @@ share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png share/webkit-1.0/webinspector/Images/paneSettingsButtons.png share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png share/webkit-1.0/webinspector/Images/percentButtonGlyph.png +share/webkit-1.0/webinspector/Images/popoverArrows.png +share/webkit-1.0/webinspector/Images/popoverBackground.png share/webkit-1.0/webinspector/Images/profileGroupIcon.png share/webkit-1.0/webinspector/Images/profileIcon.png share/webkit-1.0/webinspector/Images/profileSmallIcon.png share/webkit-1.0/webinspector/Images/profilesIcon.png share/webkit-1.0/webinspector/Images/profilesSilhouette.png +share/webkit-1.0/webinspector/Images/programCounterBorder.png share/webkit-1.0/webinspector/Images/radioDot.png share/webkit-1.0/webinspector/Images/recordButtonGlyph.png share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png @@ -158,9 +196,9 @@ share/webkit-1.0/webinspector/Images/segmentHoverEnd.png share/webkit-1.0/webinspector/Images/segmentSelected.png share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png share/webkit-1.0/webinspector/Images/sessionStorage.png +share/webkit-1.0/webinspector/Images/spinner.gif share/webkit-1.0/webinspector/Images/splitviewDimple.png share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png -share/webkit-1.0/webinspector/Images/storageIcon.png share/webkit-1.0/webinspector/Images/statusbarBackground.png share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png share/webkit-1.0/webinspector/Images/statusbarButtons.png @@ -168,6 +206,23 @@ share/webkit-1.0/webinspector/Images/statusbarMenuButton.png share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png +share/webkit-1.0/webinspector/Images/storageIcon.png +share/webkit-1.0/webinspector/Images/successGreenDot.png +share/webkit-1.0/webinspector/Images/thumbActiveHoriz.png +share/webkit-1.0/webinspector/Images/thumbActiveVert.png +share/webkit-1.0/webinspector/Images/thumbHoriz.png +share/webkit-1.0/webinspector/Images/thumbHoverHoriz.png +share/webkit-1.0/webinspector/Images/thumbHoverVert.png +share/webkit-1.0/webinspector/Images/thumbVert.png +share/webkit-1.0/webinspector/Images/timelineBarBlue.png +share/webkit-1.0/webinspector/Images/timelineBarGray.png +share/webkit-1.0/webinspector/Images/timelineBarGreen.png +share/webkit-1.0/webinspector/Images/timelineBarOrange.png +share/webkit-1.0/webinspector/Images/timelineBarPurple.png +share/webkit-1.0/webinspector/Images/timelineBarRed.png +share/webkit-1.0/webinspector/Images/timelineBarYellow.png +share/webkit-1.0/webinspector/Images/timelineCheckmarks.png +share/webkit-1.0/webinspector/Images/timelineDots.png share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png @@ -175,6 +230,7 @@ share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png +share/webkit-1.0/webinspector/Images/timelineIcon.png share/webkit-1.0/webinspector/Images/timelinePillBlue.png share/webkit-1.0/webinspector/Images/timelinePillGray.png share/webkit-1.0/webinspector/Images/timelinePillGreen.png @@ -182,11 +238,9 @@ share/webkit-1.0/webinspector/Images/timelinePillOrange.png share/webkit-1.0/webinspector/Images/timelinePillPurple.png share/webkit-1.0/webinspector/Images/timelinePillRed.png share/webkit-1.0/webinspector/Images/timelinePillYellow.png -share/webkit-1.0/webinspector/Images/tipBalloon.png -share/webkit-1.0/webinspector/Images/tipBalloonBottom.png -share/webkit-1.0/webinspector/Images/tipIcon.png -share/webkit-1.0/webinspector/Images/tipIconPressed.png share/webkit-1.0/webinspector/Images/toolbarItemSelected.png +share/webkit-1.0/webinspector/Images/trackHoriz.png +share/webkit-1.0/webinspector/Images/trackVert.png share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png @@ -199,9 +253,14 @@ share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png 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/warningOrangeDot.png share/webkit-1.0/webinspector/Images/warningsErrors.png +share/webkit-1.0/webinspector/Images/whiteConnectorPoint.png +share/webkit-1.0/webinspector/InjectedFakeWorker.js 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/KeyboardShortcut.js share/webkit-1.0/webinspector/MetricsSidebarPane.js share/webkit-1.0/webinspector/Object.js @@ -210,7 +269,7 @@ share/webkit-1.0/webinspector/ObjectProxy.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/Popup.js +share/webkit-1.0/webinspector/Popover.js share/webkit-1.0/webinspector/ProfileDataGridTree.js share/webkit-1.0/webinspector/ProfileView.js share/webkit-1.0/webinspector/ProfilesPanel.js @@ -224,23 +283,42 @@ 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/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/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 share/webkit-1.0/webinspector/StylesSidebarPane.js share/webkit-1.0/webinspector/SummaryBar.js +share/webkit-1.0/webinspector/TestController.js +share/webkit-1.0/webinspector/TextEditorHighlighter.js +share/webkit-1.0/webinspector/TextEditorModel.js share/webkit-1.0/webinspector/TextPrompt.js +share/webkit-1.0/webinspector/TextViewer.js share/webkit-1.0/webinspector/TimelineAgent.js +share/webkit-1.0/webinspector/TimelineGrid.js +share/webkit-1.0/webinspector/TimelineOverviewPane.js +share/webkit-1.0/webinspector/TimelinePanel.js share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js share/webkit-1.0/webinspector/View.js share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js +share/webkit-1.0/webinspector/WelcomeView.js +share/webkit-1.0/webinspector/WorkersSidebarPane.js +share/webkit-1.0/webinspector/audits.css 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/inspectorSyntaxHighlight.css share/webkit-1.0/webinspector/localizedStrings.js +share/webkit-1.0/webinspector/popover.css +share/webkit-1.0/webinspector/textViewer.css share/webkit-1.0/webinspector/treeoutline.js share/webkit-1.0/webinspector/utilities.js @dirrm share/webkit-1.0/webinspector/Images |