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

Package-Manager: portage-2.1.1_pre3-r5

5 files changed, 139 insertions, 8 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/Manifest b/net-news/liferea/Manifest
index 0169a5626c15..26846a87f5d0 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -5,6 +5,10 @@ AUX liferea-1.0.16-seamonkey.diff 1234 RMD160 bfa2fc499f9cdaa1f01f5f45b0e324aac8
 MD5 9854f1be8bf5919c8ca734cb6899bfc6 files/liferea-1.0.16-seamonkey.diff 1234
 RMD160 bfa2fc499f9cdaa1f01f5f45b0e324aac88ce2a5 files/liferea-1.0.16-seamonkey.diff 1234
 SHA256 8356a17a81974511d9c2be86d8d7b7fe6a9fbc1321e378b67ffc0c79d519508a files/liferea-1.0.16-seamonkey.diff 1234
+AUX liferea-1.0.18-amd64.patch 1836 RMD160 be1665b141ba561a7936a4cab60e7503f8f24f92 SHA1 fbe9cf0d805a118ef686c2aa2a061789e41d2c80 SHA256 cbe565f023d6f2857b77890e139b739b623c43b892e4b522eb65f69b04113dc6
+MD5 696f8beae786ba8042d4863ca6a220e6 files/liferea-1.0.18-amd64.patch 1836
+RMD160 be1665b141ba561a7936a4cab60e7503f8f24f92 files/liferea-1.0.18-amd64.patch 1836
+SHA256 cbe565f023d6f2857b77890e139b739b623c43b892e4b522eb65f69b04113dc6 files/liferea-1.0.18-amd64.patch 1836
 AUX liferea-firefox-1.5.patch 650 RMD160 812f9dc7139d98a648b76c406081e03dba40c548 SHA1 ae7a2c8b745b87a157503cb629c15f09b6a1dc51 SHA256 a1a15d1ded59cb28ac013accf1c3c4a216f2881c1127085ccd320945e81eae0e
 MD5 86662e7c1f5a7d08669b0d6c729de55a files/liferea-firefox-1.5.patch 650
 RMD160 812f9dc7139d98a648b76c406081e03dba40c548 files/liferea-firefox-1.5.patch 650
@@ -12,6 +16,7 @@ SHA256 a1a15d1ded59cb28ac013accf1c3c4a216f2881c1127085ccd320945e81eae0e files/li
 DIST liferea-0.9.6.tar.gz 1207768 RMD160 1fc2fcee3deafb904c36b26b43f521b69a329a48 SHA1 a4737b488e8af7821497da736a8f4e60a54cbd71 SHA256 ace3af7d06de4c7a143e7c85ecac1aff8e1e7c6c0cc1961d66db1bdd1dad6d3b
 DIST liferea-1.0.15.tar.gz 1575426 RMD160 76379640c03aeabb7832a207f415c099fce8aea5 SHA1 84fbd64b1318c499c285d0d48b0c952bbcfd8ec7 SHA256 6f328f554f7697d63e22edfdf582b739b3e5e176248f1d2b01a655673076f5d9
 DIST liferea-1.0.16.tar.gz 1575690 RMD160 c5ba8aed414c333a9e12d950a821042216cee310 SHA1 6a134e12cad915dd85f0fb467f39397400a69614 SHA256 591d7d6b6ea6d8c0a90c68418d1e65076bbfe32976f00d229357f45176e3ebe4
+DIST liferea-1.0.18.tar.gz 1577667 RMD160 a3d606ad191a010cee9425757bd8ae5d0fe6bd87 SHA1 02f2f0b9f4957e731ee89d3747cab4a0da1a46cc SHA256 cf643ef4b32cfc10abe42bee8acd9899141236e2054e9b7f60083e6bbf99901e
 DIST liferea-1.0.3.tar.gz 1495213 RMD160 748d6b33bd5b3493a2ef25899b3e4aa3afab7132 SHA1 4ebf30c2c67098de45ade97083d420958b3be32b SHA256 1bb1196fcc92804221f519ca8939e0e053de4baf457514acbbb6a15a3615e70c
 DIST liferea-1.0.4.tar.gz 1527257 RMD160 d8ea1585bcb0fb385a834f56cebf3568fc311633 SHA1 fc221b4cf9c281790b5add61c3b94273777a3178 SHA256 2501cbabdb8fbeb7ec76c2daee67c7cafef08361f88c42cd77efea1821688c83
 DIST liferea-1.0.tar.gz 1466393 RMD160 8cb2033f9bad5ffdaa2d3d5569f9e758a239a06a SHA256 c4823bce97e54a7a7ec004f50d7f33f96e912ae8926430b8f94015c2655ac405
@@ -31,6 +36,10 @@ EBUILD liferea-1.0.16.ebuild 1698 RMD160 ef3bddff5ade3b30f3ab5c43baabf002dfc7a47
 MD5 102170d5ba7fad1e64c4d8ea221305d0 liferea-1.0.16.ebuild 1698
 RMD160 ef3bddff5ade3b30f3ab5c43baabf002dfc7a471 liferea-1.0.16.ebuild 1698
 SHA256 5001165819eea9d682d2dfc9db4f0e4f85c6f156dac6a13cc4d3854bac4f84dc liferea-1.0.16.ebuild 1698
+EBUILD liferea-1.0.18.ebuild 1708 RMD160 a5fdaf20ffa94ccfc119ad8e44b75d0953ee8097 SHA1 b2a1d98f5f283a2555de083b50a2c427d1ef3b1d SHA256 b555766eb3e88b7b573cb3bca479c69060118a850bb6c204720892ef1a946385
+MD5 656e7e3be333c086b60562467d41f55b liferea-1.0.18.ebuild 1708
+RMD160 a5fdaf20ffa94ccfc119ad8e44b75d0953ee8097 liferea-1.0.18.ebuild 1708
+SHA256 b555766eb3e88b7b573cb3bca479c69060118a850bb6c204720892ef1a946385 liferea-1.0.18.ebuild 1708
 EBUILD liferea-1.0.3.ebuild 1763 RMD160 09d40832bfd09aa5538f2c392dab58c9833cbdfd SHA1 807408b1fbbf48dd6d2d8fca6f6cfc8632b852d6 SHA256 e9c45442cbbb6f01cc707ca8e5d951d2025760f2836763729ee62d55763fabc1
 MD5 31e94914a976667c59a0b6462f22edeb liferea-1.0.3.ebuild 1763
 RMD160 09d40832bfd09aa5538f2c392dab58c9833cbdfd liferea-1.0.3.ebuild 1763
@@ -39,10 +48,10 @@ EBUILD liferea-1.0.4.ebuild 1763 RMD160 f0e9024a38db5978b7dd09719c1b43162d846dab
 MD5 5a9f0b57fab41e5beb031b8a826eb03f liferea-1.0.4.ebuild 1763
 RMD160 f0e9024a38db5978b7dd09719c1b43162d846dab liferea-1.0.4.ebuild 1763
 SHA256 e6920b26b9dfc761dcd69c0c9d6dc6a9ef5611d46d099b910ed5f394015ff77e liferea-1.0.4.ebuild 1763
-MISC ChangeLog 10312 RMD160 7ae87b77363762af3431a41abe1d6897c89c3b7c SHA1 00ed9111eaede24fa2700b19f76d69a5fcfde8ae SHA256 0ccc2b502c0cfee29bba71abfaa7973b3fc9b3d66874a8efded32b517ff7ec33
-MD5 c0c7155bf4acf3e5ca266bf11f52d685 ChangeLog 10312
-RMD160 7ae87b77363762af3431a41abe1d6897c89c3b7c ChangeLog 10312
-SHA256 0ccc2b502c0cfee29bba71abfaa7973b3fc9b3d66874a8efded32b517ff7ec33 ChangeLog 10312
+MISC ChangeLog 10517 RMD160 1334aaa896271644ecfe515ba4e99395d79dadea SHA1 1eaf8fd110744a813226c43190e6947409c90ea9 SHA256 f7e7920e5e3dc042d085c172ae96591c65df097a03aa5a047a7ac64d38bb927c
+MD5 f045bedf213714edcd1f815e529f3bcf ChangeLog 10517
+RMD160 1334aaa896271644ecfe515ba4e99395d79dadea ChangeLog 10517
+SHA256 f7e7920e5e3dc042d085c172ae96591c65df097a03aa5a047a7ac64d38bb927c ChangeLog 10517
 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f
 MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234
 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234
@@ -59,6 +68,9 @@ SHA256 90961ca6f328740c810c24da5c81b255aa4739f48468f3d2e4fd0e42c2149851 files/di
 MD5 1a78a66c9be7d1687ab62c3e50da168a files/digest-liferea-1.0.16 247
 RMD160 03d34654c5f02746f9c39d399df20c19017b3727 files/digest-liferea-1.0.16 247
 SHA256 665ce96de96f78e6071d90c65196782710a5f736e599ae3cc61cf1ec70dc8d24 files/digest-liferea-1.0.16 247
+MD5 2d13feb8e2c12f1e2c10a974241759f6 files/digest-liferea-1.0.18 247
+RMD160 db38a105769bc3a5e1f38f437e6ebe869f5f9ffd files/digest-liferea-1.0.18 247
+SHA256 f6366f39ea60a65fce26cd80574737585060c9c95228058d7f805194844a53f9 files/digest-liferea-1.0.18 247
 MD5 65ecfc2a66da648eaf491e04dede0a64 files/digest-liferea-1.0.3 244
 RMD160 cc6aeefe52546eb53bc4ae7e00071532af17757d files/digest-liferea-1.0.3 244
 SHA256 edc10e9d0cc00ff2b4e4421823872bd311042b7327f4af2f7ea3323f620c3d3f files/digest-liferea-1.0.3 244
@@ -68,7 +80,7 @@ SHA256 4dae4716c1fe762d7810a76ecac128e1c81cecadfc7dc26713892174b28e2696 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEzUwPomPajV0RnrERAvsAAJ9DB77TVH5zMdHeCqI2sEmJon7IUQCdFdjI
-L9ryqKHaLESX06BoQ2n5Fs4=
-=uHuC
+iD8DBQFEzVfNomPajV0RnrERAnX+AJ0UMYThUA1DzWynzgd0+xVe2WTPPQCdG+SL
+ycMJjTzWwsB8J2g1Xiv5FFs=
+=neY1
 -----END PGP SIGNATURE-----
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}
+}