Fix missing favicon on most websites (due to a missing pattern matching) per bug #290024

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 118 insertions, 2 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 31412aba0b84..374184822390 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.218 2009/10/03 14:20:02 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.219 2009/10/22 17:27:49 mrpouet Exp $
+
+*epiphany-2.26.3-r2 (22 Oct 2009)
+
+  22 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  +epiphany-2.26.3-r2.ebuild, +files/epiphany-2.26.3-favicon-cache.patch:
+  Fix missing favicon on most websites (due to a missing pattern matching)
+  per bug #290024.
 
   03 Oct 2009; Tobias Klausmann <klausman@gentoo.org>
   epiphany-2.26.3-r1.ebuild:
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 2a3887d2c1e5..64569276f824 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -4,12 +4,14 @@ AUX epiphany-2.22.3-notify-crash-fix.patch 1589 RMD160 ae0f063db6c314f8f188bc24e
 AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a3ff3b6f2476ec68031 SHA1 1db80a7f829e41d605b50dce6caecb35984a9d57 SHA256 94d66760b1c493093febcc399a0418eb37708da1a3bf1d3bc7c851a527b061f1
 AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df
 AUX epiphany-2.26.1-automagic-libcanberra.patch 1838 RMD160 b98c6a734f240ea000e8938ac690426c904ec37f SHA1 9a782c3c8babf1ae8ac18c2602e0eb2d46b6eb82 SHA256 9cc20da812e7a95e535e905efaedf05720e2e8c1828d644934636ccb05f77fa3
+AUX epiphany-2.26.3-favicon-cache.patch 757 RMD160 f138d35b98332a810af559776a798c0deae85f0d SHA1 6b53b73c0ebdd323c1d1f008adab1dcff70248d8 SHA256 71537057738b5e0604214d23d8bb86f888abd1cfbb4606419397c915b132cf00
 AUX epiphany-2.26.3-system-plugin.patch 1180 RMD160 d27462c6d352de40103ee843ddd1eafdccd0a367 SHA1 7d1fa738d302f45715ae2dd4b3546d59055b40ce SHA256 4df1a20abdcd3f1591ba5dad241f96d31d0bca8be91f6a20e7c586748ae949a7
 DIST epiphany-2.24.3.tar.bz2 5722991 RMD160 d27d511cf9f1cb6b5db94b1c821729c1dfc59b0b SHA1 945d7935273cf341f7c5445b31202ed257cfc9a6 SHA256 cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
 EBUILD epiphany-2.24.3-r10.ebuild 2410 RMD160 76f47e3085e03ea7519b8d9e08ae545c324cdddc SHA1 30e86b5b74e58934acdcbeb87c2d5240b37e0e63 SHA256 fa37df1cdf0b11219c7f3ec6f0101f1223c3dc2ad3492c7b9901327dee26e68b
 EBUILD epiphany-2.24.3.ebuild 2756 RMD160 cc01f406e1380d82e10a8df44348cb330d83eef3 SHA1 cb36053f0eb8b124fef19954f8836a490d2212d5 SHA256 f1acd30586027c353982c4298c1704459bcdb9729f133fafd0495ef1dc60b862
 EBUILD epiphany-2.26.3-r1.ebuild 2522 RMD160 ba32cd7cc68c73c037763f30370ad94a9203107b SHA1 d2edd587fc5b222bfc3d48bbcdec63c3f93ecaf5 SHA256 53142b22ac62a67aa178f0a7a89f4bfa9bd2ed5c86feff2786c6d03184f58c18
+EBUILD epiphany-2.26.3-r2.ebuild 2629 RMD160 cdcf35f58156d5da4ec7cd09fcb1e0a7ed9c1f35 SHA1 1ce6bf1679314a3f92152588bb364a7009ef709b SHA256 1445ee7b957bce96209efb9f1bb440ebda474de4d41232ac8a42a04c428bf77a
 EBUILD epiphany-2.26.3.ebuild 2245 RMD160 e09d82b971f20470f6bd90efe66b7344edddd42c SHA1 6e98d0403731f52a3cd55cfd5c072eb4dd7f484b SHA256 e5192108d7d4fb407b4d3ac2fccf09792d83db3dd5f13fabad98bc4f5830a7d2
-MISC ChangeLog 44109 RMD160 05795cb89c9e337d65fb6135afbc1db80f6ba124 SHA1 2c5cc89ab2bbf43ee715a1e8d71f7bdeda9098cb SHA256 2ab65464990f4f138af1bbc03f1288dfbfcda8d2f2beb353d5d270644b01cd6d
+MISC ChangeLog 44362 RMD160 6d76b1510d3f93b31f59e5e38e1dd8406cef6d5b SHA1 a5cf66a678f55e38a31bd4fda8ecdb291f691e24 SHA256 f3426635780e7e5f27608e802ffb532c6d68dc8a45cc9f84fe52b02740b65e48
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/www-client/epiphany/epiphany-2.26.3-r2.ebuild b/www-client/epiphany/epiphany-2.26.3-r2.ebuild
new file mode 100644
index 000000000000..0a100dd01dfd
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.26.3-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r2.ebuild,v 1.1 2009/10/22 17:27:49 mrpouet Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils multilib autotools
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi doc networkmanager python spell"
+
+RDEPEND=">=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.16.0
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=x11-libs/libnotify-0.4
+	>=media-libs/libcanberra-0.3[gtk]
+	>=dev-libs/dbus-glib-0.71
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	networkmanager? ( net-misc/networkmanager )
+	=net-libs/xulrunner-1.9*
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7.1
+		>=dev-python/gnome-python-2.6 )
+	spell? ( app-text/enchant )
+	x11-themes/gnome-icon-theme"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--with-gecko=libxul-embedding
+		--with-distributor-name=Gentoo
+		--enable-canberra
+		$(use_enable avahi zeroconf)
+		$(use_enable networkmanager network-manager)
+		$(use_enable spell spell-checker)
+		$(use_enable python)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix libcanberra automagic support, bug #266232
+	epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch"
+
+	# Fix sandbox violations, bug #263585
+	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
+
+	# Fix detection of system plugin, bug #279417
+	epatch "${FILESDIR}/${P}-system-plugin.patch"
+
+	# Fix missing favicons of most web-sites, bug #290024
+	epatch "${FILESDIR}/${P}-favicon-cache.patch"
+
+	# Make it libtool-1 compatible
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# All .la files are for plugins or extensions that are dlopened.
+	# Upstream should pass *_la_LIBTOOLFLAGS = --tag=disable-static to drop them instead
+	# but gecko is a dead branch for them, so do it ourselves:
+	find "${D}" -name '*.la' -delete
+}
diff --git a/www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch b/www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch
new file mode 100644
index 000000000000..c7158aee90e2
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.3-favicon-cache.patch
@@ -0,0 +1,17 @@
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=290024
+
+Ephy does not display favicon of most websites due to a missing pattern match,
+for "image/vnd.microsoft.icon" mimetype.
+
+Index: epiphany/embed/ephy-favicon-cache.c
+===================================================================
+--- epiphany.orig/embed/ephy-favicon-cache.c	2009-05-21 09:53:41.207975209 -0400
++++ epiphany/embed/ephy-favicon-cache.c	    2009-05-21 09:54:28.061689298 -0400
+@@ -696,6 +696,7 @@
+ 			return NULL;
+ 		}
+ 		valid = strcmp (mime_type, "image/x-ico") == 0 ||
++			strcmp (mime_type, "image/vnd.microsoft.icon") == 0 ||
+ 			strcmp (mime_type, "image/png") == 0 ||
+ 			strcmp (mime_type, "image/gif") == 0;
+ 		is_ao = strcmp (mime_type, "application/octet-stream") == 0;