-update to 1.4.24

 changes:
 -Flash is now stripped from feed content per default
 -Added preference option to allow Flash in feed content
 -Fixes cross compilation issue with configure.ac
 -translation updates
-allow to build against gtkhtml also on 64-bit platforms. gtkhtml is
 rather buggy, but since liferea doesn't like the gecko version of
 firefox2 anymore, and our firefox3 pkg is too hacked up to be usable
 for embedding this is the only choice atm
-improve my patch for 64-bit time_t so that it should be good enough
 for upstream (if there only was a working mailing list to report to)
tested by Steve Bellovin (assuming no news are good news)

5 files changed, 53 insertions, 23 deletions

diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 586c0568730..47b806f74d2 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2009/01/18 01:59:42 drochner Exp $
+# $NetBSD: Makefile,v 1.80 2009/02/16 17:34:17 drochner Exp $
 
-DISTNAME=		liferea-1.4.23
-PKGREVISION=	1
+DISTNAME=		liferea-1.4.24
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
diff --git a/www/liferea/PLIST b/www/liferea/PLIST
index 3bf6f4fc8bd..98b9c4ec249 100644
--- a/www/liferea/PLIST
+++ b/www/liferea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2009/01/12 02:43:32 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.35 2009/02/16 17:34:17 drochner Exp $
 bin/liferea
 bin/liferea-add-feed
 bin/liferea-bin
@@ -132,6 +132,7 @@ share/locale/be@latin/LC_MESSAGES/liferea.mo
 share/locale/ca/LC_MESSAGES/liferea.mo
 share/locale/cs/LC_MESSAGES/liferea.mo
 share/locale/de/LC_MESSAGES/liferea.mo
+share/locale/el/LC_MESSAGES/liferea.mo
 share/locale/es/LC_MESSAGES/liferea.mo
 share/locale/eu/LC_MESSAGES/liferea.mo
 share/locale/fr/LC_MESSAGES/liferea.mo
@@ -143,6 +144,7 @@ share/locale/pt/LC_MESSAGES/liferea.mo
 share/locale/pt_BR/LC_MESSAGES/liferea.mo
 share/locale/ru/LC_MESSAGES/liferea.mo
 share/locale/sk/LC_MESSAGES/liferea.mo
+share/locale/sq/LC_MESSAGES/liferea.mo
 share/locale/sv/LC_MESSAGES/liferea.mo
 share/locale/tr/LC_MESSAGES/liferea.mo
 @dirrm share/liferea/xslt
diff --git a/www/liferea/distinfo b/www/liferea/distinfo
index 5d909074969..bd88e2b063b 100644
--- a/www/liferea/distinfo
+++ b/www/liferea/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.55 2009/01/18 01:59:42 drochner Exp $
+$NetBSD: distinfo,v 1.56 2009/02/16 17:34:17 drochner Exp $
 
-SHA1 (liferea-1.4.23.tar.gz) = cf2cfc61ec92f9b183e3cd75d8280ab273214175
-RMD160 (liferea-1.4.23.tar.gz) = 1da59d457364efcbf99fa138d4e9bb3e800a0243
-Size (liferea-1.4.23.tar.gz) = 1655446 bytes
+SHA1 (liferea-1.4.24.tar.gz) = a3a547e0f317dcc912c9408d59e9a58410386d5f
+RMD160 (liferea-1.4.24.tar.gz) = 8a0b747bf75f2f952018a4fcae9d7b55cdc3f331
+Size (liferea-1.4.24.tar.gz) = 1670117 bytes
 SHA1 (patch-ae) = 91c32840150a33d2162301c17bd5c35edc6264ba
-SHA1 (patch-af) = 7760a6f7f84172c72d012b6231320c49df33e046
+SHA1 (patch-af) = 6376c278cc5fa1fd2f353e056d9e135fbf9e0bef
+SHA1 (patch-ag) = 49eaef5dd44397d5dda30d7b750cce3a26d5029d
diff --git a/www/liferea/patches/patch-af b/www/liferea/patches/patch-af
index 97c281af50e..230994809c8 100644
--- a/www/liferea/patches/patch-af
+++ b/www/liferea/patches/patch-af
@@ -1,23 +1,31 @@
-$NetBSD: patch-af,v 1.4 2009/01/18 01:59:42 drochner Exp $
+$NetBSD: patch-af,v 1.5 2009/02/16 17:34:17 drochner Exp $
 
---- src/ui/ui_itemlist.c.orig	2009-01-18 02:25:45.000000000 +0100
+--- src/ui/ui_itemlist.c.orig	2008-12-28 10:21:00.000000000 +0100
 +++ src/ui/ui_itemlist.c
-@@ -416,6 +416,7 @@ ui_itemlist_add_item (itemPtr item) 
- 	{
- 		GtkTreeIter *iter = &old_iter;
- 		gint state = 0;
-+		unsigned long tmp_time; /* match column type */
- 		
- 		node = node_from_id (item->nodeId);
- 		if(!node)
-@@ -433,8 +434,9 @@ ui_itemlist_add_item (itemPtr item) 
- 		if (!item->readStatus)
+@@ -76,7 +76,7 @@ static gboolean ui_item_id_to_iter(gulon
+ 
+ /* sort function for the item list date column */
+ static gint ui_itemlist_date_sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) {
+-	gulong	timea, timeb;
++	gint64	timea, timeb;
+ 	double	diff;
+ 
+ 	gtk_tree_model_get(model, a, IS_TIME, &timea, -1);
+@@ -129,7 +129,7 @@ GtkTreeStore * ui_itemlist_get_tree_stor
+ 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(itemlist_treeview));
+ 	if(!model) {
+ 		itemstore = gtk_tree_store_new(IS_LEN,
+-		                               G_TYPE_ULONG,	/* IS_TIME */
++		                               G_TYPE_INT64,	/* IS_TIME */
+ 		                               G_TYPE_STRING, 	/* IS_TIME_STR */
+ 		                               G_TYPE_STRING,	/* IS_LABEL */
+ 		                               GDK_TYPE_PIXBUF,	/* IS_STATEICON */
+@@ -434,7 +434,7 @@ ui_itemlist_add_item (itemPtr item) 
  			state += 1;
  
-+		tmp_time = item->time;
  		gtk_tree_store_set (itemstore, iter,
 -		                	       IS_TIME, item->time,
-+		                	       IS_TIME, tmp_time,
++		                	       IS_TIME, (gint64)item->time,
  		                	       IS_NR, item->id,
  					       IS_PARENT, node,
  		                               IS_FAVICON, node->icon,
diff --git a/www/liferea/patches/patch-ag b/www/liferea/patches/patch-ag
new file mode 100644
index 00000000000..48164045de1
--- /dev/null
+++ b/www/liferea/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.1 2009/02/16 17:34:17 drochner Exp $
+
+--- configure.orig	2009-02-10 20:01:34.000000000 +0100
++++ configure
+@@ -23343,6 +23343,7 @@ else
+ fi
+ 
+ 
++if false; then
+ { $as_echo "$as_me:$LINENO: checking for 64bit platform" >&5
+ $as_echo_n "checking for 64bit platform... " >&6; }
+ case "$target" in
+@@ -23356,6 +23357,7 @@ $as_echo "yes -> disabling GtkHTML2" >&6
+ $as_echo "no" >&6; }
+      ;;
+ esac
++fi
+ 
+ 
+ { $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5