summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2003-10-07 21:03:17 +0000
committerAlastair Tse <liquidx@gentoo.org>2003-10-07 21:03:17 +0000
commit3c31d94b0fbdc44bc650b90801e5136da9713418 (patch)
tree439c11d5c6b7a982f328101847b55ce27ff9c167 /net-www/epiphany
parentfixing POSIX 1003.1-2001 chown change. '.' now ':' (diff)
downloadgentoo-2-3c31d94b0fbdc44bc650b90801e5136da9713418.tar.gz
gentoo-2-3c31d94b0fbdc44bc650b90801e5136da9713418.tar.bz2
gentoo-2-3c31d94b0fbdc44bc650b90801e5136da9713418.zip
add patch to fix malfunctioning epiphany server
Diffstat (limited to 'net-www/epiphany')
-rw-r--r--net-www/epiphany/ChangeLog6
-rw-r--r--net-www/epiphany/Manifest7
-rw-r--r--net-www/epiphany/epiphany-1.0.1.ebuild11
-rw-r--r--net-www/epiphany/files/epiphany-1.0.1-session_get_windows-session.patch13
4 files changed, 31 insertions, 6 deletions
diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 6929f8f7e9c0..5eeb4de8ce2a 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/epiphany
# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.24 2003/10/05 13:30:52 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.25 2003/10/07 21:03:12 liquidx Exp $
+
+ 07 Oct 2003; Alastair Tse <liquidx@gentoo.org> epiphany-1.0.1.ebuild,
+ files/epiphany-1.0.1-session_get_windows-session.patch:
+ added patch to fix --server issues
05 Oct 2003; Mike Gardiner <obz@gentoo.org> epiphany-1.0.ebuild:
Marked stable on x86
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index b2bc1c34325a..052349394be0 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,7 +1,8 @@
-MD5 9fbe67ad36182181cd66061c827cb58a epiphany-1.0.1.ebuild 1203
+MD5 2e4bb09b50b911436ab9497a059a0eae ChangeLog 3767
+MD5 086fa3d43493c920039b2c57edecbebf epiphany-1.0.1.ebuild 1420
MD5 275e26ab4960954ba7d904ce67f74ebc epiphany-1.0.ebuild 1283
-MD5 2b03dcb0bd453e35cf782595916e3370 ChangeLog 3595
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 c5f10d488ab33a0e0aec5169a4f03b8d files/digest-epiphany-1.0 66
-MD5 dd22fe99981a9507d5ad6db00f67eb17 files/epiphany-1.0-disable_Werror.patch 597
MD5 f4ef4e59c4ce6a2a7c7e68e4336cc308 files/digest-epiphany-1.0.1 68
+MD5 dd22fe99981a9507d5ad6db00f67eb17 files/epiphany-1.0-disable_Werror.patch 597
+MD5 654a860f4c48d5a11c8fda09d91c6bf6 files/epiphany-1.0.1-session_get_windows-session.patch 528
diff --git a/net-www/epiphany/epiphany-1.0.1.ebuild b/net-www/epiphany/epiphany-1.0.1.ebuild
index 04a14a28dd17..50981d2532ca 100644
--- a/net-www/epiphany/epiphany-1.0.1.ebuild
+++ b/net-www/epiphany/epiphany-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.0.1.ebuild,v 1.1 2003/10/04 15:39:38 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.0.1.ebuild,v 1.2 2003/10/07 21:03:12 liquidx Exp $
inherit gnome2
@@ -42,6 +42,13 @@ pkg_setup () {
eerror "export USE=\"gtk2\" ;emerge mozilla -p "
die "Need Mozilla compiled with gtk+-2.0!!"
fi
-
}
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # fixing --server related session_get_windows(session) problems
+ # http://bugzilla.gnome.org/show_bug.cgi?id=124042
+ epatch ${FILESDIR}/${P}-session_get_windows-session.patch
+}
diff --git a/net-www/epiphany/files/epiphany-1.0.1-session_get_windows-session.patch b/net-www/epiphany/files/epiphany-1.0.1-session_get_windows-session.patch
new file mode 100644
index 000000000000..b2230dec1767
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.0.1-session_get_windows-session.patch
@@ -0,0 +1,13 @@
+diff -u -p -r1.9.2.1 ephy-automation.c
+--- src/ephy-automation.c 24 Sep 2003 20:39:52 -0000 1.9.2.1
++++ src/ephy-automation.c 7 Oct 2003 18:50:41 -0000
+@@ -98,7 +98,8 @@ impl_ephy_automation_loadurl (PortableSe
+ session = SESSION (ephy_shell_get_session (ephy_shell));
+
+ /* no window open, let's try to autoresume */
+- if (session_get_windows (session) == NULL)
++ if (session_get_windows (session) == NULL
++ && ephy_shell_get_server_mode (ephy_shell) == FALSE)
+ {
+ gboolean res;
+ res = session_autoresume (session);