New version of liferea; Add 64bit-clean patch for gtkhtml

(Portage version: 2.1.1_pre3-r5)

4 files changed, 120 insertions, 1 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index e37cb942390b..16d14eebf92e 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.42 2006/07/31 00:17:15 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.43 2006/07/31 01:07:21 dang Exp $
+
+*liferea-1.0.18 (31 Jul 2006)
+
+  31 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/liferea-1.0.18-amd64.patch, +liferea-1.0.18.ebuild:
+  New version of liferea;  Add 64bit-clean patch for gtkhtml
 
   31 Jul 2006; Daniel Gryniewicz <dang@gentoo.org> liferea-1.0.16.ebuild:
   Marked stable on amd64 bug #140644
diff --git a/net-news/liferea/files/digest-liferea-1.0.18 b/net-news/liferea/files/digest-liferea-1.0.18
new file mode 100644
index 000000000000..4c9f194cbb55
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.0.18
@@ -0,0 +1,3 @@
+MD5 1bedab466eee66e6063e55492d98c37e liferea-1.0.18.tar.gz 1577667
+RMD160 a3d606ad191a010cee9425757bd8ae5d0fe6bd87 liferea-1.0.18.tar.gz 1577667
+SHA256 cf643ef4b32cfc10abe42bee8acd9899141236e2054e9b7f60083e6bbf99901e liferea-1.0.18.tar.gz 1577667
diff --git a/net-news/liferea/files/liferea-1.0.18-amd64.patch b/net-news/liferea/files/liferea-1.0.18-amd64.patch
new file mode 100644
index 000000000000..0299b5657a32
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.0.18-amd64.patch
@@ -0,0 +1,44 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN liferea-1.0.18.orig/src/common.c liferea-1.0.18/src/common.c
+--- liferea-1.0.18.orig/src/common.c	2006-07-12 15:30:12.000000000 -0400
++++ liferea-1.0.18/src/common.c	2006-07-30 20:28:20.000000000 -0400
+@@ -95,7 +95,7 @@
+    can be NULL) to to_encoding, frees the original string and 
+    returns the result */
+ gchar * convertCharSet(gchar * from_encoding, gchar * to_encoding, gchar * string) {
+-	gint	bw, br;
++	gsize	bw, br;
+ 	gchar	*new = NULL;
+ 	GError *err = NULL;
+ 
+diff --exclude-from=/home/dang/.diffrc -u -ruN liferea-1.0.18.orig/src/gtkhtml2/gtkhtml2.c liferea-1.0.18/src/gtkhtml2/gtkhtml2.c
+--- liferea-1.0.18.orig/src/gtkhtml2/gtkhtml2.c	2006-07-18 16:15:09.000000000 -0400
++++ liferea-1.0.18/src/gtkhtml2/gtkhtml2.c	2006-07-30 20:36:17.000000000 -0400
+@@ -33,6 +33,7 @@
+ #endif
+ 
+ #include <libgtkhtml/gtkhtml.h>
++#include <libgtkhtml/view/htmlselection.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+diff --exclude-from=/home/dang/.diffrc -u -ruN liferea-1.0.18.orig/src/update.c liferea-1.0.18/src/update.c
+--- liferea-1.0.18.orig/src/update.c	2006-06-21 16:18:05.000000000 -0400
++++ liferea-1.0.18/src/update.c	2006-07-30 20:34:12.000000000 -0400
+@@ -239,7 +239,7 @@
+ 		count = DEFAULT_UPDATE_THREAD_CONCURRENCY;
+ 	
+ 	for(i = 0; i < count; i++)
+-		g_thread_create(download_thread_main, (void *)(i == 0), FALSE, NULL);
++		g_thread_create(download_thread_main, GINT_TO_POINTER(i == 0), FALSE, NULL);
+ 
+ 	/* setup the processing of feed update results */
+ 	g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE,
+@@ -251,7 +251,7 @@
+ 
+ static void *download_thread_main(void *data) {
+ 	struct request	*request;
+-	gboolean	high_priority = (gboolean)data;
++	gboolean	high_priority = (gboolean)GPOINTER_TO_INT(data);
+ 
+ 	for(;;)	{	
+ 		/* block updating if we are offline */
diff --git a/net-news/liferea/liferea-1.0.18.ebuild b/net-news/liferea/liferea-1.0.18.ebuild
new file mode 100644
index 000000000000..a7052887c064
--- /dev/null
+++ b/net-news/liferea/liferea-1.0.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.18.ebuild,v 1.1 2006/07/31 01:07:21 dang Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus firefox gtkhtml seamonkey"
+
+RDEPEND=">=x11-libs/gtk+-2.4.0
+	>=dev-libs/libxml2-2.5.10
+	firefox? ( www-client/mozilla-firefox )
+	!firefox? ( seamonkey? ( www-client/seamonkey ) )
+	gtkhtml? ( =gnome-extra/gtkhtml-2* )
+	!seamonkey? ( !firefox? ( =gnome-extra/gtkhtml-2* ) )
+	>=gnome-base/gconf-2
+	dbus? ( >=sys-apps/dbus-0.30 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+
+	# if you don't choose a gecko to use, we will automatically
+	# use gtkhtml2 as the backend.
+	if ! use seamonkey && ! use firefox || use gtkhtml ; then
+		G2CONF="${G2CONF} --enable-gtkhtml2"
+	else
+		G2CONF="${G2CONF} --disable-gtkhtml2"
+	fi
+
+	# we prefer firefox over seamonkey
+	if use firefox ; then
+		G2CONF="${G2CONF} --enable-gecko=firefox"
+	elif use seamonkey ; then
+		G2CONF="${G2CONF} --enable-gecko=seamonkey"
+	else
+		G2CONF="${G2CONF} --disable-gecko"
+	fi
+
+	G2CONF="${G2CONF} $(use_enable dbus)"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-1.0.16-seamonkey.diff"
+	epatch "${FILESDIR}/${P}-amd64.patch"
+
+	eautoreconf || die "Failed running eautoreconf"
+}
+
+src_install() {
+	gnome2_src_install
+	rm -f ${D}/usr/bin/${PN}
+	mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN}
+}