update to 1.4.12

changes:
-fix a crash when selecting news bins
-add compatibility with non-standard "xmlURL" OPML attributes
 used by LiveJournal
-bugfixes

4 files changed, 13 insertions, 55 deletions

diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 119068f5367..098b7879899 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2008/01/16 19:53:24 smb Exp $
+# $NetBSD: Makefile,v 1.68 2008/02/03 11:14:27 drochner Exp $
 
-DISTNAME=		liferea-1.4.10
+DISTNAME=		liferea-1.4.12
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
-PKGREVISION=		2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://liferea.sourceforge.net/
diff --git a/www/liferea/distinfo b/www/liferea/distinfo
index e2019b7bbdc..e6f5b544724 100644
--- a/www/liferea/distinfo
+++ b/www/liferea/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.46 2008/01/16 19:53:24 smb Exp $
+$NetBSD: distinfo,v 1.47 2008/02/03 11:14:27 drochner Exp $
 
-SHA1 (liferea-1.4.10.tar.gz) = 7293e6872149308d0fbfdad57c3aae8ec20b6b63
-RMD160 (liferea-1.4.10.tar.gz) = af7656ef9e89850c5e5b2fcee4b9e1d5312ffaf5
-Size (liferea-1.4.10.tar.gz) = 1609333 bytes
-SHA1 (patch-ae) = 546eb57a0e98d511c53da66483180efb0e25a8cb
-SHA1 (patch-af) = fa8d4ec8b23a73890a9f1c62387c775e44bb7878
+SHA1 (liferea-1.4.12.tar.gz) = fcc1c49e657113e81005aeb725f0d8069882ac2e
+RMD160 (liferea-1.4.12.tar.gz) = 893242d162837da70bb46e11140cbe14c2299025
+Size (liferea-1.4.12.tar.gz) = 1610494 bytes
+SHA1 (patch-ae) = 91c32840150a33d2162301c17bd5c35edc6264ba
diff --git a/www/liferea/patches/patch-ae b/www/liferea/patches/patch-ae
index 8564628f26c..df0c97724a9 100644
--- a/www/liferea/patches/patch-ae
+++ b/www/liferea/patches/patch-ae
@@ -1,35 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2008/01/16 19:53:24 smb Exp $
+$NetBSD: patch-ae,v 1.4 2008/02/03 11:14:27 drochner Exp $
 
---- src/common.c.orig	2007-10-21 14:30:46.000000000 -0400
-+++ src/common.c	2008-01-09 15:58:30.000000000 -0500
-@@ -37,7 +37,7 @@
- #  include <config.h>
- #endif
- 
--#define _XOPEN_SOURCE /* glibc2 needs this (man strptime) */
-+#define _XOPEN_SOURCE	600 /* Set according to Opengroup standards */
- 
- #include <libxml/uri.h>
- 
-@@ -196,7 +196,7 @@
- 
- /* converts a ISO 8601 time string to a time_t value */
- time_t parseISO8601Date(gchar *date) {
--	struct tm	tm;
-+	struct tm	tm, t2buf;
- 	time_t		t, t2, offset = 0;
- 	gboolean	success = FALSE;
- 	gchar *pos;
-@@ -252,7 +252,7 @@
- 		if((time_t)(-1) != (t = mktime(&tm))) {
- 			/* Correct for the local timezone*/
- 			t = t - offset;
--			t2 = mktime(gmtime(&t));
-+			t2 = mktime(gmtime_r(&t, &t2buf));
- 			t = t - (t2 - t);
- 			
- 			return t;
-@@ -270,9 +270,9 @@
+--- src/common.c.orig	2008-01-13 02:07:10.000000000 +0100
++++ src/common.c
+@@ -273,9 +273,9 @@ gchar *dayofweek[] = { "Sun", "Mon", "Tu
  gchar *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
  
  gchar *createRFC822Date(const time_t *time) {
@@ -41,7 +14,7 @@ $NetBSD: patch-ae,v 1.3 2008/01/16 19:53:24 smb Exp $
  	return g_strdup_printf("%s, %2d %s %4d %02d:%02d:%02d GMT", dayofweek[tm->tm_wday], tm->tm_mday,
  					   months[tm->tm_mon], 1900 + tm->tm_year, tm->tm_hour, tm->tm_min, tm->tm_sec);
  }
-@@ -322,7 +322,7 @@
+@@ -325,7 +325,7 @@ static time_t common_parse_rfc822_tz(cha
  
  /* converts a RFC822 time string to a time_t value */
  time_t parseRFC822Date(gchar *date) {
@@ -50,7 +23,7 @@ $NetBSD: patch-ae,v 1.3 2008/01/16 19:53:24 smb Exp $
  	time_t		t, t2;
  	char 		*oldlocale;
  	char		*pos;
-@@ -370,7 +370,7 @@
+@@ -373,7 +373,7 @@ time_t parseRFC822Date(gchar *date) {
  			   correction. (Usually, there is no daylight savings
  			   time since the input is GMT.) */
  			t = t - common_parse_rfc822_tz(pos);
diff --git a/www/liferea/patches/patch-af b/www/liferea/patches/patch-af
deleted file mode 100644
index 1118cd71f81..00000000000
--- a/www/liferea/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2008/01/16 19:53:24 smb Exp $
-
---- src/parsers/ns_dc.c.orig	2008-01-09 16:01:28.000000000 -0500
-+++ src/parsers/ns_dc.c	2008-01-09 16:02:11.000000000 -0500
-@@ -23,7 +23,7 @@
- #  include <config.h>
- #endif
- 
--#define _XOPEN_SOURCE 	/* glibc2 needs this (man strptime) */
-+#define _XOPEN_SOURCE	600 /* Set according to Opengroup standards */
- 
- #include "ns_dc.h"
- #include "conf.h"