diff options
author | Remi Cardona <remi@gentoo.org> | 2009-01-03 11:38:35 +0000 |
---|---|---|
committer | Remi Cardona <remi@gentoo.org> | 2009-01-03 11:38:35 +0000 |
commit | 59dc933ebf2ada8b5a95d1318bdaca31431a25cb (patch) | |
tree | eb8430429d5059b00ed5c28c3e27c8541e9dbaf2 | |
parent | Drop ia64 keyword, no hardware to test (diff) | |
download | historical-59dc933ebf2ada8b5a95d1318bdaca31431a25cb.tar.gz historical-59dc933ebf2ada8b5a95d1318bdaca31431a25cb.tar.bz2 historical-59dc933ebf2ada8b5a95d1318bdaca31431a25cb.zip |
www-client/epiphany: add patch to fix libnotify crash (see bug #250031)
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-rc6-00020-gf608f49 i686
RepoMan-Options: --force
-rw-r--r-- | www-client/epiphany/ChangeLog | 12 | ||||
-rw-r--r-- | www-client/epiphany/Manifest | 5 | ||||
-rw-r--r-- | www-client/epiphany/epiphany-2.22.3-r1.ebuild | 94 | ||||
-rw-r--r-- | www-client/epiphany/epiphany-2.22.3-r11.ebuild | 79 | ||||
-rw-r--r-- | www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch | 65 |
5 files changed, 252 insertions, 3 deletions
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog index e304af737e26..f3e68a7b74c2 100644 --- a/www-client/epiphany/ChangeLog +++ b/www-client/epiphany/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-client/epiphany -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.177 2008/12/17 17:47:47 ranger Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.178 2009/01/03 11:38:34 remi Exp $ + +*epiphany-2.22.3-r11 (03 Jan 2009) +*epiphany-2.22.3-r1 (03 Jan 2009) + + 03 Jan 2009; Rémi Cardona <remi@gentoo.org> + +files/epiphany-2.22.3-notify-crash-fix.patch, +epiphany-2.22.3-r1.ebuild, + +epiphany-2.22.3-r11.ebuild: + add patch to fix libnotify crash (see bug #250031) 17 Dec 2008; Brent Baude <ranger@gentoo.org> epiphany-2.24.0.1.ebuild: Marking epiphany-2.24.0.1 ~ppc64 for bug 239847 diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 43a10379d650..fa382c1a9c40 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,17 +1,20 @@ AUX epiphany-2.20.3-fix-de-docs-tests.patch 1331 RMD160 7b7ba7a33a0975fe994bfe0d0022e26d77bd8bff SHA1 d1f318e720348dae6c6898fbf02c4e5e14c07903 SHA256 8d04f7011fe6cbab3e97f8c9cb800079227bfb0cde5ee38105607b585dfd387c AUX epiphany-2.22.3-firefox2.0-header-fix.patch 555 RMD160 53beacda1bfd919d8afa0bf652d91a3068ef1c07 SHA1 ce0e4a52ba0a2aad1ac9bc785540d0d49f9d689f SHA256 8a72057ad4e0434fb3f7c45c7336c1280d97aca092ff196bfbb56519900aabcc +AUX epiphany-2.22.3-notify-crash-fix.patch 1589 RMD160 ae0f063db6c314f8f188bc24e9e8de2b019e46d2 SHA1 cc2f719ab3b7ad28464e3e22dbed40c9e25fd845 SHA256 09aab29054c53cbd07fc5d2a8bec29c8e02c830e3fec8f4af7a079216cc13d8b DIST epiphany-2.20.3.tar.bz2 4945544 RMD160 1af464d3b694bb30e9491ea49162d79b655fa140 SHA1 ee3d21dde38970d9bfc715e2560f68303ac07e83 SHA256 a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca DIST epiphany-2.22.3.tar.bz2 5718239 RMD160 6607cb7b7e2afb7c5f3b914ba18f0347fd8d392d SHA1 eb99b5d073b5b3d9294ddcfb888340c5e6b45738 SHA256 d61c4fe6cc351bab526d0973491f704db592a9e65d9fbf86c7a9607decb94215 DIST epiphany-2.24.0.1.tar.bz2 5692261 RMD160 4b266d04e7530cf6c4bcac22ad59251bb542cb0a SHA1 5cea9f40c25fb6be2d281625862f8443c094e8dc SHA256 d27e0ce480ad643b5e0b4f44bcd83b3c96086d1d1f67c10531cb7fb3fd065938 DIST epiphany-2.24.1.tar.bz2 5694692 RMD160 f340f59211d3175bf4a940a40b593c163689f3f9 SHA1 1329e66c7b86cdbe906cd7bec35ea466d10f1c56 SHA256 518485c957c28089d5981218445b176b29a4c979e116cb390da7d04d393576bc DIST epiphany-2.24.2.1.tar.bz2 5724989 RMD160 0aa21eb6c798a8881080126d9197adb7a91ba56a SHA1 068b39001f44dd565b8d72a2fc59afeedcda0b43 SHA256 f2fd6df89671262043362b96cc30a90b678679dbfad9ed9724d528289e2a505a EBUILD epiphany-2.20.3.ebuild 2497 RMD160 9f61977a0944ce96994db6d5612acb30de9f5a32 SHA1 18fe2cd89ad4d3aab80160fea3434cb708f0a73a SHA256 f99bf563d9060a85c1d51a6f209a575b0896da98fa027edf61c4df8d212d7dac +EBUILD epiphany-2.22.3-r1.ebuild 2875 RMD160 34dab50a7d703e2d1da8e26ad43ccb058458a48d SHA1 123afbe6df25cd32df04a9d91ee56dc59eddd151 SHA256 091d60887b6de8a0e4fd66815d9557333aa73bb1bd4dccf4272cb7aedce34bd4 EBUILD epiphany-2.22.3-r10.ebuild 2216 RMD160 1e32cf5e13b10e9320b580b1236cb6b84c84a919 SHA1 661a74c18402d2fc741c642a9887eace17406c43 SHA256 5c99d69a998593a2af5dedd9e392d9ba21a622bd89ef9d762d91294ce55ff0bb +EBUILD epiphany-2.22.3-r11.ebuild 2343 RMD160 992d5820098596207f3c32891059a57e0e8bd5ac SHA1 1f7d7834fe9a993f5e08c8d870db9da2fc8b4706 SHA256 4f45bf528991cd74ef7eb84fa5a9d9689ddbc79495329866883d90486fd98a28 EBUILD epiphany-2.22.3.ebuild 2776 RMD160 6b1f53a487cdfdc9fdbeab4c4ae00d113323e1f7 SHA1 a70f2e94518afe26cb327e014b224dab15b20ea1 SHA256 96435405bf7469005e9281ff2c937c4a9fb4fd72a1109e2f4ee8cda55331abc3 EBUILD epiphany-2.24.0.1.ebuild 2315 RMD160 feb1f358a9a467bdc7c50be83cf95f4abec8c00f SHA1 e04cf3651c5fd94f1e26cd0d310107b667b3cdae SHA256 20a38bb01d24a4fd49930cf680640b39d991f98c157b3491accb5609f65ab66c EBUILD epiphany-2.24.1-r10.ebuild 2314 RMD160 d8714f11766450ec6af3a244255905f1bc43069c SHA1 92ae72ec50023ba0c476db532ca069f11ec39f80 SHA256 afaf08757a8c8a5d0ce386083d6c031c8cac792e5ea36624de33a11f738c6e51 EBUILD epiphany-2.24.1.ebuild 2657 RMD160 c7c3345d936ebb9df99e9b4e1ac43c6ba2f11b71 SHA1 fe30978e85886dcc55990652b8c04e0278a45da1 SHA256 fd520ecf5453dae0400dc405cdf7b3a9abdb362c86c4f0fc5588f5997ea39b92 EBUILD epiphany-2.24.2.1-r10.ebuild 2316 RMD160 3a43585f9ad331a2a493f8940570b0d5373fa89e SHA1 272d65e5dc2a5401cd799b8254619a4a83aa332e SHA256 dec4d57170e59e2aa469c2f52bb4f86c619d57d902cc34b9b9235c919785d027 EBUILD epiphany-2.24.2.1.ebuild 2659 RMD160 2daf1191b07ac89d5c49685af8a6bc02d1bbaf65 SHA1 3b345fab20738b47da603f805362098631eb2d6f SHA256 5506b017721f0244d206707ee8a8eaaff68549895d5ca9a1f6321ab8bd1ad36f -MISC ChangeLog 37726 RMD160 890d904b4e13e79a0bf406f9cd33202525d91b27 SHA1 00758b98801a4db161f9b7c4ccc7324446a16ff2 SHA256 6b084a72fde698d4bb71f62bac49e2551bf67c8150f0584ee0e8a1e4b5b38b0b +MISC ChangeLog 38003 RMD160 d12b8fd199acfb387c7359b617da902beffe7690 SHA1 becf7923e795d813b114894d3c37ce130f3e451e SHA256 ca81f375846b5f3331044747ea81c023f3efc34cb73a6d198f355f51bfb7ca26 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 diff --git a/www-client/epiphany/epiphany-2.22.3-r1.ebuild b/www-client/epiphany/epiphany-2.22.3-r1.ebuild new file mode 100644 index 000000000000..85b9b2d9b7c3 --- /dev/null +++ b/www-client/epiphany/epiphany-2.22.3-r1.ebuild @@ -0,0 +1,94 @@ +# 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.22.3-r1.ebuild,v 1.1 2009/01/03 11:38:34 remi Exp $ + +inherit gnome2 eutils multilib + +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 ~x86-fbsd" +IUSE="avahi doc networkmanager python spell xulrunner" + +# This release should work with xulrunner 1.9, but this revision is a +# stable candidate, so stick with 1.8 here. +# xulrunner-1.9 can be achieved via --with-engine=xulrunner, while +# --with-engine=mozilla goes with 1.8 + +RDEPEND=">=dev-libs/glib-2.16.0 + >=x11-libs/gtk+-2.12.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 + >=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 ) + !xulrunner? ( =www-client/mozilla-firefox-2* ) + xulrunner? ( =net-libs/xulrunner-1.8* ) + 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.35 + >=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-engine=mozilla + --enable-certificate-manager + --with-distributor-name=Gentoo + $(use_enable avahi zeroconf) + $(use_enable networkmanager network-manager) + $(use_enable spell spell-checker) + $(use_enable python)" + + if use xulrunner; then + G2CONF="${G2CONF} --with-gecko=xulrunner" + else + G2CONF="${G2CONF} --with-gecko=firefox" + fi +} + +src_unpack() { + gnome2_src_unpack + + # build fix with firefox 2.0 (bug #230834) + epatch "${FILESDIR}/${P}-firefox2.0-header-fix.patch" + + # fix libnotify crasher (bug #250031) + epatch "${FILESDIR}/${P}-notify-crash-fix.patch" +} + +src_compile() { + addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat + addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp + addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp + + addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat + addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp + addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp + + addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat + addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp + + gnome2_src_compile +} diff --git a/www-client/epiphany/epiphany-2.22.3-r11.ebuild b/www-client/epiphany/epiphany-2.22.3-r11.ebuild new file mode 100644 index 000000000000..e6feec2fe0f2 --- /dev/null +++ b/www-client/epiphany/epiphany-2.22.3-r11.ebuild @@ -0,0 +1,79 @@ +# 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.22.3-r11.ebuild,v 1.1 2009/01/03 11:38:34 remi Exp $ + +inherit gnome2 eutils multilib + +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" + +# This revision is meant to work with xulrunner 1.9, an earlier revision +# is the earlier stable candidate against xulrunner-1.8 and co. + +RDEPEND=">=dev-libs/glib-2.16.0 + >=x11-libs/gtk+-2.12.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 + >=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.35 + >=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 + --enable-certificate-manager + --with-distributor-name=Gentoo + $(use_enable avahi zeroconf) + $(use_enable networkmanager network-manager) + $(use_enable spell spell-checker) + $(use_enable python)" +} + +src_unpack() { + gnome2_src_unpack + + # fix libnotify crasher (bug #250031) + epatch "${FILESDIR}/${P}-notify-crash-fix.patch" +} + +src_compile() { + addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat + addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp + addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp + + # Why are these write-opened per bug 228589? + addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat + addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp + + gnome2_src_compile +} diff --git a/www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch b/www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch new file mode 100644 index 000000000000..1cd12088e50c --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.22.3-notify-crash-fix.patch @@ -0,0 +1,65 @@ +3cc902d2fd203127a98e027f42175db35dafa579 +diff --git a/embed/downloader-view.c b/embed/downloader-view.c +index 66de70b..68ce1af 100644 +--- a/embed/downloader-view.c ++++ b/embed/downloader-view.c +@@ -141,11 +141,6 @@ downloader_view_class_init (DownloaderViewClass *klass) + object_class->finalize = downloader_view_finalize; + + g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate)); +- +-#ifdef HAVE_LIBNOTIFY +- notify_init (PACKAGE); +-#endif +- + } + + static void +@@ -289,13 +284,6 @@ downloader_view_finalize (GObject *object) + + G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object); + +-#ifdef HAVE_LIBNOTIFY +- if (notify_is_initted ()) +- { +- notify_uninit (); +- } +-#endif +- + if (idle_unref) + { + ephy_object_idle_unref (embed_shell); +diff --git a/src/ephy-main.c b/src/ephy-main.c +index 13c8f9e..4e92d42 100644 +--- a/src/ephy-main.c ++++ b/src/ephy-main.c +@@ -50,6 +50,10 @@ + #include <errno.h> + #include <string.h> + ++#ifdef HAVE_LIBNOTIFY ++#include <libnotify/notify.h> ++#endif ++ + static GQuark startup_error_quark = 0; + #define STARTUP_ERROR_QUARK (startup_error_quark) + +@@ -737,9 +741,18 @@ main (int argc, + g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL); + ephy_object_idle_unref (ephy_shell); + ++#ifdef HAVE_LIBNOTIFY ++ /* Init notifications for the download manager */ ++ notify_init (PACKAGE); ++#endif ++ + gtk_main (); + + /* Shutdown */ ++#ifdef HAVE_LIBNOTIFY ++ if (notify_is_initted ()) ++ notify_uninit (); ++#endif + eel_gconf_monitor_remove ("/apps/epiphany/general"); + gnome_accelerators_sync (); + ephy_state_save (); |