diff options
| author | wiz <wiz@pkgsrc.org> | 2012-03-28 15:16:34 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-03-28 15:16:34 +0000 |
| commit | 65dd1ccbc9527fad898c33a9cee3d216b1f819ab (patch) | |
| tree | 3f1278f3a1b2dfaadc4df0cf238515d76f6781cd /converters/libwps | |
| parent | 9822231d2f139878d235d77c890da8bd1e49c7b1 (diff) | |
| download | pkgsrc-65dd1ccbc9527fad898c33a9cee3d216b1f819ab.tar.gz | |
Fix build with clang.
Diffstat (limited to 'converters/libwps')
| -rw-r--r-- | converters/libwps/distinfo | 4 | ||||
| -rw-r--r-- | converters/libwps/patches/patch-src_lib_WPS8.cpp | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/converters/libwps/distinfo b/converters/libwps/distinfo index ca6566f612b..82b715a7e11 100644 --- a/converters/libwps/distinfo +++ b/converters/libwps/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2012/02/16 18:04:08 hans Exp $ +$NetBSD: distinfo,v 1.6 2012/03/28 15:17:19 wiz Exp $ SHA1 (libwps-0.2.2.tar.bz2) = d8c126cb5601afaaaf14507fc09990f8ca41b301 RMD160 (libwps-0.2.2.tar.bz2) = 72aff204a2a386ade5b7d5a6cede4c75f1929eb5 Size (libwps-0.2.2.tar.bz2) = 295486 bytes SHA1 (patch-aa) = 5dd49b6bcb8c147409aa7192f365e9ab0a459ffb SHA1 (patch-src_lib_WPS4.cpp) = e39061f971199f4efe3e80793ac16aec98ba547c -SHA1 (patch-src_lib_WPS8.cpp) = 63a5124844c8fc08f98f913f3a375570f1083db0 +SHA1 (patch-src_lib_WPS8.cpp) = c3326fb46884fe5b5ba28f4fe75861b0e3ef35a4 diff --git a/converters/libwps/patches/patch-src_lib_WPS8.cpp b/converters/libwps/patches/patch-src_lib_WPS8.cpp index e5d50db3c11..6e363266625 100644 --- a/converters/libwps/patches/patch-src_lib_WPS8.cpp +++ b/converters/libwps/patches/patch-src_lib_WPS8.cpp @@ -1,6 +1,8 @@ -$NetBSD: patch-src_lib_WPS8.cpp,v 1.2 2012/02/16 18:04:08 hans Exp $ +$NetBSD: patch-src_lib_WPS8.cpp,v 1.3 2012/03/28 15:17:19 wiz Exp $ ---- src/lib/WPS8.cpp.orig 2011-02-04 20:04:48.000000000 +0000 +3rd chunk: fix clang error: expression result unused [-Werror,-Wunused-value] + +--- src/lib/WPS8.cpp.orig 2011-05-03 13:00:13.000000000 +0000 +++ src/lib/WPS8.cpp @@ -159,7 +159,7 @@ void WPS8Parser::readStreams(WPXInputStr @@ -20,7 +22,16 @@ $NetBSD: patch-src_lib_WPS8.cpp,v 1.2 2012/02/16 18:04:08 hans Exp $ type = readU32(input); } else input->seek(len-2,WPX_SEEK_CUR); -@@ -251,7 +251,7 @@ void WPS8Parser::appendUTF16LE(WPXInputS +@@ -196,8 +196,6 @@ void WPS8Parser::readNotes(std::vector<W + if (headerIndexTable.end() == pos) + return; + +- pos->second.length; +- + uint32_t unk1; + uint32_t count; + uint32_t boff; +@@ -251,7 +249,7 @@ void WPS8Parser::appendUTF16LE(WPXInputS uint16_t high_surrogate = 0; bool fail = false; uint16_t readVal; |