diff options
| -rw-r--r-- | www-client/galeon/ChangeLog | 11 | ||||
| -rw-r--r-- | www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch | 45 | ||||
| -rw-r--r-- | www-client/galeon/galeon-2.0.7-r1.ebuild | 47 | ||||
| -rw-r--r-- | www-client/galeon/galeon-2.0.7.ebuild | 3 |
4 files changed, 103 insertions, 3 deletions
diff --git a/www-client/galeon/ChangeLog b/www-client/galeon/ChangeLog index 20c57f0175c3..faa317eae5cb 100644 --- a/www-client/galeon/ChangeLog +++ b/www-client/galeon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/galeon -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.48 2009/02/22 23:15:51 hanno Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/ChangeLog,v 1.49 2009/07/21 15:38:52 nirbheek Exp $ + +*galeon-2.0.7-r1 (21 Jul 2009) + + 21 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org> galeon-2.0.7.ebuild, + +galeon-2.0.7-r1.ebuild, + +files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch: + Add 1.9.1-compatible version which isn't compatible with <1.9.1 *galeon-2.0.7 (22 Feb 2009) diff --git a/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch b/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch new file mode 100644 index 000000000000..8cf368b23f3b --- /dev/null +++ b/www-client/galeon/files/galeon-2.0.7-build-with-xulrunner-1.9.1.patch @@ -0,0 +1,45 @@ +Fix building with xulrunner-1.9.1, bug 275252 + +Patch taken from http://cvs.fedoraproject.org/viewvc/devel/galeon/galeon-2.0.7-moz191.patch?view=log + +-- +--- a/mozilla/EventContext.cpp ++++ b/mozilla/EventContext.cpp +@@ -35,6 +35,7 @@ + #include <nsIDOMXULDocument.h> + #include <nsIURI.h> + #include <nsIDOMNSEvent.h> ++#include <nsIDOMNSElement.h> + #include <nsIDOMNSHTMLElement.h> + #include <nsIDOMCharacterData.h> + #include <nsIDOMHTMLButtonElement.h> +@@ -518,20 +519,21 @@ + nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY) + { + /* Calculate the node coordinates relative to the widget origin */ +- nsCOMPtr<nsIDOMNSHTMLElement> elem = do_QueryInterface(aTarget); ++ nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget)); + + PRInt32 x = 0, y = 0; +- while (elem) ++ while (nsHTMLElem) + { + PRInt32 val; +- elem->GetOffsetTop(&val); y += val; +- elem->GetScrollTop(&val); y -= val; +- elem->GetOffsetLeft(&val); x += val; +- elem->GetScrollLeft(&val); x -= val; ++ nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem)); ++ nsHTMLElem->GetOffsetTop(&val); y += val; ++ nsElem->GetScrollTop(&val); y -= val; ++ nsHTMLElem->GetOffsetLeft(&val); x += val; ++ nsElem->GetScrollLeft(&val); x -= val; + + nsCOMPtr<nsIDOMElement> parent; +- elem->GetOffsetParent(getter_AddRefs(parent)); +- elem = do_QueryInterface(parent); ++ nsHTMLElem->GetOffsetParent (getter_AddRefs (parent)); ++ nsHTMLElem = do_QueryInterface(parent); + } + *aX = x; + *aY = y; diff --git a/www-client/galeon/galeon-2.0.7-r1.ebuild b/www-client/galeon/galeon-2.0.7-r1.ebuild new file mode 100644 index 000000000000..415bec0c9e32 --- /dev/null +++ b/www-client/galeon/galeon-2.0.7-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7-r1.ebuild,v 1.1 2009/07/21 15:38:52 nirbheek Exp $ + +inherit gnome2 eutils + +DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)" +HOMEPAGE="http://galeon.sourceforge.net" +SRC_URI="mirror://sourceforge/galeon/${P}.tar.bz2 + mirror://gentoo/${P}-patches.tar.lzma" + +LICENSE="GPL-2" +IUSE="seamonkey xulrunner" +KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" +SLOT="0" +RDEPEND=">=net-libs/xulrunner-1.9.1 + >=x11-libs/gtk+-2.4.0 + >=dev-libs/libxml2-2.6.6 + >=gnome-base/libgnomeui-2.5.2 + >=gnome-base/gnome-vfs-2 + >=gnome-base/gnome-desktop-2.10.0 + >=gnome-base/libglade-2.3.1" +DEPEND="${RDEPEND} + app-text/rarian + dev-util/pkgconfig + >=dev-util/intltool-0.30 + >=sys-devel/gettext-0.11" + +DOCS="AUTHORS ChangeLog FAQ README README.ExtraPrefs THANKS TODO NEWS" + +src_unpack() { + gnome2_src_unpack + cd "${S}" + for i in "${WORKDIR}/${P}-patches/*"; do + epatch $i || die "patch $i failed" + done + + # bug 275252, patch => no building with <1.9.1 + epatch "${FILESDIR}/${P}-build-with-xulrunner-1.9.1.patch" +} + +src_compile() { + myconf="--with-mozilla=libxul-embedding-unstable" + + econf ${myconf} || die "configure failed" + emake || die "compile failed" +} diff --git a/www-client/galeon/galeon-2.0.7.ebuild b/www-client/galeon/galeon-2.0.7.ebuild index 8d826e9f9571..623c0325c346 100644 --- a/www-client/galeon/galeon-2.0.7.ebuild +++ b/www-client/galeon/galeon-2.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7.ebuild,v 1.1 2009/02/22 23:15:51 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-2.0.7.ebuild,v 1.2 2009/07/21 15:38:52 nirbheek Exp $ inherit gnome2 eutils @@ -14,6 +14,7 @@ IUSE="seamonkey xulrunner" KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" SLOT="0" RDEPEND=">=net-libs/xulrunner-1.8 + <net-libs/xulrunner-1.9.1 >=x11-libs/gtk+-2.4.0 >=dev-libs/libxml2-2.6.6 >=gnome-base/libgnomeui-2.5.2 |