diff options
| -rw-r--r-- | www-client/epiphany/ChangeLog | 11 | ||||
| -rw-r--r-- | www-client/epiphany/Manifest | 18 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-2.30.6.ebuild | 35 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch | 20 | ||||
| -rw-r--r-- | www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch | 21 | ||||
| -rw-r--r-- | www-client/epiphany/metadata.xml | 1 |
6 files changed, 90 insertions, 16 deletions
diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog index abd56b700718..25106ba0db25 100644 --- a/www-client/epiphany/ChangeLog +++ b/www-client/epiphany/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-client/epiphany # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.262 2011/02/05 16:13:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.263 2011/03/11 08:41:33 pacho Exp $ + + 11 Mar 2011; Pacho Ramos <pacho@gentoo.org> epiphany-2.30.6.ebuild, + +files/epiphany-2.30.6-dbus-fix.patch, + +files/epiphany-2.30.6-introspection-prefix.patch: + Fix building with latest libnotify (bug #358043), fix introspection build by + telling g-ir-scanner what the prefix is, ping dependencies to proper slots, + bump to eapi3, prepare this for supporting introspection (without revbump as + introspection USE flag is still masked and we will need to check the tree + before unmasking it anyway). 05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> epiphany-2.30.6.ebuild, +files/epiphany-2.30.6-libnotify-0.7.patch: diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 9d263f1bb7bc..c8537a2015fe 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + 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 @@ -12,12 +15,21 @@ AUX epiphany-2.30.2-history-embed.patch 1961 RMD160 056be338f139a66dafd13ad4e53f AUX epiphany-2.30.2-leave-fullscreen.patch 865 RMD160 b8c8cd507da9b08eb68ac14e44abb26b8824ce7c SHA1 c9f01b1f32f6365f2afe143c8f044361fe38bb43 SHA256 9c02a1cf06c647c56d1c7a908b8a559fa4edc0ffccf717d2252a3a8a8b738ef8 AUX epiphany-2.30.2-referer-downloads.patch 2230 RMD160 3609a8b336310000294fb443ae3c503c545926ae SHA1 ed9eff8c2b910f8f73154d867b76328152608879 SHA256 e6a85dfed6a5a83d559404d3f8ffcf6319a48a314b037b763e82684f8aad1122 AUX epiphany-2.30.2-uri-crash.patch 782 RMD160 b5db55676c1c67582c8cfaad4f53cc19871e3f2c SHA1 4bf980a33f8864bd95ca83bd782e8edf661ab004 SHA256 3fa84fbaeaded14dae97be0c03cc1e42e85439259515bd4614b0452f5c52c3f4 +AUX epiphany-2.30.6-dbus-fix.patch 581 RMD160 52802eb04e3a98946913624fcc72740bebde366f SHA1 bf448d233392474b88db51a126e1b313ce744fa5 SHA256 6a0d826767eeed02300b612e16af99a8f3840ce1f754d437a1ddd8da9d254e95 +AUX epiphany-2.30.6-introspection-prefix.patch 710 RMD160 54c07f6d720310058bcbfcb36a968c1950e69455 SHA1 a5a8d616e3e82b5574dfbd97e2b9cd6afe7389e6 SHA256 19f273f7e193c27d667f0b65443a5fe33b67b1d25a3af14eab0a81c5ea5cdda1 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f3549e14fcdb0 SHA1 2257b0ecd8916657402374265936706e42a1c9c6 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c5172437a86 SHA1 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b SHA256 cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc EBUILD epiphany-2.26.3-r4.ebuild 3375 RMD160 fd0a7fef17847cba104c8f159f8252af94c5e96f SHA1 e98c98f7776b33e03d0dd89d9a9cfd4de6138812 SHA256 9e3f3fda0179ee5f54b3d5eb389c87e13a7942f5b873458e0c0afba66982dde0 EBUILD epiphany-2.30.2-r1.ebuild 2437 RMD160 06791f67471a8d063d7c2d4ba0efbcff9a1313ed SHA1 1aa96b91dfb8bf0250ddc5c45bff1abab1fd4e1a SHA256 23c7bd2b9992d43a61e2fe4b09d9d2bd663df7bd841bafcd49d3d9b519d35643 -EBUILD epiphany-2.30.6.ebuild 1970 RMD160 9690b06e338cc4698c8ee901a76023b4a197276a SHA1 29959887a3598d79e771f63f2f3d30e7bca3d315 SHA256 cf81381e5e67c32b9ccaefe51e6b1efe70de6509571eb9dd95d72575e263ed0a -MISC ChangeLog 51080 RMD160 4894066356774aa5db2211f2a6cef5de8111d474 SHA1 8a9f9300dcefc934cc0fff33e1a0743418d2fd79 SHA256 a7aa414f3f8fac872b0fcf475084b562e57bc2340e8323b9748596da32ba6acc -MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a +EBUILD epiphany-2.30.6.ebuild 2331 RMD160 92a6d9679e0fdcd371c731e3f4ce2c19fc542298 SHA1 e6b5ea9aaeff83f47046c0abce5428eb8880add1 SHA256 33c84c0a4bf32ff10416e207efc9a63a843220a8932c86c2ecf96fc18c238a61 +MISC ChangeLog 51584 RMD160 968dd605eafa0f571e257ff186f896fea5e5eeeb SHA1 b5446e884fbae575c9b42787e1e565105e0b80ec SHA256 83d4a11d98dc4440bfb2893b64189abca3370f7833439c76943cb6a6c1e1b996 +MISC metadata.xml 375 RMD160 4b38d1fe16a065d10967f7f17d768dc02bf1fae8 SHA1 96a760f61a9e0bb73120bb75a53b2247b84e9f14 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk154EMACgkQCaWpQKGI+9T82QCeOC68hKmB8O0og0th6B60ZzP2 ++DMAnjR27oaJbG3RRJXxyGC/SHaTa0nZ +=90l2 +-----END PGP SIGNATURE----- diff --git a/www-client/epiphany/epiphany-2.30.6.ebuild b/www-client/epiphany/epiphany-2.30.6.ebuild index 209d72082176..a704dd30e044 100644 --- a/www-client/epiphany/epiphany-2.30.6.ebuild +++ b/www-client/epiphany/epiphany-2.30.6.ebuild @@ -1,32 +1,33 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.6.ebuild,v 1.7 2011/02/05 16:13:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.6.ebuild,v 1.8 2011/03/11 08:41:33 pacho Exp $ -EAPI="2" +EAPI="3" +GCONF_DEBUG="yes" -inherit eutils gnome2 +inherit eutils gnome2 autotools DESCRIPTION="GNOME webbrowser based on Webkit" -HOMEPAGE="http://www.gnome.org/projects/epiphany/" +HOMEPAGE="http://projects.gnome.org/epiphany/" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86" # We are not ready for introspection yet -IUSE="avahi doc networkmanager +nss test" +IUSE="avahi doc +introspection networkmanager +nss test" # TODO: add seed support RDEPEND=">=dev-libs/glib-2.19.7:2 >=x11-libs/gtk+-2.19.5:2 - >=dev-libs/libxml2-2.6.12 + >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=x11-libs/startup-notification-0.5 >=x11-libs/libnotify-0.4 >=dev-libs/dbus-glib-0.71 - >=gnome-base/gconf-2 + >=gnome-base/gconf-2:2 >=app-text/iso-codes-0.35 - >=net-libs/webkit-gtk-1.2.3 + >=net-libs/webkit-gtk-1.2.3:2 >=net-libs/libsoup-gnome-2.29.91:2.4 >=gnome-base/gnome-keyring-2.26 @@ -37,34 +38,44 @@ RDEPEND=">=dev-libs/glib-2.19.7:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( net-misc/networkmanager ) nss? ( dev-libs/nss )" -# introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) 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 )" + doc? ( >=dev-util/gtk-doc-1 ) + gnome-base/gnome-common" # eautoreconf needs: # gnome-base/gnome-common pkg_setup() { DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO" G2CONF="${G2CONF} - --disable-introspection --disable-scrollkeeper --disable-maintainer-mode --with-distributor-name=Gentoo $(use_enable avahi zeroconf) + $(use_enable introspection) $(use_enable networkmanager network-manager) $(use_enable nss) $(use_enable test tests)" } src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch gnome2_src_prepare + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + + # introspection: Fix build by telling g-ir-scanner what the prefix is + epatch "${FILESDIR}"/${P}-introspection-prefix.patch + + # DBUS_LIBS is needed for libephymain.la + epatch "${FILESDIR}"/${P}-dbus-fix.patch + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf } src_compile() { diff --git a/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch b/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch new file mode 100644 index 000000000000..c50be67a2c60 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch @@ -0,0 +1,20 @@ +From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001 +From: Diego Escalante Urrelo <descalante@igalia.com> +Date: Mon, 01 Nov 2010 05:56:51 +0000 +Subject: tests: DBUS_LIBS is needed for libephymain.la + +--- +diff --git a/tests/Makefile.am b/tests/Makefile.am +index bd2c378..b973214 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -23,6 +23,7 @@ LDADD = \ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/libephymisc.la \ + $(top_builddir)/lib/egg/libegg.la \ ++ $(DBUS_LIBS) \ + $(DEPENDENCIES_LIBS) + + if ENABLE_NSS +-- +cgit v0.8.3.4 diff --git a/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch b/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch new file mode 100644 index 000000000000..2fe761a44482 --- /dev/null +++ b/www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch @@ -0,0 +1,21 @@ +From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001 +From: Vincent Untz <vuntz@gnome.org> +Date: Fri, 01 Oct 2010 16:36:23 +0000 +Subject: introspection: Fix build by telling g-ir-scanner what the prefix is + +https://bugzilla.gnome.org/show_bug.cgi?id=631119 +--- +diff --git a/src/Makefile.am b/src/Makefile.am +index e9d3715..acbf8ff 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE + --include=WebKit-1.0 \ + --program=./epiphany \ + --output $@ \ ++ --strip-prefix=Ephy \ + --pkg epiphany-$(EPIPHANY_API_VERSION) \ + -DEPIPHANY_COMPILATION \ + -I$(top_srcdir)/embed \ +-- +cgit v0.8.3.4 diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml index 72b304a074f2..06046e905c82 100644 --- a/www-client/epiphany/metadata.xml +++ b/www-client/epiphany/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>gnome</herd> <use> + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> <flag name="nss">Import passwords from older gecko based <pkg>www-client/epiphany</pkg> keyring.</flag> </use> </pkgmetadata> |