Hello community, here is the log from the commit of package libgsf checked in at Wed Aug 13 23:56:10 CEST 2008. -------- --- libgsf/libgsf.changes 2008-05-11 12:16:13.000000000 +0200 +++ libgsf/libgsf.changes 2008-07-29 03:27:06.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 28 20:06:00 EDT 2008 - hfiguiere@suse.de + +- add libgsf-fate303676.patch to implement MS Office Open XML + thumbnailing (FATE#303676) + +------------------------------------------------------------------- New: ---- libgsf-fate303676.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsf.spec ++++++ --- /var/tmp/diff_new_pack.Z16798/_old 2008-08-13 23:52:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Z16798/_new 2008-08-13 23:52:51.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package libgsf (Version 1.14.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -31,11 +38,13 @@ %endif %endif Version: 1.14.8 -Release: 19 +Release: 53 Summary: GNOME Structured File Library Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 +# PATCH-FEATURE-OPENSUSE libgsf-fate303676.patch fate303676 bgo545233 - hfiguiere@novell.com +Patch0: %{name}-fate303676.patch AutoReqProv: on Requires: libgsf-1-114 %gconf_schemas_prereq @@ -132,6 +141,7 @@ %prep #' %setup -q +%patch0 -p1 %build autoreconf -f -i @@ -206,6 +216,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Jul 28 2008 hfiguiere@suse.de +- add libgsf-fate303676.patch to implement MS Office Open XML + thumbnailing (FATE#303676) * Sun May 11 2008 coolo@suse.de - fix rename of xxbit packages * Thu Apr 10 2008 ro@suse.de @@ -221,14 +234,14 @@ * Enhance gsf (the program) to list all document properites * Fix endless loop with broken ole files (bgo#513831) * Fix memory allocation problem due to broken ole files -* Tue Feb 19 2008 maw@suse.de +* Mon Feb 18 2008 maw@suse.de - Update to version 1.14.7: + Add some safety checks for out of memory conditions + Some extensions to simplifiy OOX export + Improved docs. -* Sat Nov 17 2007 dmueller@suse.de +* Fri Nov 16 2007 dmueller@suse.de - break dependency loop by removing unneeded requires -* Thu Oct 04 2007 maw@suse.de +* Wed Oct 03 2007 maw@suse.de - Split out a libgsf-1-114 subpackage. * Fri Aug 03 2007 jpr@suse.de - Update to 1.14.5 @@ -262,7 +275,7 @@ - Fixed old soname support for released products. * Sun Oct 15 2006 danw@suse.de - Remove upstreamed patches -* Wed Oct 04 2006 jhargadon@suse.de +* Tue Oct 03 2006 jhargadon@suse.de - update to version 1.14.2 - Fix export of msole2 double(r8) properties - removed upstreamed patches @@ -270,7 +283,7 @@ - Improve ms-ole property sanity checking - Initial variant of a gsf based tar like utility - many bug fixes -* Fri Jun 09 2006 jody@suse.de +* 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 @@ -303,7 +316,7 @@ - Updated to version 1.13.3. * Thu Nov 03 2005 sbrabec@suse.cz - Updated to version 1.13.2. -* Tue Nov 01 2005 federico@novell.com +* Mon Oct 31 2005 federico@novell.com - Added libgsf-thumbnail-support.diff, backported from CVS HEAD. This makes libgsf support the VT_CF summary property in OLE files, used to store file thumbnails. It also adds a gsf-office-thumbnailer program that plugs into the GNOME thumbnailing infrastructure. @@ -321,25 +334,25 @@ than 6.8 Meg in transation mode * Fri May 07 2004 clahey@suse.de - Updated to version 1.9.0. -* Wed Apr 28 2004 ro@suse.de +* Tue Apr 27 2004 ro@suse.de - add -fno-strict-aliasing * Sun Jan 11 2004 adrian@suse.de - add %%defattr and %%run_ldconfig * Tue Oct 07 2003 sbrabec@suse.cz - Updated to version 1.8.2. -* Thu Jul 24 2003 hhetter@suse.de +* Wed Jul 23 2003 hhetter@suse.de - fix documentation packaging - use gnome-filesystem * Mon Jul 14 2003 sbrabec@suse.cz - GNOME prefix change to /opt/gnome. -* Tue Jul 01 2003 ro@suse.de +* Mon Jun 30 2003 ro@suse.de - move documentation to /usr/share/gtk-doc * Mon Jun 09 2003 sbrabec@suse.cz - Updated to version 1.8.1. * Wed Jun 04 2003 sbrabec@suse.cz - Updated to version 1.8.0. - Use gnome2-devel-packages in neededforbuild. -* Mon Jun 02 2003 ro@suse.de +* Sun Jun 01 2003 ro@suse.de - added doc filelist to specfile * Sun Apr 27 2003 adrian@suse.de - put libgsf-gnome into new sub package libgsf-gnome ++++++ libgsf-fate303676.patch ++++++ diff --git a/ChangeLog b/ChangeLog index 5819e59..ef9997f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-28 Hubert Figuiere <hfiguiere@novell.com> + + * thumbnailer/gsf-office-thumbnailer.schemas.in: + * thumbnailer/main.c (zip_thumbnail): Add support for OpenPkg + (MS Office Open XML) thumbnailing. + 2007-11-10 Morten Welinder <terra@gnome.org> * gsf/gsf-msole-utils.c (msole_debug): New function. diff --git a/thumbnailer/gsf-office-thumbnailer.schemas.in b/thumbnailer/gsf-office-thumbnailer.schemas.in index 7122daa..aacd9e1 100644 --- a/thumbnailer/gsf-office-thumbnailer.schemas.in +++ b/thumbnailer/gsf-office-thumbnailer.schemas.in @@ -24,6 +24,29 @@ <long>Valid command plus arguments for the Microsoft PowerPoint thumbnailer</long> </locale> </schema> +<!-- XML MS Powerpoint 2007 --> + <schema> + <key>/schemas/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.presentationml.presentation/enable</key> + <applyto>/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.presentationml.presentation/enable</applyto> + <owner>libgsf</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Enable thumbnailing of Microsoft PowerPoint 2007 presentations</short> + <long>Boolean options available, true enables thumbnailing and false disables the creation of new thumbnails</long> + </locale> + </schema> + <schema> + <key>/schemas/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.presentationml.presentation/command</key> + <applyto>/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.presentationml.presentation/command</applyto> + <owner>libgsf</owner> + <type>string</type> + <default>gsf-office-thumbnailer -i %i -o %o -s %s</default> + <locale name="C"> + <short>Thumbnail command for Microsoft PowerPoint 2007 presentations</short> + <long>Valid command plus arguments for the Microsoft PowerPoint 2007 thumbnailer</long> + </locale> + </schema> <!-- MS Excel --> <schema> <key>/schemas/desktop/gnome/thumbnailers/application@vnd.ms-excel/enable</key> @@ -47,6 +70,29 @@ <long>Valid command plus arguments for the Microsoft Excel spreadsheets.</long> </locale> </schema> +<!-- XML MS Excel 2007 --> + <schema> + <key>/schemas/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.spreadsheetml.sheet/enable</key> + <applyto>/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.spreadsheetml.sheet/enable</applyto> + <owner>libgsf</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Enable thumbnailing of Microsoft Excel 2007 spreadsheets</short> + <long>Boolean options available, true enables thumbnailing and false disables the creation of new thumbnails</long> + </locale> + </schema> + <schema> + <key>/schemas/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.spreadsheetml.sheet/command</key> + <applyto>/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.spreadsheetml.sheet/command</applyto> + <owner>libgsf</owner> + <type>string</type> + <default>gsf-office-thumbnailer -i %i -o %o -s %s</default> + <locale name="C"> + <short>Thumbnail command for Microsoft Excel 2007 spreadsheets</short> + <long>Valid command plus arguments for the Microsoft Excel 2007 spreadsheets.</long> + </locale> + </schema> <!-- MS Word --> <schema> <key>/schemas/desktop/gnome/thumbnailers/application@msword/enable</key> @@ -70,6 +116,29 @@ <long>Valid command plus arguments for the Microsoft Word thumbnailer</long> </locale> </schema> +<!-- XML MS Word 2007 --> + <schema> + <key>/schemas/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.wordprocessingml.document/enable</key> + <applyto>/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.wordprocessingml.document/enable</applyto> + <owner>libgsf</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Enable thumbnailing of Microsoft Word 2007 documents</short> + <long>Boolean options available, true enables thumbnailing and false disables the creation of new thumbnails</long> + </locale> + </schema> + <schema> + <key>/schemas/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.wordprocessingml.document/command</key> + <applyto>/desktop/gnome/thumbnailers/application@vnd.openxmlformats-officedocument.wordprocessingml.document/command</applyto> + <owner>libgsf</owner> + <type>string</type> + <default>gsf-office-thumbnailer -i %i -o %o -s %s</default> + <locale name="C"> + <short>Thumbnail command for Microsoft Word 2007 documents</short> + <long>Valid command plus arguments for the Microsoft Word 2007 thumbnailer</long> + </locale> + </schema> <!-- From http://framework.openoffice.org/documentation/mimetypes/mimetypes.html --> <!-- OpenDoc Presentation Templates --> <schema> diff --git a/thumbnailer/main.c b/thumbnailer/main.c index b2a3c7e..4d2e739 100644 --- a/thumbnailer/main.c +++ b/thumbnailer/main.c @@ -28,6 +28,7 @@ #include <gsf/gsf-msole-utils.h> #include <gsf/gsf-utils.h> #include <gsf/gsf-clip-data.h> +#include <gsf/gsf-open-pkg-utils.h> #include <stdlib.h> #include <unistd.h> #include <glib.h> @@ -116,6 +117,7 @@ static void zip_thumbnail (GsfInfile *infile, const char *out_filename, int thumb_size) { GsfInput *thumbnail; + GsfInput *rels; /* Office Document thumbnail */ if (NULL != (thumbnail = gsf_infile_child_by_vname (infile, @@ -125,6 +127,18 @@ zip_thumbnail (GsfInfile *infile, const char *out_filename, int thumb_size) write_thumbnail (out_filename, data, len, thumb_size); g_object_unref (thumbnail); /* Check MS Office Open thumbnail */ + } else if (NULL != (rels = gsf_infile_child_by_vname (infile, + "_rels", ".rels", NULL))) { + g_object_unref (rels); + thumbnail = gsf_open_pkg_open_rel_by_type (GSF_INPUT(infile), + "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbn...", + NULL); + if (NULL != thumbnail) { + gsf_off_t len = gsf_input_remaining (thumbnail); + guint8 const *data = gsf_input_read (thumbnail, len, NULL); + write_thumbnail (out_filename, data, len, thumb_size); + g_object_unref (thumbnail); + } } else show_error_string_and_exit ("Could not find thumbnail in zip file"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org