summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-02-16 18:04:08 +0000
committerhans <hans@pkgsrc.org>2012-02-16 18:04:08 +0000
commit022cd2268febfec3ea39298fc92d5198e7bda993 (patch)
tree5d56d3fdd4a1cd056ae246c9859ffd37a84a86ab /converters
parentc95fc8aefd4418ebcf58b8c61efe51f8ab9f0aa6 (diff)
downloadpkgsrc-022cd2268febfec3ea39298fc92d5198e7bda993.tar.gz
Remove set but unused variable.
Diffstat (limited to 'converters')
-rw-r--r--converters/libwps/distinfo5
-rw-r--r--converters/libwps/patches/patch-src_lib_WPS4.cpp18
-rw-r--r--converters/libwps/patches/patch-src_lib_WPS8.cpp22
3 files changed, 41 insertions, 4 deletions
diff --git a/converters/libwps/distinfo b/converters/libwps/distinfo
index f484cf6f24d..ca6566f612b 100644
--- a/converters/libwps/distinfo
+++ b/converters/libwps/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2011/05/18 14:53:47 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/02/16 18:04:08 hans 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_WPS8.cpp) = a107321156cb16fcfaa708692a3968487a752179
+SHA1 (patch-src_lib_WPS4.cpp) = e39061f971199f4efe3e80793ac16aec98ba547c
+SHA1 (patch-src_lib_WPS8.cpp) = 63a5124844c8fc08f98f913f3a375570f1083db0
diff --git a/converters/libwps/patches/patch-src_lib_WPS4.cpp b/converters/libwps/patches/patch-src_lib_WPS4.cpp
new file mode 100644
index 00000000000..89bd0aae16d
--- /dev/null
+++ b/converters/libwps/patches/patch-src_lib_WPS4.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_WPS4.cpp,v 1.1 2012/02/16 18:04:08 hans Exp $
+
+--- src/lib/WPS4.cpp.orig 2011-04-04 21:34:27.000000000 +0200
++++ src/lib/WPS4.cpp 2012-01-27 12:03:55.579804437 +0100
+@@ -198,10 +198,10 @@ bool WPS4Parser::readFODPage(WPXInputStr
+ }
+ input->seek(page_offset, WPX_SEEK_SET);
+
+- uint32_t fcFirst; /* Byte number of first character covered by this page
+- of formatting information */
++ /* Byte number of first character covered by this page
++ of formatting information */
+
+- fcFirst = readU32(input);
++ (void) readU32(input);
+
+ int first_fod = FODs->size();
+
diff --git a/converters/libwps/patches/patch-src_lib_WPS8.cpp b/converters/libwps/patches/patch-src_lib_WPS8.cpp
index 8d2e92f87f1..e5d50db3c11 100644
--- a/converters/libwps/patches/patch-src_lib_WPS8.cpp
+++ b/converters/libwps/patches/patch-src_lib_WPS8.cpp
@@ -1,8 +1,26 @@
-$NetBSD: patch-src_lib_WPS8.cpp,v 1.1 2011/02/04 20:10:32 adam Exp $
+$NetBSD: patch-src_lib_WPS8.cpp,v 1.2 2012/02/16 18:04:08 hans Exp $
--- src/lib/WPS8.cpp.orig 2011-02-04 20:04:48.000000000 +0000
+++ src/lib/WPS8.cpp
-@@ -128,7 +128,7 @@ void WPS8Parser::appendUTF16LE(WPXInputS
+@@ -159,7 +159,7 @@ void WPS8Parser::readStreams(WPXInputStr
+
+ for (unsigned i=0; i < n_streams; i++) {
+ uint16_t len;
+- uint32_t unknown, type = 0;
++ uint32_t type = 0;
+
+ len = readU16(input);
+ if (len > 10) {
+@@ -168,7 +168,7 @@ void WPS8Parser::readStreams(WPXInputStr
+ }
+
+ if (len > 4) {
+- unknown = readU32(input); // assume == 0x22000000
++ (void) readU32(input); // assume == 0x22000000
+ type = readU32(input);
+ } else input->seek(len-2,WPX_SEEK_CUR);
+
+@@ -251,7 +251,7 @@ void WPS8Parser::appendUTF16LE(WPXInputS
uint16_t high_surrogate = 0;
bool fail = false;
uint16_t readVal;