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

drop integrated libwpd-gcc4.6.0.patch

Browse Source
This commit is contained in:
Caolán McNamara 2011-05-22 17:15:17 +01:00
parent 16b464cc3d
commit 150acd3710
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libwpd-gcc4.6.0.patch
View File

@ -1,39 +0,0 @@
diff -ru libwpd-0.9.1.orig/src/lib/WP5GraphicsInformationPacket.h libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h
--- libwpd-0.9.1.orig/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 15:28:41.076826132 +0000
+++ libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 15:29:03.844815512 +0000
@@ -37,7 +37,7 @@
~WP5GraphicsInformationPacket();
void _readContents(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataSize);
const std::vector<WPXBinaryData *> &getImages() const { return m_images; }
- const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; }
+ const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return 0; }
private:
std::vector<WPXBinaryData *> m_images;
diff -ru libwpd-0.9.1.orig/src/lib/WPXOLEStream.cpp libwpd-0.9.1/src/lib/WPXOLEStream.cpp
--- libwpd-0.9.1.orig/src/lib/WPXOLEStream.cpp 2011-01-24 15:28:41.072826662 +0000
+++ libwpd-0.9.1/src/lib/WPXOLEStream.cpp 2011-01-24 15:31:05.093831190 +0000
@@ -599,9 +599,6 @@
{
unsigned p = i * 128;
- // would be < 32 if first char in the name isn't printable
- unsigned prefix = 32;
-
// parse name of this entry, which stored as Unicode 16-bit
std::string name;
int name_len = readU16( buffer + 0x40+p );
@@ -609,12 +606,10 @@
for( int j=0; ( buffer[j+p]) && (j<name_len); j+= 2 )
name.append( 1, buffer[j+p] );
+ // would be < 32 if first char in the name isn't printable
// first char isn't printable ? remove it...
if( buffer[p] < 32 )
- {
- prefix = buffer[0];
name.erase( 0,1 );
- }
// 2 = file (aka stream), 1 = directory (aka storage), 5 = root
unsigned type = buffer[ 0x42 + p];

3
libwpd.spec
View File

@ -8,7 +8,6 @@ URL: http://libwpd.sf.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+ License: LGPLv2+
BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0, cppunit-devel BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0, cppunit-devel
Patch0: libwpd-gcc4.6.0.patch
%description %description
Library that handles Word Perfect documents. Library that handles Word Perfect documents.
@ -32,7 +31,6 @@ Includes and definitions for developing with libwpd.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .gcc4.6.0
%build %build
%configure --without-docs --disable-static %configure --without-docs --disable-static
@ -73,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sun May 22 2011 Caolán McNamara <caolanm@redhat.com> - 0.9.2-1 * Sun May 22 2011 Caolán McNamara <caolanm@redhat.com> - 0.9.2-1
- latest version - latest version
- drop integrated libwpd-gcc4.6.0.patch
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-2 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild