From 150acd3710ebf1a850e49dee55596e3396deac86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sun, 22 May 2011 17:15:17 +0100
Subject: [PATCH] drop integrated libwpd-gcc4.6.0.patch

---
 libwpd-gcc4.6.0.patch | 39 ---------------------------------------
 libwpd.spec           |  3 +--
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 libwpd-gcc4.6.0.patch

diff --git a/libwpd-gcc4.6.0.patch b/libwpd-gcc4.6.0.patch
deleted file mode 100644
index b704e96..0000000
--- a/libwpd-gcc4.6.0.patch
+++ /dev/null
@@ -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];
diff --git a/libwpd.spec b/libwpd.spec
index a571e2f..04d2854 100644
--- a/libwpd.spec
+++ b/libwpd.spec
@@ -8,7 +8,6 @@ URL: http://libwpd.sf.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: LGPLv2+
 BuildRequires: glib2-devel >= 2.0.0, libgsf-devel >= 1.6.0, cppunit-devel
-Patch0: libwpd-gcc4.6.0.patch
 
 %description
 Library that handles Word Perfect documents.
@@ -32,7 +31,6 @@ Includes and definitions for developing with libwpd.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4.6.0
 
 %build
 %configure --without-docs --disable-static
@@ -73,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun May 22 2011 Caolán McNamara <caolanm@redhat.com> - 0.9.2-1
 - 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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild