diff options
| -rw-r--r-- | www-client/epiphany-extensions/Manifest | 13 | ||||
| -rw-r--r-- | www-client/epiphany/ChangeLog | 10 | ||||
| -rw-r--r-- | www-client/epiphany/Manifest | 12 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-2.26.3-r4.ebuild | 103 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.26.3-glib.patch | 22 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.26.3-nspr.patch | 14 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.26.3-xul192.patch | 14 |
7 files changed, 182 insertions, 6 deletions
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest index 0ab80b35f9ad..7326d0c0fa24 100644 --- a/www-client/epiphany-extensions/Manifest +++ b/www-client/epiphany-extensions/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX epiphany-extensions-2.28.1-auto-scroller-broken.patch 3424 RMD160 f423c2d682923e4d208802c28d4f849eaec3ae0c SHA1 d8791350efa7fa37a8fb6685064597e6039ecc2e SHA256 04f0b9b3c7273b36ed484f05133212b706ab2b9659e73972e0815ce5cdfb927e DIST epiphany-extensions-2.21.92-sessionsaver-v4.patch.gz 10019 RMD160 c0d06082be2b999d59a0b8faf7e70984a3ebd58b SHA1 1ddb28c1a724fd8e5a5d91bc6f53b47e12944bc4 SHA256 74f585a6530d3212f69f140f5f7eee52d786745c1c8cf76f65f13a01da1ac0a2 DIST epiphany-extensions-2.22.2.tar.bz2 947322 RMD160 586f26851a0fbc4c2664116a3e32596d3bd91188 SHA1 0dff50f48a14e01dc358fa484b218f6d6a7f5519 SHA256 de649d99d19c20d41d6c466ecbaa82a244679fcb0d2bf30ced8b340c4e2481d4 @@ -7,8 +10,16 @@ DIST epiphany-extensions-2.28.1.tar.bz2 1389667 RMD160 6f4f1bae74918211f820828a6 EBUILD epiphany-extensions-2.22.2.ebuild 2965 RMD160 386db923fab10cd6e852ad6455023bc5cc7388b7 SHA1 80b7cd84424b3dc415f0bda2d57d1757d701ab19 SHA256 27017dafba53eb0fb379f6e382749f5e4634f1e18fd3c48a0c5a5675b783de70 EBUILD epiphany-extensions-2.24.3-r10.ebuild 2700 RMD160 34b9d3112667f87c2316382f1678e61750d1aa77 SHA1 89d09d361ef1c930f42561fd730cb9216b9b6352 SHA256 f0106bc7c0c985065ec9874f19c49cd7c6099dd3968b32f16bb85d5490d2925f EBUILD epiphany-extensions-2.24.3.ebuild 3046 RMD160 b0cec6b50b97cb05bc8e31e53c82e416698bbc19 SHA1 af998a0d29626b01dd1fd33b7f03bdbe6e9915ec SHA256 2c4105b2ee1660e7e91c81caab300e88316f01c08d1dde5c51ac3498356f8dad +EBUILD epiphany-extensions-2.26.1-r1.ebuild 2769 RMD160 d44a061e764d8549936575eba65c372e1866c7b6 SHA1 761bbb747f45bea329e934cd9cfef1f6820f2c0a SHA256 4f8978d6cb2a26eca2fec0e58c07625ba834279ae149dfd932453d9e3b747a5b EBUILD epiphany-extensions-2.26.1.ebuild 2677 RMD160 5f628c443772c0f270eaafe11b15261d9bc4eda6 SHA1 ac907f65ec6058bda431f734733dbe03de88cf5b SHA256 5379167f63a726c258be5501cda67f6d3188d138720fc41637dff9dbbb36e954 EBUILD epiphany-extensions-2.28.1-r1.ebuild 2285 RMD160 c9373db4fd7fbd03ff04e0a36eab526417e04c9d SHA1 44b90faadffdf80bf9db0970a73974c232d6e510 SHA256 1cddbf162e2a3725b0abf093b3e8297a97c3e01f0dd9109bca911e327bb17018 EBUILD epiphany-extensions-2.28.1.ebuild 2077 RMD160 76f180a9a7bc2eaa27dbc34226b75e3f1a455e8a SHA1 0489576da42d0e0d7769bde88fb17b8a5180c88b SHA256 398ec736b5d604c85b45242a78f1980755df45e7d6a7fd7cee6841d44da64cae -MISC ChangeLog 20540 RMD160 7c6f536553cdf6897fab3a5be0a1e4526079f639 SHA1 eb443e5328f52a385866f34d42890ebbc258ec44 SHA256 2da3b5801c0dde0f80fa74a39ac780d72ac2f0d33aa38cfb882b57bca395045e +MISC ChangeLog 20801 RMD160 6dd325be11a9c5d164020397210c80031d4db85b SHA1 296abef933534cdcd2f38f8cf85ecb85bdefc31e SHA256 f5c43f64c8ff8ce58bba4dcd5c024f1fe491e470ebb50bc125ebaf85d628401e MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuaIIMACgkQCaWpQKGI+9Sv6ACeLPPGDlN1j0n1XLCdi+M5O1xD +LWYAn1e4QiUUCv9W5M77eYR6PUEl38sS +=ZZxg +-----END PGP SIGNATURE----- diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog index f5203b8ed4dc..99943d6fc68d 100644 --- a/www-client/epiphany/ChangeLog +++ b/www-client/epiphany/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/epiphany # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.228 2010/03/11 00:17:56 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.229 2010/03/12 11:03:32 pacho Exp $ + +*epiphany-2.26.3-r4 (12 Mar 2010) + + 12 Mar 2010; Pacho Ramos <pacho@gentoo.org> +epiphany-2.26.3-r4.ebuild, + +files/epiphany-2.26.3-glib.patch, +files/epiphany-2.26.3-nspr.patch, + +files/epiphany-2.26.3-xul192.patch: + Support xulrunner-1.9.2, thanks a lot to Hicham HAOUARI for his help and + patches. 11 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> epiphany-2.24.3.ebuild, -epiphany-2.24.3-r10.ebuild, diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 622d4423fcc5..ad6f21eaae95 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -8,8 +8,11 @@ AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a 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-glib.patch 609 RMD160 fe9f1829feef5f5cd3e78d1e04c7e26f1c129c7e SHA1 81f201d4ea45e25963a5ff53613a87d796c9a96e SHA256 83f3b33c88f95a3e25fc7bfcf798a9a61b07ba4caf1bb49848fafaf1d978ca5e +AUX epiphany-2.26.3-nspr.patch 863 RMD160 abb848bd66e90f2579cee987dee2c8f1294dddda SHA1 e02717c2d47e2a117ddffc186c599ae80e5b688f SHA256 5d74f8c662d0cdd67dcbf14e9b404982fe17ab9fcc0ecd1a81badbbedeb09e92 AUX epiphany-2.26.3-revert-downloadir.patch 1265 RMD160 50b57adf30a1694d54edc2a97bd44888515808c7 SHA1 a11912e3b21afe3acf78f36c9d5335a30c1401ff SHA256 75bbbfa246978a7d2e691cada632138ec93dc96383331e5b02e468a962c589f1 AUX epiphany-2.26.3-system-plugin.patch 1180 RMD160 d27462c6d352de40103ee843ddd1eafdccd0a367 SHA1 7d1fa738d302f45715ae2dd4b3546d59055b40ce SHA256 4df1a20abdcd3f1591ba5dad241f96d31d0bca8be91f6a20e7c586748ae949a7 +AUX epiphany-2.26.3-xul192.patch 423 RMD160 1df2ec374ca6ac5de2bc3d90d9161d96c3bbab9c SHA1 0a607b70d38bd8dc10f409f3709dbbedfb1c208a SHA256 71b950ad6539c2703417525594c126e7bd1833b921053fce3d9ac2058e50dbd4 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 DIST epiphany-2.28.2.tar.bz2 5697393 RMD160 2cfde41e96ceace397bf42231dffd577353f8eeb SHA1 8f382e18dba2ca4292350f1c979986a68ee9b668 SHA256 98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490 @@ -17,13 +20,14 @@ EBUILD epiphany-2.24.3.ebuild 2717 RMD160 b51d8062ca0f4157070e28d64187801954918f EBUILD epiphany-2.26.3-r1.ebuild 2519 RMD160 04f49d18f90dee88ea90d5eea540451d7765e09d SHA1 1e4d06533f5c25d7665f1bfbe5a8f2d3fdbe95de SHA256 a3d58669e8e8a705952da1a90c17ce79f7f21055f249f462e3a80c33dec49cda EBUILD epiphany-2.26.3-r2.ebuild 2622 RMD160 6a97344fec3ef4850a614948bf777d8d29eb40ae SHA1 70e00ea82eda5649b114a61b8916691998a54257 SHA256 c02c9f1eba519d866be25ed29a6a7de9d9115aa8a7373075e4e5caa7e40c28b7 EBUILD epiphany-2.26.3-r3.ebuild 2722 RMD160 d4bbc1587c545936d6a17dead0bc73dce71af615 SHA1 aa015e51461fe54d3bbe4c0d4c48ed7bcd4ca594 SHA256 8ddcf6b6d1c2a76f9d9245a59a29e1f03f60c2c60e3dd247842337a376d4c804 +EBUILD epiphany-2.26.3-r4.ebuild 3025 RMD160 ee2f61186138cd833ad7ca233d89f05b141ec288 SHA1 71965854c6e89d821f0386d319aafbe5a5aafee5 SHA256 093177c10fa7873e85295b16ed0c814d51f29fe744aabb7b56876933d8d4ff74 EBUILD epiphany-2.28.2.ebuild 1661 RMD160 d548783f292664b15e2d1ae8c1ead069ecf662e2 SHA1 75ac137f8b4434a5f5868dd1d0e76dc85685aea0 SHA256 c60146a30ecedf5b0178bd5a0dd7f968c1d3b40d9b7cb866baa13b6f6e81e23f -MISC ChangeLog 45695 RMD160 64b99d5102599a59d0a6c4fe12978ca0ceb8899f SHA1 b06e1698729f52c1ba8f5e84cdec2b0b3122b2fd SHA256 ff0a2eda229007838b6f939fe2d788b4623c4c4e9dd634905118a407a280d476 +MISC ChangeLog 46004 RMD160 ce633808e3bf7d0c41c598aaebd58973a4240b48 SHA1 f98a1fcefb2618a14209df34bfa0588087379c9b SHA256 63d333de1a9fc0b172a8ef1608d5c026b87408bd1290f2a7dcf4fed47ca0c00a MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuYNroACgkQ1fmVwcYIWAYRGQCg4wRnQO2F7cvgVK/w8aOvL7Zo -wyQAoLMqCVWNIHAkjohrH7T4d8hYvYur -=dK3b +iEYEARECAAYFAkuaH4sACgkQCaWpQKGI+9RAwACfcth4ITwsC4qbbKn5wLdS7COI +o18An2AWiaagP/N8uXHJ9pABGxdCzNgQ +=WrBD -----END PGP SIGNATURE----- diff --git a/www-client/epiphany/epiphany-2.26.3-r4.ebuild b/www-client/epiphany/epiphany-2.26.3-r4.ebuild new file mode 100644 index 000000000000..9b98de257ddc --- /dev/null +++ b/www-client/epiphany/epiphany-2.26.3-r4.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2010 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-r4.ebuild,v 1.1 2010/03/12 11:03:32 pacho 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" + + # Fix download location reset, bug #292867 + epatch "${FILESDIR}/${P}-revert-downloadir.patch" + + # Port to xulrunner-1.9.2, bug #303583 + epatch "${FILESDIR}/${P}-xul192.patch" + sed -i s/TextZoom/FullZoom/ embed/mozilla/EphyBrowser.cpp || die + + # Fix nspr dependency, bug #303583 + epatch "${FILESDIR}/${P}-nspr.patch" + + # Fix missing glib header, bug #303583 + epatch "${FILESDIR}/${P}-glib.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-glib.patch b/www-client/epiphany/files/epiphany-2.26.3-glib.patch new file mode 100644 index 000000000000..0d99a3040559 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.26.3-glib.patch @@ -0,0 +1,22 @@ +--- embed/ephy-embed-shell.c.old 2010-03-10 11:43:01.773638266 +0000 ++++ embed/ephy-embed-shell.c 2010-03-10 11:43:21.957638633 +0000 +@@ -21,6 +21,7 @@ + #include <config.h> + + #include <glib.h> ++#include <glib/gstdio.h> + + #include <glib/gi18n.h> + #include <gtk/gtk.h> + +--- embed/ephy-favicon-cache.c.old 2010-03-10 11:45:38.433638346 +0000 ++++ embed/ephy-favicon-cache.c 2010-03-10 11:46:05.265637902 +0000 +@@ -39,6 +39,8 @@ + #include "ephy-glib-compat.h" + + #include <glib.h> ++#include <glib/gstdio.h> ++ + #include <gio/gio.h> + + #define EPHY_FAVICON_CACHE_XML_ROOT (const xmlChar *)"ephy_favicons_cache" diff --git a/www-client/epiphany/files/epiphany-2.26.3-nspr.patch b/www-client/epiphany/files/epiphany-2.26.3-nspr.patch new file mode 100644 index 000000000000..cef222b95dd9 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.26.3-nspr.patch @@ -0,0 +1,14 @@ +--- configure.ac.old 2010-03-01 17:07:05.000000000 +0000 ++++ configure.ac 2010-03-01 17:07:33.000000000 +0000 +@@ -532,9 +532,9 @@ AC_MSG_RESULT([$enable_desktop_file_plug + + if test "$enable_desktop_file_plugin" = "yes"; then + if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then +- PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0]) ++ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0 nspr]) + else +- PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) ++ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0 nspr]) + fi + AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) + AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) diff --git a/www-client/epiphany/files/epiphany-2.26.3-xul192.patch b/www-client/epiphany/files/epiphany-2.26.3-xul192.patch new file mode 100644 index 000000000000..6bb5e0b5b11c --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.26.3-xul192.patch @@ -0,0 +1,14 @@ +--- embed/mozilla/EphyXULAppInfo.cpp~ 2009-05-28 21:26:21.000000000 +0200 ++++ embed/mozilla/EphyXULAppInfo.cpp 2010-03-08 23:29:42.000000000 +0100 +@@ -128,3 +128,11 @@ + aXPCOMABI.Assign (EPHY_HOST_CPU "-gcc3"); + return NS_OK; + } ++ ++/* readonly attribute AUTF8String WidgetToolkit; */ ++NS_IMETHODIMP ++EphyXULAppInfo::GetWidgetToolkit(nsACString & aWidgetToolkit) ++{ ++ aWidgetToolkit.Assign ("gtk"); ++ return NS_OK; ++} |