fix alpha

5 files changed, 90 insertions, 3 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 28120334c109..30325673e7fd 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.38 2003/08/14 13:25:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.39 2003/08/20 16:01:21 agriffis Exp $
+
+*libgtkhtml-3.0.8-r1 (20 Aug 2003)
+
+  20 Aug 2003; Aron Griffis <agriffis@gentoo.org> libgtkhtml-3.0.8-r1.ebuild,
+  files/libgtkhtml-3.0.8-alpha.patch:
+  Add patch to prevent segfaults on alpha
 
   12 Aug 2003; Aron Griffis <agriffis@gentoo.org> libgtkhtml-3.0.8.ebuild:
   Add ~alpha to KEYWORDS
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 66543101b52f..747441563f82 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,4 +1,4 @@
-MD5 fc6f76d4c7b5c5babe46376a0f1f6689 ChangeLog 5453
+MD5 b3f77cd265bf52c6a48006b19010a254 ChangeLog 5517
 MD5 eccf98bc3b301df70dd18bcc9b94440b libgtkhtml-2.2.1.ebuild 803
 MD5 a98a27c7ff7d616fdd134e1cb90d3007 libgtkhtml-2.0.2.ebuild 735
 MD5 a7ec932042000406f51f7fbceb8e9f82 libgtkhtml-2.2.3.ebuild 817
@@ -8,7 +8,7 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4b66633ff9275bc92b181d8bdccc1cea libgtkhtml-2.2.4.ebuild 852
 MD5 5a51eb355e6280e5561775ef4b125731 libgtkhtml-3.0.7.ebuild 1387
 MD5 d285e4143eaeacc1fdf98a5039483803 libgtkhtml-3.0.8.ebuild 1393
-MD5 28277dabd07930194a79f1260d6d53a1 libgtkhtml-3.0.8-r1.ebuild 1493
+MD5 cc4c20c058d4201c7ab9e9f45edfb4e7 libgtkhtml-3.0.8-r1.ebuild 1496
 MD5 470c04d01c1c093ee1439465a3c650ea files/digest-libgtkhtml-2.2.1 69
 MD5 277fd5b1d3246d060bc3821f73bf4392 files/digest-libgtkhtml-2.0.2 69
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r1
new file mode 100644
index 000000000000..e89e703e2c13
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.8-r1
@@ -0,0 +1 @@
+MD5 ef54e1dd447f3e4e00ad11e18326fb92 gtkhtml-3.0.8.tar.bz2 1034139
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.8-alpha.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.8-alpha.patch
new file mode 100644
index 000000000000..d26d17010560
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.8-alpha.patch
@@ -0,0 +1,22 @@
+--- gtkhtml-3.0.8/src/htmlengine.c	2003-06-26 08:36:41.000000000 -0400
++++ gtkhtml-3.0.8-new/src/htmlengine.c	2003-08-20 09:41:19.000000000 -0400
+@@ -3213,7 +3213,7 @@
+ }
+ 
+ 
+-guint
++GType
+ html_engine_get_type (void)
+ {
+ 	static GType html_engine_type = 0;
+--- gtkhtml-3.0.8/src/htmlengine.h	2003-05-19 08:50:26.000000000 -0400
++++ gtkhtml-3.0.8-new/src/htmlengine.h	2003-08-20 09:39:35.000000000 -0400
+@@ -292,7 +292,7 @@
+ 
+ 
+ /* Object construction.  */
+-guint       html_engine_get_type      (void);
++GType       html_engine_get_type      (void);
+ HTMLEngine *html_engine_new           (GtkWidget *);
+ void        html_engine_realize       (HTMLEngine *engine,
+ 				       GdkWindow  *window);
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild
new file mode 100644
index 000000000000..66150dcfc631
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.8-r1.ebuild,v 1.1 2003/08/20 16:01:21 agriffis Exp $
+
+inherit gnome2
+
+MY_P=${P/lib/}
+MY_PN=${PN/lib/}
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+# stolen from gnome.org eclass because it support this one-off name-mangling
+
+[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=gnome-extra/gal-1.99.9
+	>=net-libs/libsoup-1.99.23
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/bonobo-activation-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/ORBit2-2.5.6
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1
+	>=dev-libs/libxml2-2.5"
+ 
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+	unpack ${A}
+	if use alpha; then
+		epatch ${FILESDIR}/${PN}-3.0.8-alpha.patch
+	fi
+}
+
+src_compile() {
+	gnome2_src_configure
+	
+	EPATCH_OPTS="${S}/libtool"
+	epatch ${FILESDIR}/${PN}-3.0.7-libtool.patch
+	
+	emake || die "make failed"
+}