Accepting request 66936 from devel:libraries:c_c++

Accepted submit request 66936 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/66936
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libwpd?expand=0&rev=17
This commit is contained in:
Ruediger Oertel
2011-04-21 11:39:16 +00:00
committed by Git OBS Bridge
3 changed files with 38 additions and 0 deletions

30
gcc46.patch Normal file
View File

@@ -0,0 +1,30 @@
--- src/lib/WP5GraphicsInformationPacket.h 2010-08-26 13:35:21.000000000 +0200
+++ src/lib/WP5GraphicsInformationPacket.h 2011-03-16 10:25:18.918009010 +0100
@@ -28,6 +28,7 @@
#include "WP5GeneralPacketData.h"
#include "WPXMemoryStream.h"
#include "WPXBinaryData.h"
+#include <cstddef>
#include <vector>
class WP5GraphicsInformationPacket : public WP5GeneralPacketData
--- src/lib/WPXOLEStream.cpp 2010-08-26 13:35:21.000000000 +0200
+++ src/lib/WPXOLEStream.cpp 2011-03-16 10:31:09.626009026 +0100
@@ -600,7 +600,7 @@
unsigned p = i * 128;
// would be < 32 if first char in the name isn't printable
- unsigned prefix = 32;
+ // unsigned prefix = 32;
// parse name of this entry, which stored as Unicode 16-bit
std::string name;
@@ -612,7 +612,7 @@
// first char isn't printable ? remove it...
if( buffer[p] < 32 )
{
- prefix = buffer[0];
+ //prefix = buffer[0];
name.erase( 0,1 );
}

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 16 09:32:59 UTC 2011 - ismail@namtrac.org
- Add missing includes to fix compilation with gcc 4.6
-------------------------------------------------------------------
Tue Dec 7 14:39:57 CET 2010 - fstrba@novell.com

View File

@@ -28,6 +28,8 @@ Version: 0.9.0
Release: 1
Summary: Library for Importing WordPerfect (tm) Documents
Source: libwpd-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gcc46.patch -- Add missing includes to fix compilation with gcc 4.6
Patch: gcc46.patch
Url: http://libwpd.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libwpd-0_9-9 = %{version}-%{release}
@@ -126,6 +128,7 @@ Authors:
%prep
%setup -q
%patch
%build
%configure --disable-static --docdir=%_docdir/%name