rpms/libgsf
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: gnome#689706 fix gsf_input_dup

Browse Source
This commit is contained in:
Caolán McNamara 2013-02-22 20:17:47 +00:00
parent 10f4c12bf0
commit 617249d261
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome689706.gsf_input_dup.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/gsf/gsf-infile-msole.c b/gsf/gsf-infile-msole.c
index 41134c8..a368a77 100644
--- a/gsf/gsf-infile-msole.c
+++ b/gsf/gsf-infile-msole.c
@@ -642,20 +642,9 @@ static GsfInput *
gsf_infile_msole_dup (GsfInput *src_input, GError **err)
{
GsfInfileMSOle const *src = GSF_INFILE_MSOLE (src_input);
- GsfInfileMSOle *dst = ole_dup (src, err);
+ GsfInfileMSOle *parent = GSF_INFILE_MSOLE (gsf_input_container (src_input));
- if (dst == NULL)
- return NULL;
-
- if (src->bat.block != NULL) {
- dst->bat.block = g_new (guint32, src->bat.num_blocks),
- memcpy (dst->bat.block, src->bat.block,
- sizeof (guint32) * src->bat.num_blocks);
- }
- dst->bat.num_blocks = src->bat.num_blocks;
- dst->dirent = src->dirent;
-
- return GSF_INPUT (dst);
+ return gsf_infile_msole_new_child(parent, src->dirent, err);
}
static guint8 const *

8
libgsf.spec
View File

@ -8,7 +8,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Summary: GNOME Structured File library
Name: libgsf
Version: 1.14.25
Release: 1%{?dist}
Release: 2%{?dist}
Group: System Environment/Libraries
License: LGPLv2
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.xz
@ -19,6 +19,8 @@ BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext
BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel
Obsoletes: libgsf-gnome < 1.14.22
Patch0: gnome689706.gsf_input_dup.patch
%description
A library for reading and writing structured files (e.g. MS OLE and Zip)
@ -42,6 +44,7 @@ Python bindings for libgsf
%prep
%setup -q
%patch0 -p1 -b .gnome689706
%build
%configure --disable-gtk-doc --disable-static --with-python
@ -95,6 +98,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Feb 22 2013 Caolán McNamara <caolanm@redhat.com> 1.14.25-2
- Resolves: gnome#689706 fix gsf_input_dup
* Thu Jan 31 2013 Caolán McNamara <caolanm@redhat.com> 1.14.25-1
- latest version