patch from epiphany cvs to fix view page source. Thanks to the tracking in but 85337

Package-Manager: portage-2.0.51.19

5 files changed, 515 insertions, 5 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 1c811e735382..f2a732c882b4 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.90 2005/03/12 20:24:43 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.91 2005/03/15 21:39:13 joem Exp $
+
+*epiphany-1.6.0-r2 (15 Mar 2005)
+
+  15 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.6.0-view_source.patch, +epiphany-1.6.0-r2.ebuild:
+  patch from epiphany cvs to fix view page source. Thanks to the tracking in
+  but 85337
 
 *epiphany-1.6.0-r1 (12 Mar 2005)
 
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 1d85b4970c23..6404df78ffda 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1c5ce26209fadae263cf82d5bd96aa25 ChangeLog 12083
+MD5 a1e98c02633804004f3491ca4f6e09f4 ChangeLog 12321
 MD5 8da5866972eed701acafd009e1d54868 epiphany-1.2.10.ebuild 1331
 MD5 09bb39f25615e6ff9ce62d7c03eb23ab epiphany-1.2.9-r1.ebuild 1461
 MD5 7ca9276178bb6bf2e637f05f8e464674 epiphany-1.4.4.ebuild 1368
@@ -12,6 +12,7 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 8a332f75a2547d65bfb4305622152e1d epiphany-1.4.8.ebuild 1450
 MD5 1aefb39b18b41d93b3cef36295db6a4c epiphany-1.6.0-r1.ebuild 1510
 MD5 cac53a1de7ffe51551d9779c41c121c5 epiphany-1.6.0.ebuild 1425
+MD5 8bd2ef9a37f8673971663d7605d20e08 epiphany-1.6.0-r2.ebuild 1608
 MD5 56ee35e359c12574247645a59250f5f8 files/digest-epiphany-1.2.10 69
 MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
 MD5 ebbdfe54389d750d3f1772e17d28a790 files/digest-epiphany-1.4.4 68
@@ -29,10 +30,12 @@ MD5 febe27332928e38fb57115a08f66d590 files/epiphany-1.6.0-fix_includes.patch 505
 MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
 MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
 MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r1 68
+MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r2 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCM1ADXjcVihsel0ERArLiAKCTRbvC4hsqdp5Zr6yhNi8XGvONNQCgsBuY
-mdqlG9PppH4RSCOZk/yinYg=
-=E+8K
+iD4DBQFCN1XwXjcVihsel0ERAtWFAKDk5AtEBjjvYWWRdnHepDQ5+eHdigCYpZra
+DIu4ZkX9JGLa3TuSG6kzbw==
+=98i3
 -----END PGP SIGNATURE-----
diff --git a/net-www/epiphany/epiphany-1.6.0-r2.ebuild b/net-www/epiphany/epiphany-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..b27800452271
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.6.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.6.0-r2.ebuild,v 1.1 2005/03/15 21:39:13 joem Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/orbit-2
+	>=gnome-base/gnome-vfs-2.3.1
+	>=net-www/mozilla-1.7.3
+	>=x11-themes/gnome-icon-theme-2.9.3
+	>=x11-libs/startup-notification-0.5"
+# dbus? ( >=sys-apps/dbus-0.22 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.7.3+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!"
+	fi
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+	epatch ${FILESDIR}/${P}-wallet_password.patch
+	epatch ${FILESDIR}/${P}-wallet_fix.patch
+	#fix view source
+	epatch ${FILESDIR}/${P}-view_source.patch
+
+}
+USE_DESTDIR="1"
diff --git a/net-www/epiphany/files/digest-epiphany-1.6.0-r2 b/net-www/epiphany/files/digest-epiphany-1.6.0-r2
new file mode 100644
index 000000000000..3b6ddf3ac56b
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.6.0-r2
@@ -0,0 +1 @@
+MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
diff --git a/net-www/epiphany/files/epiphany-1.6.0-view_source.patch b/net-www/epiphany/files/epiphany-1.6.0-view_source.patch
new file mode 100644
index 000000000000..84b2607f6878
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.6.0-view_source.patch
@@ -0,0 +1,435 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvs/gnome/epiphany/configure.ac,v
+retrieving revision 1.68.2.1
+retrieving revision 1.68.2.2
+diff -u -r1.68.2.1 -r1.68.2.2
+--- configure.ac	7 Mar 2005 19:41:03 -0000	1.68.2.1
++++ configure.ac	9 Mar 2005 18:19:01 -0000	1.68.2.2
+@@ -52,6 +52,7 @@
+ LIBGNOMEVFS_REQUIRED=2.9.2
+ LIBGNOMEUI_REQUIRED=2.6.0
+ GNOME_DESKTOP_REQUIRED=2.9.91
++LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
+ 
+ AC_ENABLE_SHARED([yes])
+ AC_ENABLE_STATIC([no])
+@@ -71,6 +72,16 @@
+ GNOME_COMPILE_WARNINGS([maximum])
+ dnl GNOME_CXX_WARNINGS
+ 
++AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
++if $PKG_CONFIG --atleast-version $LIBSTARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
++	echo "Building with libstartup-notification"
++	AC_DEFINE([HAVE_STARTUP_NOTIFICATION],[1],[Define to enable startup notification support])
++	STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
++else
++	echo "***** WARNING: Building without libstartup-notification"
++	STARTUP_NOTIFICATION_PACKAGE=
++fi
++
+ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
+ 		  glib-2.0 >= $GLIB_REQUIRED \
+ 		  pango >= $PANGO_REQUIRED \
+@@ -86,6 +97,7 @@
+ 		  gnome-vfs-module-2.0 \
+ 		  gconf-2.0 \
+ 		  gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
++		  $STARTUP_NOTIFICATION_PACKAGE \
+ 		  ])
+ AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
+ AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
+
+Index: lib/ephy-file-helpers.c
+===================================================================
+RCS file: /cvs/gnome/epiphany/lib/ephy-file-helpers.c,v
+retrieving revision 1.26
+retrieving revision 1.26.2.1
+diff -u -r1.26 -r1.26.2.1
+--- lib/ephy-file-helpers.c	26 Feb 2005 22:01:48 -0000	1.26
++++ lib/ephy-file-helpers.c	9 Mar 2005 18:19:01 -0000	1.26.2.1
+@@ -44,6 +44,13 @@
+ #undef GNOME_DISABLE_DEPRECATED
+ #include <libgnome/gnome-desktop-item.h>
+ 
++#ifdef HAVE_STARTUP_NOTIFICATION
++#define SN_API_NOT_YET_FROZEN
++#include <libsn/sn.h>
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++#endif
++
+ static GHashTable *files = NULL;
+ static GHashTable *mime_table = NULL;
+ 
+@@ -458,6 +465,331 @@
+ 	return permission;
+ }
+ 
++/* Copied from nautilus-program-choosing.c */
++
++extern char **environ;
++
++/* Cut and paste from gdkspawn-x11.c */
++static gchar **
++my_gdk_spawn_make_environment_for_screen (GdkScreen  *screen,
++					  gchar     **envp)
++{
++  gchar **retval = NULL;
++  gchar  *display_name;
++  gint    display_index = -1;
++  gint    i, env_len;
++
++  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
++
++  if (envp == NULL)
++    envp = environ;
++
++  for (env_len = 0; envp[env_len]; env_len++)
++    if (strncmp (envp[env_len], "DISPLAY", strlen ("DISPLAY")) == 0)
++      display_index = env_len;
++
++  retval = g_new (char *, env_len + 1);
++  retval[env_len] = NULL;
++
++  display_name = gdk_screen_make_display_name (screen);
++
++  for (i = 0; i < env_len; i++)
++    if (i == display_index)
++      retval[i] = g_strconcat ("DISPLAY=", display_name, NULL);
++    else
++      retval[i] = g_strdup (envp[i]);
++
++  g_assert (i == env_len);
++
++  g_free (display_name);
++
++  return retval;
++}
++
++#ifdef HAVE_STARTUP_NOTIFICATION
++static void
++sn_error_trap_push (SnDisplay *display,
++		    Display   *xdisplay)
++{
++	gdk_error_trap_push ();
++}
++
++static void
++sn_error_trap_pop (SnDisplay *display,
++		   Display   *xdisplay)
++{
++	gdk_error_trap_pop ();
++}
++
++static char **
++make_spawn_environment_for_sn_context (SnLauncherContext *sn_context,
++				       char             **envp)
++{
++	char **retval;
++	int    i, j;
++
++	retval = NULL;
++	
++	if (envp == NULL) {
++		envp = environ;
++	}
++	
++	for (i = 0; envp[i]; i++) {
++		/* Count length */
++	}
++
++	retval = g_new (char *, i + 2);
++
++	for (i = 0, j = 0; envp[i]; i++) {
++		if (!g_str_has_prefix (envp[i], "DESKTOP_STARTUP_ID=")) {
++			retval[j] = g_strdup (envp[i]);
++			++j;
++	        }
++	}
++
++	retval[j] = g_strdup_printf ("DESKTOP_STARTUP_ID=%s",
++				     sn_launcher_context_get_startup_id (sn_context));
++	++j;
++	retval[j] = NULL;
++
++	return retval;
++}
++
++/* This should be fairly long, as it's confusing to users if a startup
++ * ends when it shouldn't (it appears that the startup failed, and
++ * they have to relaunch the app). Also the timeout only matters when
++ * there are bugs and apps don't end their own startup sequence.
++ *
++ * This timeout is a "last resort" timeout that ignores whether the
++ * startup sequence has shown activity or not.  Metacity and the
++ * tasklist have smarter, and correspondingly able-to-be-shorter
++ * timeouts. The reason our timeout is dumb is that we don't monitor
++ * the sequence (don't use an SnMonitorContext)
++ */
++#define STARTUP_TIMEOUT_LENGTH (30 /* seconds */ * 1000)
++
++typedef struct
++{
++	GdkScreen *screen;
++	GSList *contexts;
++	guint timeout_id;
++} StartupTimeoutData;
++
++static void
++free_startup_timeout (void *data)
++{
++	StartupTimeoutData *std;
++
++	std = data;
++
++	g_slist_foreach (std->contexts,
++			 (GFunc) sn_launcher_context_unref,
++			 NULL);
++	g_slist_free (std->contexts);
++
++	if (std->timeout_id != 0) {
++		g_source_remove (std->timeout_id);
++		std->timeout_id = 0;
++	}
++
++	g_free (std);
++}
++
++static gboolean
++startup_timeout (void *data)
++{
++	StartupTimeoutData *std;
++	GSList *tmp;
++	GTimeVal now;
++	int min_timeout;
++
++	std = data;
++
++	min_timeout = STARTUP_TIMEOUT_LENGTH;
++	
++	g_get_current_time (&now);
++	
++	tmp = std->contexts;
++	while (tmp != NULL) {
++		SnLauncherContext *sn_context;
++		GSList *next;
++		long tv_sec, tv_usec;
++		double elapsed;
++		
++		sn_context = tmp->data;
++		next = tmp->next;
++		
++		sn_launcher_context_get_last_active_time (sn_context,
++							  &tv_sec, &tv_usec);
++
++		elapsed =
++			((((double)now.tv_sec - tv_sec) * G_USEC_PER_SEC +
++			  (now.tv_usec - tv_usec))) / 1000.0;
++
++		if (elapsed >= STARTUP_TIMEOUT_LENGTH) {
++			std->contexts = g_slist_remove (std->contexts,
++							sn_context);
++			sn_launcher_context_complete (sn_context);
++			sn_launcher_context_unref (sn_context);
++		} else {
++			min_timeout = MIN (min_timeout, (STARTUP_TIMEOUT_LENGTH - elapsed));
++		}
++		
++		tmp = next;
++	}
++
++	if (std->contexts == NULL) {
++		std->timeout_id = 0;
++	} else {
++		std->timeout_id = g_timeout_add (min_timeout,
++						 startup_timeout,
++						 std);
++	}
++
++	/* always remove this one, but we may have reinstalled another one. */
++	return FALSE;
++}
++
++static void
++add_startup_timeout (GdkScreen         *screen,
++		     SnLauncherContext *sn_context)
++{
++	StartupTimeoutData *data;
++
++	data = g_object_get_data (G_OBJECT (screen), "nautilus-startup-data");
++	if (data == NULL) {
++		data = g_new (StartupTimeoutData, 1);
++		data->screen = screen;
++		data->contexts = NULL;
++		data->timeout_id = 0;
++		
++		g_object_set_data_full (G_OBJECT (screen), "nautilus-startup-data",
++					data, free_startup_timeout);		
++	}
++
++	sn_launcher_context_ref (sn_context);
++	data->contexts = g_slist_prepend (data->contexts, sn_context);
++	
++	if (data->timeout_id == 0) {
++		data->timeout_id = g_timeout_add (STARTUP_TIMEOUT_LENGTH,
++						  startup_timeout,
++						  data);		
++	}
++}
++
++#endif /* HAVE_STARTUP_NOTIFICATION */
++
++gboolean
++ephy_file_launch_application (GnomeVFSMimeApplication *application,
++			      const char *parameter,
++			      guint32 user_time)
++{
++	GdkScreen       *screen;
++	GList           *uris = NULL;
++	char            *uri;
++	char           **envp;
++	GnomeVFSResult   result;
++#ifdef HAVE_STARTUP_NOTIFICATION
++	SnLauncherContext *sn_context;
++	SnDisplay *sn_display;
++#endif
++
++	g_return_val_if_fail (application != NULL, FALSE);
++	g_return_val_if_fail (parameter != NULL, FALSE);
++
++	uri = gnome_vfs_make_uri_canonical (parameter);
++	if (uri == NULL) return FALSE;
++
++	uris = g_list_prepend (NULL, uri);
++	
++	screen = gdk_screen_get_default ();
++	envp = my_gdk_spawn_make_environment_for_screen (screen, NULL);
++	
++#ifdef HAVE_STARTUP_NOTIFICATION
++	sn_display = sn_display_new (gdk_display,
++				     sn_error_trap_push,
++				     sn_error_trap_pop);
++
++	
++	/* Only initiate notification if application supports it. */
++	if (gnome_vfs_mime_application_supports_startup_notification (application))
++	{
++		char *name;
++
++		sn_context = sn_launcher_context_new (sn_display,
++						      screen ? gdk_screen_get_number (screen) :
++						      DefaultScreen (gdk_display));
++		
++		name = g_filename_display_basename (uri);
++		if (name != NULL) {
++			char *description;
++			
++			sn_launcher_context_set_name (sn_context, name);
++
++			/* FIXME: i18n after string freeze! */
++			description = g_strdup_printf ("Opening %s", name);
++			
++			sn_launcher_context_set_description (sn_context, description);
++
++			g_free (name);
++			g_free (description);
++		}
++		
++		if (!sn_launcher_context_get_initiated (sn_context)) {
++			const char *binary_name;
++			char **old_envp;
++
++			binary_name = gnome_vfs_mime_application_get_binary_name (application);
++		
++			sn_launcher_context_set_binary_name (sn_context,
++							     binary_name);
++			
++			sn_launcher_context_initiate (sn_context,
++						      g_get_prgname () ? g_get_prgname () : "unknown",
++						      binary_name,
++						      (Time) user_time);
++
++			old_envp = envp;
++			envp = make_spawn_environment_for_sn_context (sn_context, envp);
++			g_strfreev (old_envp);
++		}
++	} else {
++		sn_context = NULL;
++	}
++#endif /* HAVE_STARTUP_NOTIFICATION */
++	
++	result = gnome_vfs_mime_application_launch_with_env (application, uris, envp);
++
++#ifdef HAVE_STARTUP_NOTIFICATION
++	if (sn_context != NULL) {
++		if (result != GNOME_VFS_OK) {
++			sn_launcher_context_complete (sn_context); /* end sequence */
++		} else {
++			add_startup_timeout (screen ? screen :
++					     gdk_display_get_default_screen (gdk_display_get_default ()),
++					     sn_context);
++		}
++		sn_launcher_context_unref (sn_context);
++	}
++	
++	sn_display_unref (sn_display);
++#endif /* HAVE_STARTUP_NOTIFICATION */
++
++	g_strfreev (envp);
++	g_list_foreach (uris, (GFunc) g_free,NULL);
++	g_list_free (uris);
++
++	if (result != GNOME_VFS_OK)
++	{
++		g_warning ("Cannot launch application '%s'\n",
++			   gnome_vfs_mime_application_get_name (application));
++	}
++
++	return result == GNOME_VFS_OK;
++}
++
++/* End cut-paste-adapt from nautilus */
++
+ static int
+ launch_desktop_item (const char *desktop_file,
+ 		     const char *parameter,
+@@ -529,37 +861,6 @@
+ }
+ 
+ gboolean
+-ephy_file_launch_application (GnomeVFSMimeApplication *application,
+-			      const char *parameter,
+-			      guint32 user_time)
+-{
+-	GError *error = NULL;
+-	const char *desktop_file;
+-	int ret = -1;
+-
+-	g_return_val_if_fail (application != NULL, FALSE);
+-	g_return_val_if_fail (parameter != NULL, FALSE);
+-
+-	desktop_file = gnome_vfs_mime_application_get_desktop_file_path (application);
+-	if (desktop_file != NULL)
+-	{
+-		ret = launch_desktop_item (desktop_file, parameter, user_time, &error);
+-	}
+-
+-	if (ret == -1 || error != NULL)
+-	{
+-		/* FIXME We should really warn the user here */
+-
+-		g_warning ("Cannot launch application '%s': %s\n",
+-			   gnome_vfs_mime_application_get_name (application),
+-			   error ? error->message : "(unknown error)");
+-		g_clear_error (&error);
+-	}
+-
+-	return ret >= 0;
+-}
+-
+-gboolean
+ ephy_file_launch_handler (const char *mime_type,
+ 			  const char *address,
+ 			  guint32 user_time)
+