From 56b672d90958ac83ab3646e189080810548f589a Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 20 Jan 2012 12:05:09 +0000 Subject: [PATCH] Update to 1.14.22: libgsf 1.14.22 Damien Lespiau: * Fix thumbnailer manual install problem. Morten: * Fix error messages on win32. * Fix resource limiting in thumbnailer. * Ensure GsfOutput::name and GsfInput::name notifications. * Cleanup old code. * Drop support for gnome-vfs and bonobo. * Fix ole2 entry sorting based on patch from Junping Zhang. [#665712] Vincent Untz: * New installation method for thumbnailer. [#651187] --- devel/libgsf/Makefile | 14 +++----------- devel/libgsf/PLIST | 10 ++++++++-- devel/libgsf/distinfo | 10 ++++------ devel/libgsf/patches/patch-aa | 18 ------------------ devel/libgsf/patches/patch-ab | 31 ------------------------------- 5 files changed, 15 insertions(+), 68 deletions(-) delete mode 100644 devel/libgsf/patches/patch-aa delete mode 100644 devel/libgsf/patches/patch-ab diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index bd8c99f69cde..638dd16baf9f 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.74 2011/06/06 07:55:54 obache Exp $ -# -# Some files are shared with libgsf-gnome, so update that -# as well when updating libgsf! +# $NetBSD: Makefile,v 1.75 2012/01/20 12:05:09 wiz Exp $ # -DISTNAME= libgsf-1.14.21 +DISTNAME= libgsf-1.14.22 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.14/} -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnome.org/ @@ -25,11 +22,6 @@ PKGCONFIG_OVERRIDE= libgsf-1.pc.in CONFIGURE_ARGS+= --without-python -# XXX workaround for missing substitution in configure -MAKE_ENV+= GCONF2_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR} - -GCONF_SCHEMAS= gsf-office-thumbnailer.schemas - .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/devel/libgsf/PLIST b/devel/libgsf/PLIST index 292907cfc228..eb8bc8969e7e 100644 --- a/devel/libgsf/PLIST +++ b/devel/libgsf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2011/05/25 09:42:24 drochner Exp $ +@comment $NetBSD: PLIST,v 1.33 2012/01/20 12:05:09 wiz Exp $ bin/gsf bin/gsf-office-thumbnailer bin/gsf-vba-dump @@ -55,7 +55,6 @@ lib/pkgconfig/libgsf-1.pc man/man1/gsf-office-thumbnailer.1 man/man1/gsf-vba-dump.1 man/man1/gsf.1 -share/gconf/schemas/gsf-office-thumbnailer.schemas share/gtk-doc/html/gsf/api.html share/gtk-doc/html/gsf/dependencies.html share/gtk-doc/html/gsf/gsf-Bononbo.html @@ -100,19 +99,26 @@ share/locale/cs/LC_MESSAGES/libgsf.mo share/locale/da/LC_MESSAGES/libgsf.mo share/locale/de/LC_MESSAGES/libgsf.mo share/locale/en_GB/LC_MESSAGES/libgsf.mo +share/locale/eo/LC_MESSAGES/libgsf.mo share/locale/es/LC_MESSAGES/libgsf.mo share/locale/eu/LC_MESSAGES/libgsf.mo share/locale/fr/LC_MESSAGES/libgsf.mo share/locale/gl/LC_MESSAGES/libgsf.mo +share/locale/id/LC_MESSAGES/libgsf.mo share/locale/it/LC_MESSAGES/libgsf.mo share/locale/nb/LC_MESSAGES/libgsf.mo +share/locale/nn/LC_MESSAGES/libgsf.mo share/locale/oc/LC_MESSAGES/libgsf.mo share/locale/pa/LC_MESSAGES/libgsf.mo share/locale/pl/LC_MESSAGES/libgsf.mo share/locale/pt/LC_MESSAGES/libgsf.mo share/locale/pt_BR/LC_MESSAGES/libgsf.mo +share/locale/ro/LC_MESSAGES/libgsf.mo +share/locale/ru/LC_MESSAGES/libgsf.mo share/locale/sl/LC_MESSAGES/libgsf.mo share/locale/sv/LC_MESSAGES/libgsf.mo +share/locale/uk/LC_MESSAGES/libgsf.mo share/locale/zh_CN/LC_MESSAGES/libgsf.mo share/locale/zh_HK/LC_MESSAGES/libgsf.mo share/locale/zh_TW/LC_MESSAGES/libgsf.mo +share/thumbnailers/gsf-office.thumbnailer diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index fa2e346a3c57..f8d69b6edd5e 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.39 2011/05/25 09:42:24 drochner Exp $ +$NetBSD: distinfo,v 1.40 2012/01/20 12:05:09 wiz Exp $ -SHA1 (libgsf-1.14.21.tar.bz2) = 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2 -RMD160 (libgsf-1.14.21.tar.bz2) = 168c0200fde9792bd8c7937d1c83f3af9c8c0193 -Size (libgsf-1.14.21.tar.bz2) = 597463 bytes -SHA1 (patch-aa) = 05b2c046b389cf81fa022b801903d66b58c2b701 -SHA1 (patch-ab) = 0687571d39e44d36cbe2ba146a31249cf8e33853 +SHA1 (libgsf-1.14.22.tar.xz) = ca1c5aa92a840e322d7cafd9f2dede3d38a69660 +RMD160 (libgsf-1.14.22.tar.xz) = a47fa284ace94ead51f2130cba31d8962d554f3b +Size (libgsf-1.14.22.tar.xz) = 506188 bytes diff --git a/devel/libgsf/patches/patch-aa b/devel/libgsf/patches/patch-aa deleted file mode 100644 index be69eb214bd2..000000000000 --- a/devel/libgsf/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2009/05/20 00:02:50 wiz Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=583290 - ---- thumbnailer/Makefile.in.orig 2007-07-10 12:34:49.000000000 +0200 -+++ thumbnailer/Makefile.in -@@ -296,8 +296,9 @@ schema_files = \ - gsf-office-thumbnailer.schemas.in - - schemas = gsf-office-thumbnailer.schemas --schemadir = $(GCONF_SCHEMA_FILE_DIR) --@GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = $(schemas) -+# XXX workaround for missing substitution in configure -+schemadir = ${GCONF2_SCHEMAS_DIR} -+schema_DATA = $(schemas) - EXTRA_DIST = \ - $(schema_files) - diff --git a/devel/libgsf/patches/patch-ab b/devel/libgsf/patches/patch-ab deleted file mode 100644 index 171eb2d36e7b..000000000000 --- a/devel/libgsf/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2009/08/02 10:52:06 drochner Exp $ - ---- gsf-gnome/Makefile.in.orig 2009-06-20 15:09:36.000000000 +0200 -+++ gsf-gnome/Makefile.in -@@ -70,7 +70,6 @@ libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \ --@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la \ - @WITH_LIBGSF_GNOME_TRUE@ $(am__DEPENDENCIES_1) - am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ - gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ -@@ -303,7 +302,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) - @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la --@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) -+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = -L$(prefix)/lib -lgsf-1 $(LIBGSF_GNOME_LIBS) - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \ - @WITH_LIBGSF_GNOME_TRUE@ $(VERSION_INFO) $(am__append_1) - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \ -@@ -560,7 +559,8 @@ info: info-am - - info-am: - --install-data-am: install-libgsf_gnome_1_includeHEADERS -+install-data-am: -+@WITH_LIBGSF_GNOME_TRUE@install-data-am: install-libgsf_gnome_1_includeHEADERS - - install-dvi: install-dvi-am -