1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00

Update to 2.28.2.

This commit is contained in:
Joe Marcus Clarke 2009-12-18 07:00:52 +00:00
parent 8fdcc758a4
commit 5238a8e7f4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=246129
6 changed files with 25 additions and 64 deletions

View File

@ -7,8 +7,8 @@
#
PORTNAME= epiphany
PORTVERSION= 2.28.1
PORTREVISION?= 1
PORTVERSION= 2.28.2
PORTREVISION?= 0
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2

View File

@ -1,3 +1,3 @@
MD5 (gnome2/epiphany-2.28.1.tar.bz2) = 7a8b885a4894d2a9e979b8cb8898db1e
SHA256 (gnome2/epiphany-2.28.1.tar.bz2) = 95ccdd36bc7fdf95c6085da3b76cee6467f3c9a8745541cfb09fdd8d33a1f04d
SIZE (gnome2/epiphany-2.28.1.tar.bz2) = 5693411
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

View File

@ -1,10 +0,0 @@
--- embed/ephy-embed-utils.c.orig 2009-10-13 15:28:59.000000000 +0200
+++ embed/ephy-embed-utils.c 2009-10-13 15:29:30.000000000 +0200
@@ -91,6 +91,7 @@ ephy_embed_utils_address_has_web_scheme
g_str_has_prefix (address, "file:") ||
g_str_has_prefix (address, "data:") ||
g_str_has_prefix (address, "about:") ||
+ g_str_has_prefix (address, "javascript:") ||
g_str_has_prefix (address, "gopher:"));
return has_web_scheme;

View File

@ -1,14 +0,0 @@
--- embed/ephy-web-view.c.orig 2009-10-13 15:30:12.000000000 +0200
+++ embed/ephy-web-view.c 2009-10-13 15:30:52.000000000 +0200
@@ -1129,7 +1129,10 @@ ephy_web_view_load_url (EphyWebView *vie
else
effective_url = ephy_embed_utils_normalize_address (url);
- webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
+ if (g_str_has_prefix (effective_url, "javascript:"))
+ webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view), effective_url);
+ else
+ webkit_web_view_open (WEBKIT_WEB_VIEW (view), effective_url);
if (soup_uri)
soup_uri_free (soup_uri);

View File

@ -17,4 +17,24 @@
+ }
}
static void
--- lib/ephy-spell-check.c.orig 2008-03-17 00:41:47.000000000 -0400
+++ lib/ephy-spell-check.c 2008-03-17 00:47:22.000000000 -0400
@@ -69,8 +69,15 @@ ephy_spell_check_init (EphySpellCheck *s
priv->dict = enchant_broker_request_dict (priv->broker, *locale);
if (priv->dict != NULL) break;
}
- if (priv->dict == NULL)
- g_warning (enchant_broker_get_error (priv->broker));
+ if (priv->dict == NULL) {
+ g_warning ("No dictionary found for current locale; trying 'en'");
+ priv->dict = enchant_broker_request_dict (priv->broker, "en");
+
+ if (priv->dict == NULL) {
+ g_warning (enchant_broker_get_error (priv->broker));
+ g_warning ("No dictionary found; expect a crash until LANG is properly set");
+ }
+ }
}
static void

View File

@ -1,35 +0,0 @@
From c61c318aabdc980477dccd78549fe9819c3b1fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Fri, 9 Oct 2009 20:07:20 +0200
Subject: [PATCH] Pass mailto: URI to gtk_show_uri()
(Part of) Bug #584537
---
src/ephy-window.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 635a779..630ecec 100644
--- src/ephy-window.c
+++ src/ephy-window.c
@@ -2548,10 +2548,18 @@ policy_decision_required_cb (WebKitWebView *web_view,
WebKitWebNavigationReason reason;
gint button;
gint state;
+ const char *uri;
reason = webkit_web_navigation_action_get_reason (action);
button = webkit_web_navigation_action_get_button (action);
state = webkit_web_navigation_action_get_modifier_state (action);
+ uri = webkit_network_request_get_uri (request);
+
+ if (strncmp (uri, "mailto:", 7) == 0) {
+ webkit_web_policy_decision_ignore (decision);
+ gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
+ return TRUE;
+ }
/* Open in new tab for middle click or ctrl+click */
if (reason == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED &&
--
1.6.4.3