diff options
author | wiz <wiz@pkgsrc.org> | 2014-07-23 06:29:53 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-07-23 06:29:53 +0000 |
commit | 8e71b38905834c2cab6acc91bb4c13ddd50ac2d6 (patch) | |
tree | 4762677241ce63cabcadbe7122490d1d987c2fd7 /converters | |
parent | 40e49254741591146583bee1c06c301ca6d2c219 (diff) | |
download | pkgsrc-8e71b38905834c2cab6acc91bb4c13ddd50ac2d6.tar.gz |
Update to 0.3.0. Ride libwpd bump.
0.2.x -> 0.3.0
- switch to librevenge
- add support for Works Spreadsheet
- add support for Works Database
- miscellaneous fixes and cleanups
Diffstat (limited to 'converters')
-rw-r--r-- | converters/libwps/Makefile | 9 | ||||
-rw-r--r-- | converters/libwps/PLIST | 13 | ||||
-rw-r--r-- | converters/libwps/buildlink3.mk | 5 | ||||
-rw-r--r-- | converters/libwps/distinfo | 9 | ||||
-rw-r--r-- | converters/libwps/patches/patch-src_lib_WPS8.cpp | 16 |
5 files changed, 20 insertions, 32 deletions
diff --git a/converters/libwps/Makefile b/converters/libwps/Makefile index f142fcc93a6..9280f1cc5d1 100644 --- a/converters/libwps/Makefile +++ b/converters/libwps/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2014/07/22 10:53:30 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2014/07/23 06:29:53 wiz Exp $ -DISTNAME= libwps-0.2.4 -PKGREVISION= 1 +DISTNAME= libwps-0.3.0 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwps/} EXTRACT_SUFX= .tar.bz2 @@ -16,7 +15,7 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-docs -PKGCONFIG_OVERRIDE+= libwps-0.2.pc.in +PKGCONFIG_OVERRIDE+= libwps.pc.in BUILDLINK_TRANSFORM+= rm:-Werror @@ -25,6 +24,8 @@ BUILDLINK_TRANSFORM+= rm:-Werror _WRAP_EXTRA_ARGS.CXX+= -Wno-unused-private-field -Wno-unused-const-variable .endif +.include "../../converters/librevenge/buildlink3.mk" .include "../../converters/libwpd/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../devel/boost-headers/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/libwps/PLIST b/converters/libwps/PLIST index ad955a99b25..d65a358ed48 100644 --- a/converters/libwps/PLIST +++ b/converters/libwps/PLIST @@ -1,8 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2010/11/25 10:52:19 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/07/23 06:29:53 wiz Exp $ +bin/wks2csv +bin/wks2raw +bin/wks2text bin/wps2html bin/wps2raw bin/wps2text -include/libwps-0.2/libwps/WPSDocument.h -include/libwps-0.2/libwps/libwps.h -lib/libwps-0.2.la -lib/pkgconfig/libwps-0.2.pc +include/libwps-0.3/libwps/WPSDocument.h +include/libwps-0.3/libwps/libwps.h +lib/libwps-0.3.la +lib/pkgconfig/libwps-0.3.pc diff --git a/converters/libwps/buildlink3.mk b/converters/libwps/buildlink3.mk index bf4bdabdc7f..6a88f1a347b 100644 --- a/converters/libwps/buildlink3.mk +++ b/converters/libwps/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/07/22 10:53:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2014/07/23 06:29:53 wiz Exp $ BUILDLINK_TREE+= libwps @@ -6,9 +6,10 @@ BUILDLINK_TREE+= libwps LIBWPS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libwps+= libwps>=0.2.0 -BUILDLINK_ABI_DEPENDS.libwps?= libwps>=0.2.4nb1 +BUILDLINK_ABI_DEPENDS.libwps?= libwps>=0.3.0 BUILDLINK_PKGSRCDIR.libwps?= ../../converters/libwps +.include "../../converters/librevenge/buildlink3.mk" .include "../../converters/libwpd/buildlink3.mk" .endif # LIBWPS_BUILDLINK3_MK diff --git a/converters/libwps/distinfo b/converters/libwps/distinfo index de22a9fe640..4df8442e26d 100644 --- a/converters/libwps/distinfo +++ b/converters/libwps/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2012/04/07 15:08:02 wiz Exp $ +$NetBSD: distinfo,v 1.8 2014/07/23 06:29:53 wiz Exp $ -SHA1 (libwps-0.2.4.tar.bz2) = 9fff59d92d9f34259ea5b1d9eca5c30313453a64 -RMD160 (libwps-0.2.4.tar.bz2) = de70ce0d5769692a482573a573e6bdfcfaba4196 -Size (libwps-0.2.4.tar.bz2) = 314984 bytes -SHA1 (patch-src_lib_WPS8.cpp) = aa4a14aeb9858dbe2ef09d4334eac04f7dbf85c1 +SHA1 (libwps-0.3.0.tar.bz2) = 526323bd59b5f59f8533882fb455e5886bf1f6dc +RMD160 (libwps-0.3.0.tar.bz2) = 6e3f8b0964474ca4a241a4bcc4fcacdd525e3361 +Size (libwps-0.3.0.tar.bz2) = 502782 bytes diff --git a/converters/libwps/patches/patch-src_lib_WPS8.cpp b/converters/libwps/patches/patch-src_lib_WPS8.cpp deleted file mode 100644 index 4b386f1462d..00000000000 --- a/converters/libwps/patches/patch-src_lib_WPS8.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_lib_WPS8.cpp,v 1.4 2012/04/07 15:08:02 wiz Exp $ - -Fix clang error: expression result unused [-Werror,-Wunused-value] -https://sourceforge.net/tracker/?func=detail&aid=3512534&group_id=176121&atid=875977 - ---- src/lib/WPS8.cpp.orig 2011-11-10 16:05:28.000000000 +0000 -+++ src/lib/WPS8.cpp -@@ -205,8 +205,6 @@ void WPS8Parser::readNotes(std::vector<W - if (headerIndexTable.end() == pos) - return; - -- pos->second.length; -- - uint32_t unk1; - uint32_t count; - uint32_t boff; |