Fri Feb 4 20:10:32 2011 UTC ()
Fix building with Clang; switch to .tar.bz2


(adam)
diff -r1.3 -r1.4 pkgsrc/converters/libwps/Makefile
diff -r1.2 -r1.3 pkgsrc/converters/libwps/distinfo
diff -r0 -r1.1 pkgsrc/converters/libwps/patches/patch-src_lib_WPS8.cpp
cvs diff -r1.3 -r1.4 pkgsrc/converters/libwps/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/libwps/Makefile 2010/11/25 10:52:19 1.3
+++ pkgsrc/converters/libwps/Makefile 2011/02/04 20:10:32 1.4
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.3 2010/11/25 10:52:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2011/02/04 20:10:32 adam Exp $
2 2
3DISTNAME= libwps-0.2.0 3DISTNAME= libwps-0.2.0
4CATEGORIES= converters 4CATEGORIES= converters
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwps/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwps/}
 6EXTRACT_SUFX= .tar.bz2
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://libwps.sourceforge.net/ 9HOMEPAGE= http://libwps.sourceforge.net/
9COMMENT= Library for importing Microsoft Works documents 10COMMENT= Library for importing Microsoft Works documents
10LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
11 12
12PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
13 14
14USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --without-docs 19CONFIGURE_ARGS+= --without-docs
cvs diff -r1.2 -r1.3 pkgsrc/converters/libwps/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/libwps/distinfo 2010/11/25 10:52:19 1.2
+++ pkgsrc/converters/libwps/distinfo 2011/02/04 20:10:32 1.3
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.2 2010/11/25 10:52:19 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2011/02/04 20:10:32 adam Exp $
2 2
3SHA1 (libwps-0.2.0.tar.gz) = d7606be3832a0c45e0f2f4338449ab52d22c5930 3SHA1 (libwps-0.2.0.tar.bz2) = afc64ef4c4e8404f045efaa52c16c975c5cb1c84
4RMD160 (libwps-0.2.0.tar.gz) = c1d5b4bef52139d922335c4d5e843d2945ecbd03 4RMD160 (libwps-0.2.0.tar.bz2) = 08a73131db2f3c2949959296ff270015833b3e71
5Size (libwps-0.2.0.tar.gz) = 402804 bytes 5Size (libwps-0.2.0.tar.bz2) = 306902 bytes
6SHA1 (patch-aa) = 5dd49b6bcb8c147409aa7192f365e9ab0a459ffb 6SHA1 (patch-aa) = 5dd49b6bcb8c147409aa7192f365e9ab0a459ffb
 7SHA1 (patch-src_lib_WPS8.cpp) = a107321156cb16fcfaa708692a3968487a752179
File Added: pkgsrc/converters/libwps/patches/Attic/patch-src_lib_WPS8.cpp
$NetBSD: patch-src_lib_WPS8.cpp,v 1.1 2011/02/04 20:10:32 adam 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
 	uint16_t high_surrogate = 0;
 	bool fail = false;
 	uint16_t readVal;
-	uint32_t ucs4Character;
+	uint32_t ucs4Character = 0;
 	while (true) {
 		if (input->atEOS()) {
 			fail = true;