From 4a3ecfc0ad643c710376d9565493f662d9331b60 Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Mon, 1 Aug 2011 04:05:00 +0000
Subject: Fix bug caught by clang. PKGREVISION++

---
 converters/libwpd/Makefile                                |  3 ++-
 converters/libwpd/distinfo                                |  3 ++-
 .../patches/patch-src_lib_wp6graphicsfilenamepacket_cpp   | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp

(limited to 'converters')

diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index dfa69271bf0..cb37a3a64e4 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2011/05/18 14:52:44 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2011/08/01 04:05:00 dholland Exp $
 
 DISTNAME=	libwpd-0.9.2
+PKGREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libwpd/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/converters/libwpd/distinfo b/converters/libwpd/distinfo
index 3183a4367aa..f137faa6e00 100644
--- a/converters/libwpd/distinfo
+++ b/converters/libwpd/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2011/05/18 14:52:44 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/08/01 04:05:01 dholland Exp $
 
 SHA1 (libwpd-0.9.2.tar.bz2) = 4cbf7e1534082156c4c4a1402d26cf2416649fda
 RMD160 (libwpd-0.9.2.tar.bz2) = 6509411050260fa35d2c0b7d590e7781478b65cb
 Size (libwpd-0.9.2.tar.bz2) = 614862 bytes
 SHA1 (patch-aa) = 4c91375938db1761200af1b68cacd4714a4da004
 SHA1 (patch-src_lib_WPXStreamImplementation.cpp) = 2ddb87c81990ab2edcfa958ce5e31d39f8aba588
+SHA1 (patch-src_lib_wp6graphicsfilenamepacket_cpp) = e8e52b91d5320c9ed4541b2aedfd7f4df416616e
diff --git a/converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp b/converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp
new file mode 100644
index 00000000000..4b1023f902c
--- /dev/null
+++ b/converters/libwpd/patches/patch-src_lib_wp6graphicsfilenamepacket_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_wp6graphicsfilenamepacket_cpp,v 1.1 2011/08/01 04:05:01 dholland Exp $
+
+Fix bug, caught by clang.
+
+--- src/lib/WP6GraphicsFilenamePacket.cpp~	2010-08-26 11:35:21.000000000 +0000
++++ src/lib/WP6GraphicsFilenamePacket.cpp
+@@ -42,7 +42,7 @@ WP6GraphicsFilenamePacket::~WP6GraphicsF
+ 
+ void WP6GraphicsFilenamePacket::_readContents(WPXInputStream *input, WPXEncryption *encryption)
+ {
+-	if ((m_flags && 0x01) == 0x00)
++	if ((m_flags & 0x01) == 0x00)
+ 		return;
+ 	uint16_t tmpNumChildIds = readU16(input, encryption);
+ 	for (uint16_t i = 0; i < tmpNumChildIds; i++)
-- 
cgit v1.2.3