update to 1.14.1

changes:
-Enable the ODF support in the thumbnailer's schema.
-some bugfixes

also register the schema file with gconf so that thumbnails for
office/odf are actually created

4 files changed, 11 insertions, 25 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 12a45fde1d8..ddb229d8082 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/05/17 17:21:41 drochner Exp $
 #
 
-DISTNAME=	libgsf-1.14.0
-PKGREVISION=	1
+DISTNAME=	libgsf-1.14.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,6 +21,8 @@ PKGCONFIG_OVERRIDE+=	libgsf-gnome-1.pc.in
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/libgsf
 
+GCONF2_SCHEMAS=		gsf-office-thumbnailer.schemas
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
diff --git a/devel/libgsf/PLIST b/devel/libgsf/PLIST
index c58c2cb10d7..8785cab8453 100644
--- a/devel/libgsf/PLIST
+++ b/devel/libgsf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/05/17 17:21:41 drochner Exp $
 bin/gsf-office-thumbnailer
 include/libgsf-1/gsf-gnome/gsf-input-bonobo.h
 include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h
@@ -54,7 +54,6 @@ lib/libgsf-gnome-1.la
 lib/pkgconfig/libgsf-1.pc
 lib/pkgconfig/libgsf-gnome-1.pc
 man/man1/gsf-office-thumbnailer.1
-share/doc/libgsf/gsf/GsfBlob.html
 share/doc/libgsf/gsf/GsfClipData.html
 share/doc/libgsf/gsf/api.html
 share/doc/libgsf/gsf/dependencies.html
@@ -65,14 +64,14 @@ share/doc/libgsf/gsf/gsf-GnomeVFS.html
 share/doc/libgsf/gsf/gsf-Infile-reading-structed-files.html
 share/doc/libgsf/gsf/gsf-Input-from-unstructured-files.html
 share/doc/libgsf/gsf/gsf-MS-OLE2.html
+share/doc/libgsf/gsf/gsf-OASIS-Open-Document.html
 share/doc/libgsf/gsf/gsf-Outfile-writing-structed-files.html
 share/doc/libgsf/gsf/gsf-Output-to-unstructured-files.html
 share/doc/libgsf/gsf/gsf-Reading-and-Writing-from-local-files-and-directories.html
-share/doc/libgsf/gsf/gsf-Structured-Blobs.html
 share/doc/libgsf/gsf/gsf-Text.html
 share/doc/libgsf/gsf/gsf-XML-and-libxml.html
 share/doc/libgsf/gsf/gsf-Zip.html
-share/doc/libgsf/gsf/gsf-gsf-opendoc-utils.html
+share/doc/libgsf/gsf/gsf-blobs.html
 share/doc/libgsf/gsf/gsf-memory.html
 share/doc/libgsf/gsf/gsf-metadata.html
 share/doc/libgsf/gsf/gsf-users.html
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 0118bdad93d..feeed16b420 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2006/03/03 22:22:20 wiz Exp $
+$NetBSD: distinfo,v 1.16 2006/05/17 17:21:41 drochner Exp $
 
-SHA1 (libgsf-1.14.0.tar.bz2) = 89ab34725cf00f1380f204415ec547b19225c674
-RMD160 (libgsf-1.14.0.tar.bz2) = 184210ca19ecd473c00c6cf84d89b972fdddb1c2
-Size (libgsf-1.14.0.tar.bz2) = 525532 bytes
-SHA1 (patch-ab) = 66c5be022d1796ceb55db58c05b1c76b5f929d88
+SHA1 (libgsf-1.14.1.tar.bz2) = 6e719212a1756b449f93548d6357c6b4cf07c327
+RMD160 (libgsf-1.14.1.tar.bz2) = 9fa50d6df9edd2f102b8859eef18944b4de5f476
+Size (libgsf-1.14.1.tar.bz2) = 530415 bytes
diff --git a/devel/libgsf/patches/patch-ab b/devel/libgsf/patches/patch-ab
deleted file mode 100644
index 46120ab00bc..00000000000
--- a/devel/libgsf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2006/03/03 22:22:20 wiz Exp $
-
---- doc/Makefile.in.orig	2006-03-02 05:06:25.000000000 +0000
-+++ doc/Makefile.in
-@@ -307,7 +307,7 @@ extra_files = 
- # if $(DOC_MODULE).types is non-empty.
- GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS)
- GTKDOC_LIBS = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
--manpagedir = $(datadir)/man/man1
-+manpagedir = $(mandir)/man1
- manpage_DATA = gsf-office-thumbnailer.1
- @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_INSTALLED_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)