summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam>2011-02-04 20:10:32 +0000
committeradam <adam>2011-02-04 20:10:32 +0000
commit3415e935b75103de4be7e96a63f87d4b94d1bb50 (patch)
tree9fba1eae2d85549eceeb393aaa6105f677ecd296
parent8874243a35aa15a06032bd2d23d165c41153c731 (diff)
downloadpkgsrc-3415e935b75103de4be7e96a63f87d4b94d1bb50.tar.gz
Fix building with Clang; switch to .tar.bz2
-rw-r--r--converters/libwps/Makefile3
-rw-r--r--converters/libwps/distinfo9
-rw-r--r--converters/libwps/patches/patch-src_lib_WPS8.cpp13
3 files changed, 20 insertions, 5 deletions
diff --git a/converters/libwps/Makefile b/converters/libwps/Makefile
index 09655de339a..16ac23e9f45 100644
--- a/converters/libwps/Makefile
+++ b/converters/libwps/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/11/25 10:52:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/04 20:10:32 adam Exp $
DISTNAME= libwps-0.2.0
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwps/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://libwps.sourceforge.net/
diff --git a/converters/libwps/distinfo b/converters/libwps/distinfo
index bfc80b07ae4..1301b6acfd8 100644
--- a/converters/libwps/distinfo
+++ b/converters/libwps/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/11/25 10:52:19 wiz Exp $
+$NetBSD: distinfo,v 1.3 2011/02/04 20:10:32 adam Exp $
-SHA1 (libwps-0.2.0.tar.gz) = d7606be3832a0c45e0f2f4338449ab52d22c5930
-RMD160 (libwps-0.2.0.tar.gz) = c1d5b4bef52139d922335c4d5e843d2945ecbd03
-Size (libwps-0.2.0.tar.gz) = 402804 bytes
+SHA1 (libwps-0.2.0.tar.bz2) = afc64ef4c4e8404f045efaa52c16c975c5cb1c84
+RMD160 (libwps-0.2.0.tar.bz2) = 08a73131db2f3c2949959296ff270015833b3e71
+Size (libwps-0.2.0.tar.bz2) = 306902 bytes
SHA1 (patch-aa) = 5dd49b6bcb8c147409aa7192f365e9ab0a459ffb
+SHA1 (patch-src_lib_WPS8.cpp) = a107321156cb16fcfaa708692a3968487a752179
diff --git a/converters/libwps/patches/patch-src_lib_WPS8.cpp b/converters/libwps/patches/patch-src_lib_WPS8.cpp
new file mode 100644
index 00000000000..8d2e92f87f1
--- /dev/null
+++ b/converters/libwps/patches/patch-src_lib_WPS8.cpp
@@ -0,0 +1,13 @@
+$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;