commit libgsf

Hello community, here is the log from the commit of package libgsf checked in at Fri Jun 9 02:21:59 CEST 2006. -------- --- libgsf/libgsf.changes 2006-03-03 20:45:51.000000000 +0100 +++ libgsf/libgsf.changes 2006-06-08 22:42:22.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 8 22:41:28 CEST 2006 - jody@suse.de + +- Add more mime types for OOo 1.0 thumbnailing +- enable the vba dump utility to facilitate bug reports +- back port some of the fixes in 1.14.1 + +------------------------------------------------------------------- Old: ---- libgsf-oometa-data.patch New: ---- libgsf-1.14.1.fixes.patch libgsf-vba-dump.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsf.spec ++++++ --- /var/tmp/diff_new_pack.HNderD/_old 2006-06-09 02:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.HNderD/_new 2006-06-09 02:21:45.000000000 +0200 @@ -21,14 +21,15 @@ %endif Autoreqprov: on Version: 1.13.99 -Release: 2 +Release: 13 Summary: GNOME Structured File Library URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libgsf-%{version}.tar.bz2 -Patch0: libgsf-opendoc-thumbnail-schema.patch -Patch1: libgsf-transparent-thumbnails.patch -Patch2: libgsf-oometa-data.patch +Patch0: libgsf-1.14.1.fixes.patch +Patch1: libgsf-opendoc-thumbnail-schema.patch +Patch2: libgsf-transparent-thumbnails.patch +Patch3: libgsf-vba-dump.patch PreReq: filesystem %description @@ -99,6 +100,7 @@ %patch0 %patch1 %patch2 +%patch3 %build glib-gettextize --force --copy @@ -121,7 +123,7 @@ make -i install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %find_lang %{name} -gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man1/*.* +gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*.* %if %is_plus mkdir -p $RPM_BUILD_ROOT/usr/%_lib ln -s /opt/gnome/%_lib/libgsf-1.so.113 $RPM_BUILD_ROOT/usr/%_lib/libgsf-1.so.1 @@ -152,10 +154,11 @@ %if %is_plus /usr/%_lib/libgsf-1.so.1 %endif +%{prefix}/bin/gsf-vba-dump # NOTE: gsf-office-thumbnailer does not require GNOME, place it here. # Registration of thumbnailer to GNOME requires it, place it to libgsf-gnome. %{prefix}/bin/gsf-office-thumbnailer -%doc %{prefix}/share/man/man1/*.* +%doc %{_mandir}/man1/*.* %files devel %defattr(-, root, root) @@ -173,6 +176,10 @@ %endif %changelog -n libgsf +* Thu Jun 08 2006 - jody@suse.de +- Add more mime types for OOo 1.0 thumbnailing +- enable the vba dump utility to facilitate bug reports +- back port some of the fixes in 1.14.1 * Fri Mar 03 2006 - jpr@suse.de - Ensure no transparent backgrounds - Tweak OO meta data ++++++ libgsf-1.14.1.fixes.patch ++++++ ++++ 1094 lines (skipped) ++++++ libgsf-opendoc-thumbnail-schema.patch ++++++ ++++ 792 lines (skipped) ++++ between libgsf/libgsf-opendoc-thumbnail-schema.patch ++++ and libgsf/libgsf-opendoc-thumbnail-schema.patch ++++++ libgsf-transparent-thumbnails.patch ++++++ --- /var/tmp/diff_new_pack.HNderD/_old 2006-06-09 02:21:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HNderD/_new 2006-06-09 02:21:46.000000000 +0200 @@ -1,11 +1,51 @@ +Index: configure.in +=================================================================== +RCS file: /cvs/gnome/libgsf/configure.in,v +retrieving revision 1.120 +retrieving revision 1.124 +diff -u -w -p -r1.120 -r1.124 +--- configure.in 2 Mar 2006 14:36:16 -0000 1.120 ++++ configure.in 25 May 2006 19:05:42 -0000 1.124 +@@ -205,6 +210,7 @@ esac + AC_MSG_RESULT($with_win32) + AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes) + AM_CONDITIONAL(HAVE_LIBEXE, test x$LIBEXE = xyes) ++AM_CONDITIONAL(CROSS_COMPILING, test x"$cross_compiling" != "xno") + + ################################################## + # Checks for gtk-doc and docbook-tools +Index: thumbnailer/Makefile.am +=================================================================== +RCS file: /cvs/gnome/libgsf/thumbnailer/Makefile.am,v +retrieving revision 1.3 +retrieving revision 1.4 +diff -u -w -p -r1.3 -r1.4 +--- thumbnailer/Makefile.am 16 Nov 2005 22:15:38 -0000 1.3 ++++ thumbnailer/Makefile.am 5 Mar 2006 16:49:44 -0000 1.4 +@@ -18,6 +18,7 @@ schemadir = $(GCONF_SCHEMA_FILE_DIR) + install-data-local: + if GCONF_SCHEMAS_INSTALL + if WITH_WIN32 ++if !CROSS_COMPILING + if test -z "$(DESTDIR)"; then \ + for p in $(schema_DATA); do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ +@@ -25,6 +26,7 @@ if WITH_WIN32 + cmd /c _temp.bat; \ + done \ + fi ++endif + else + if test -z "$(DESTDIR)"; then \ + for p in $(schema_DATA); do \ Index: thumbnailer/main.c =================================================================== RCS file: /cvs/gnome/libgsf/thumbnailer/main.c,v retrieving revision 1.6 -retrieving revision 1.7 -diff -u -w -p -r1.6 -r1.7 +retrieving revision 1.8 +diff -u -w -p -r1.6 -r1.8 --- thumbnailer/main.c 26 Feb 2006 05:24:05 -0000 1.6 -+++ thumbnailer/main.c 3 Mar 2006 14:45:27 -0000 1.7 ++++ thumbnailer/main.c 3 Mar 2006 17:13:12 -0000 1.8 @@ -60,9 +60,9 @@ call_convert (const char *in_filename, c in_quote = g_shell_quote (in_filename); ++++++ libgsf-vba-dump.patch ++++++ Index: configure.in =================================================================== RCS file: /cvs/gnome/libgsf/configure.in,v retrieving revision 1.120 retrieving revision 1.124 diff -u -w -p -r1.120 -r1.124 --- configure.in 2 Mar 2006 14:36:16 -0000 1.120 +++ configure.in 25 May 2006 19:05:42 -0000 1.124 @@ -372,6 +378,7 @@ gsf/Makefile gsf-gnome/Makefile gsf-win32/Makefile tests/Makefile +tools/Makefile python/Makefile thumbnailer/Makefile po/Makefile.in Index: Makefile.am =================================================================== RCS file: /cvs/gnome/libgsf/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -p -r1.17 -r1.18 --- Makefile.am 7 Nov 2005 16:26:47 -0000 1.17 +++ Makefile.am 25 May 2006 19:05:42 -0000 1.18 @@ -8,7 +8,7 @@ if WITH_WIN32 pkgconfig_DATA += libgsf-win32-1.pc endif -SUBDIRS = po gsf gsf-gnome gsf-win32 doc tests +SUBDIRS = po gsf gsf-gnome gsf-win32 doc tools tests if WITH_PYTHON SUBDIRS += python Index: tools/.cvsignore =================================================================== RCS file: tools/.cvsignore diff -N tools/.cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/.cvsignore 25 May 2006 19:05:44 -0000 1.1 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +gsf-vba-dump Index: tools/Makefile.am =================================================================== RCS file: tools/Makefile.am diff -N tools/Makefile.am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/Makefile.am 25 May 2006 19:05:44 -0000 1.1 @@ -0,0 +1,6 @@ +AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(Z_CPPFLAGS) \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" +LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) + +bin_PROGRAMS = gsf-vba-dump +gsf_vba_dump_SOURCES = gsf-vba-dump.c Index: tools/gsf-vba-dump.c =================================================================== RCS file: tools/gsf-vba-dump.c diff -N tools/gsf-vba-dump.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tools/gsf-vba-dump.c 8 Aug 2005 08:34:20 -0000 1.10 @@ -0,0 +1,86 @@ +/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * test-msvba.c: + * + * Copyright (C) 2002-2003 Jody Goldberg (jody@gnome.org) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2.1 of the GNU Lesser General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA + */ + +#include +#include +#include +#include +#include +#include + +#include + +static int +test (int argc, char *argv[]) +{ + GsfInfile *vba_wrapper; + GsfInput *input; + GError *err = NULL; + int i; + + for (i = 1 ; i < argc ; i++) { + input = gsf_input_mmap_new (argv[i], NULL); + if (input == NULL) /* Only report error if stdio fails too */ + input = gsf_input_stdio_new (argv[i], &err); + if (input != NULL) { + GsfInfile *infile = gsf_infile_msole_new (input, &err); + if (infile != NULL) { + GsfInput *vba = gsf_infile_child_by_vname (infile, "_VBA_PROJECT_CUR", "VBA", NULL); + if (vba != NULL) { + fprintf( stderr, "%s\n",argv[i]); + + vba_wrapper = gsf_infile_msvba_new (GSF_INFILE (vba), &err); + if (vba_wrapper != NULL) { + g_object_unref (G_OBJECT (vba_wrapper)); + } + g_object_unref (G_OBJECT (vba)); + } else { +#if 0 + g_warning ("'%s' : No VBA directory", argv[i]); +#endif + continue; + } + + g_object_unref (G_OBJECT (infile)); + } + g_object_unref (G_OBJECT (input)); + } + + if (err != NULL) { + g_warning ("'%s' error: %s", argv[i], err->message); + g_error_free (err); + } + } + + return 0; +} + +int +main (int argc, char *argv[]) +{ + int res; + + gsf_init (); + res = test (argc, argv); + gsf_shutdown (); + + return res; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org