diff options
author | adam <adam@pkgsrc.org> | 2020-05-12 06:03:48 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2020-05-12 06:03:48 +0000 |
commit | dd8bab3794ee67cd953a74746286c59f2a802997 (patch) | |
tree | 7f20ce7edfb1181806148795b6f68f1e10b32409 /finance | |
parent | c64195ee12761ecddca27a175868703f10e58900 (diff) | |
download | pkgsrc-dd8bab3794ee67cd953a74746286c59f2a802997.tar.gz |
libofx: updated to 0.9.15
LibOFX 0.9.15:
- Fix segfault on uninitialized iconv
- Make file format less stringent
- Minor fixes in the build system
LibOFX 0.9.14:
- Fix proprietary tags striping eating the content of the previous tag if
proprietary tag is in the middle of the line
- Don't output invalid line numbers on the console before SGML processing starts
LibOFX 0.9.13:
- Fix potential heap overflow
- Fix crash on some malformed ofx files
- Fix crash in ofxconnect on missing command line arguments
- Fix for daylight savings time handling
- Easier compile on macos: obey LIBTOOLIZE env variable, and fallback to glibtoolize
- Fix compile on win32 (mingw-w64)
- Performance an reliability fixes in header parsing
- Strip CATEGORY tag added by Chase bank
LibOFX 0.9.12:
- Fix a buffer overflow on unexpected tag names.
LibOFX 0.9.11:
- Add support for client uid, from KDE bug 366326
Diffstat (limited to 'finance')
-rw-r--r-- | finance/libofx/Makefile | 16 | ||||
-rw-r--r-- | finance/libofx/PLIST | 173 | ||||
-rw-r--r-- | finance/libofx/distinfo | 12 | ||||
-rw-r--r-- | finance/libofx/patches/patch-lib_ofx__preproc.cpp | 22 |
4 files changed, 46 insertions, 177 deletions
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile index ec4f9b40e40..6b5f4de9263 100644 --- a/finance/libofx/Makefile +++ b/finance/libofx/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2020/05/06 14:04:30 adam Exp $ +# $NetBSD: Makefile,v 1.38 2020/05/12 06:03:48 adam Exp $ -DISTNAME= libofx-0.9.10 -PKGREVISION= 17 +DISTNAME= libofx-0.9.15 CATEGORIES= finance devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libofx/} @@ -10,17 +9,18 @@ HOMEPAGE= http://libofx.sourceforge.net/ COMMENT= OFX (Open Financial eXchange) Library LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-opensp-includes=${BUILDLINK_PREFIX.opensp}/include/OpenSP \ - --with-opensp-libs=${BUILDLINK_PREFIX.opensp}/libs -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= pkg-config USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-opensp-includes=${BUILDLINK_PREFIX.opensp}/include/OpenSP +CONFIGURE_ARGS+= --with-opensp-libs=${BUILDLINK_PREFIX.opensp}/libs +TEST_TARGET= check post-extract: ${CHMOD} -R go-w ${WRKSRC} -.include "../../textproc/libxml++1/buildlink3.mk" +.include "../../textproc/libxml++/buildlink3.mk" .include "../../textproc/opensp/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/libofx/PLIST b/finance/libofx/PLIST index 4f971edbf53..88513d4650f 100644 --- a/finance/libofx/PLIST +++ b/finance/libofx/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2014/12/30 13:13:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2020/05/12 06:03:48 adam Exp $ bin/ofx2qif +bin/ofxconnect bin/ofxdump include/libofx/libofx.h lib/libofx.la lib/pkgconfig/libofx.pc +man/man1/ofxconnect.1 man/man1/ofxdump.1 share/doc/libofx/AUTHORS share/doc/libofx/COPYING @@ -12,14 +14,11 @@ share/doc/libofx/INSTALL share/doc/libofx/NEWS share/doc/libofx/README share/doc/libofx/html/annotated.html -share/doc/libofx/html/annotated.js +share/doc/libofx/html/annotated_dup.js share/doc/libofx/html/bc_s.png share/doc/libofx/html/bdwn.png share/doc/libofx/html/classLibofxContext.html share/doc/libofx/html/classLibofxContext.js -share/doc/libofx/html/classNodeParser.html -share/doc/libofx/html/classNodeParser.js -share/doc/libofx/html/classNodeParser.png share/doc/libofx/html/classOFCApplication.html share/doc/libofx/html/classOFCApplication.js share/doc/libofx/html/classOFCApplication.png @@ -100,22 +99,16 @@ share/doc/libofx/html/classtree_1_1sibling__iterator.png share/doc/libofx/html/classtree__node__.html share/doc/libofx/html/classtree__node__.js share/doc/libofx/html/closed.png -share/doc/libofx/html/cmdline_8c_source.html -share/doc/libofx/html/cmdline_8h.html -share/doc/libofx/html/cmdline_8h.js -share/doc/libofx/html/cmdline_8h_source.html share/doc/libofx/html/config_8h_source.html share/doc/libofx/html/context_8cpp_source.html share/doc/libofx/html/context_8hh_source.html -share/doc/libofx/html/deprecated.html -share/doc/libofx/html/dir_031de96d9f19d9fede3f56ef2322f464.html -share/doc/libofx/html/dir_26ba10504773bd79f60650e81128ba07.html -share/doc/libofx/html/dir_2dabe2c45d94ff6afd4ea031fd8e0e92.html -share/doc/libofx/html/dir_3dd607161db4a7e13a3425da1f3e65b5.html -share/doc/libofx/html/dir_4173102e197cd33c0b2a8d4b2328250f.html -share/doc/libofx/html/dir_8cd3f1a39110e08ba91bca46b204f6b6.html -share/doc/libofx/html/dir_92da12de3a7e435e6ac7f35fe8c95afc.html -share/doc/libofx/html/dir_fc5f19fb153334f2775e4db87bcc97a7.html +share/doc/libofx/html/dir_188f2a147f268740fa35e1138a9139aa.html +share/doc/libofx/html/dir_7432f7aab7cc7990d1d80266d4aef759.html +share/doc/libofx/html/dir_83ea686f5db7f8dcb7127eea149218de.html +share/doc/libofx/html/dir_98741f362137004ec39e430cae2a0bf3.html +share/doc/libofx/html/dir_b8151556d6639878dc073bbd8e16ee68.html +share/doc/libofx/html/dir_bfccd401955b95cf8c75461437045ac0.html +share/doc/libofx/html/doc.png share/doc/libofx/html/doxygen.css share/doc/libofx/html/doxygen.png share/doc/libofx/html/dynsections.js @@ -127,22 +120,8 @@ share/doc/libofx/html/file__preproc_8hh.js share/doc/libofx/html/file__preproc_8hh_source.html share/doc/libofx/html/files.html share/doc/libofx/html/files.js -share/doc/libofx/html/ftv2blank.png -share/doc/libofx/html/ftv2cl.png -share/doc/libofx/html/ftv2doc.png -share/doc/libofx/html/ftv2folderclosed.png -share/doc/libofx/html/ftv2folderopen.png -share/doc/libofx/html/ftv2lastnode.png -share/doc/libofx/html/ftv2link.png -share/doc/libofx/html/ftv2mlastnode.png -share/doc/libofx/html/ftv2mnode.png -share/doc/libofx/html/ftv2mo.png -share/doc/libofx/html/ftv2node.png -share/doc/libofx/html/ftv2ns.png -share/doc/libofx/html/ftv2plastnode.png -share/doc/libofx/html/ftv2pnode.png -share/doc/libofx/html/ftv2splitbar.png -share/doc/libofx/html/ftv2vertline.png +share/doc/libofx/html/folderclosed.png +share/doc/libofx/html/folderopen.png share/doc/libofx/html/functions.html share/doc/libofx/html/functions_b.html share/doc/libofx/html/functions_c.html @@ -169,106 +148,17 @@ share/doc/libofx/html/functions_u.html share/doc/libofx/html/functions_v.html share/doc/libofx/html/functions_vars.html share/doc/libofx/html/functions_w.html -share/doc/libofx/html/fx-0_89_810_2lib_2context_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2context_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2file__preproc_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2file__preproc_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2file__preproc_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2file__preproc_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2file__preproc_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2file__preproc_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2getopt1_8c_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2getopt_8c_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2gnugetopt_8h_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2messages_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2messages_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2messages_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2messages_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2messages_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2messages_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofc__sgml_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofc__sgml_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofc__sgml_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofc__sgml_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofc__sgml_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofc__sgml_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__aggregate_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__aggregate_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__account_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__account_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__account_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__generic_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__generic_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__generic_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__main_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__main_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__security_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__security_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__security_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__statement_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__statement_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__statement_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__transaction_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__transaction_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__container__transaction_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__containers_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__containers_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__containers__misc_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__containers__misc_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__containers__misc_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__error__msg_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__error__msg_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__error__msg_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__preproc_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__preproc_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__preproc_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__preproc_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__preproc_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__preproc_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__accountinfo_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__accountinfo_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__accountinfo_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__accountinfo_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__accountinfo_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__statement_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__statement_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__statement_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__statement_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__request__statement_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__sgml_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__sgml_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__sgml_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__sgml_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__sgml_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__sgml_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__utilities_8cpp.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__utilities_8cpp.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__utilities_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__utilities_8hh.html -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__utilities_8hh.js -share/doc/libofx/html/fx-0_89_810_2lib_2ofx__utilities_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2tree_8hh_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2win32_8cpp_source.html -share/doc/libofx/html/fx-0_89_810_2lib_2win32_8hh_source.html share/doc/libofx/html/getopt1_8c_source.html share/doc/libofx/html/getopt_8c_source.html share/doc/libofx/html/globals.html share/doc/libofx/html/globals_c.html share/doc/libofx/html/globals_d.html -share/doc/libofx/html/globals_defs.html share/doc/libofx/html/globals_dup.js share/doc/libofx/html/globals_e.html share/doc/libofx/html/globals_enum.html share/doc/libofx/html/globals_eval.html share/doc/libofx/html/globals_f.html share/doc/libofx/html/globals_func.html -share/doc/libofx/html/globals_g.html share/doc/libofx/html/globals_i.html share/doc/libofx/html/globals_l.html share/doc/libofx/html/globals_m.html @@ -290,10 +180,11 @@ share/doc/libofx/html/inc_2libofx_8h.js share/doc/libofx/html/inc_2libofx_8h_source.html share/doc/libofx/html/index.html share/doc/libofx/html/jquery.js -share/doc/libofx/html/libofx-0_89_810_2inc_2libofx_8h.html -share/doc/libofx/html/libofx-0_89_810_2inc_2libofx_8h.js -share/doc/libofx/html/libofx-0_89_810_2inc_2libofx_8h_source.html -share/doc/libofx/html/main__doc_8c_source.html +share/doc/libofx/html/libofx-0_89_815_2inc_2libofx_8h.html +share/doc/libofx/html/libofx-0_89_815_2inc_2libofx_8h.js +share/doc/libofx/html/libofx-0_89_815_2inc_2libofx_8h_source.html +share/doc/libofx/html/menu.js +share/doc/libofx/html/menudata.js share/doc/libofx/html/messages_8cpp.html share/doc/libofx/html/messages_8cpp.js share/doc/libofx/html/messages_8cpp_source.html @@ -308,26 +199,18 @@ share/doc/libofx/html/nav_g.png share/doc/libofx/html/nav_h.png share/doc/libofx/html/navtree.css share/doc/libofx/html/navtree.js +share/doc/libofx/html/navtreedata.js share/doc/libofx/html/navtreeindex0.js share/doc/libofx/html/navtreeindex1.js share/doc/libofx/html/navtreeindex2.js share/doc/libofx/html/navtreeindex3.js share/doc/libofx/html/navtreeindex4.js -share/doc/libofx/html/navtreeindex5.js -share/doc/libofx/html/navtreeindex6.js -share/doc/libofx/html/nodeparser_8cpp.html -share/doc/libofx/html/nodeparser_8cpp_source.html -share/doc/libofx/html/nodeparser_8h.html -share/doc/libofx/html/nodeparser_8h_source.html share/doc/libofx/html/ofc__sgml_8cpp.html share/doc/libofx/html/ofc__sgml_8cpp.js share/doc/libofx/html/ofc__sgml_8cpp_source.html share/doc/libofx/html/ofc__sgml_8hh.html share/doc/libofx/html/ofc__sgml_8hh.js share/doc/libofx/html/ofc__sgml_8hh_source.html -share/doc/libofx/html/ofx2qif_8c.html -share/doc/libofx/html/ofx2qif_8c.js -share/doc/libofx/html/ofx2qif_8c_source.html share/doc/libofx/html/ofx__aggregate_8hh.html share/doc/libofx/html/ofx__aggregate_8hh_source.html share/doc/libofx/html/ofx__container__account_8cpp.html @@ -389,21 +272,13 @@ share/doc/libofx/html/ofx__utilities_8cpp_source.html share/doc/libofx/html/ofx__utilities_8hh.html share/doc/libofx/html/ofx__utilities_8hh.js share/doc/libofx/html/ofx__utilities_8hh_source.html -share/doc/libofx/html/ofxconnect_8cpp.html -share/doc/libofx/html/ofxconnect_8cpp.js -share/doc/libofx/html/ofxconnect_8cpp_source.html -share/doc/libofx/html/ofxdump_8cpp.html -share/doc/libofx/html/ofxdump_8cpp.js -share/doc/libofx/html/ofxdump_8cpp_source.html -share/doc/libofx/html/ofxpartner_8cpp.html -share/doc/libofx/html/ofxpartner_8cpp.js -share/doc/libofx/html/ofxpartner_8cpp_source.html -share/doc/libofx/html/ofxpartner_8h.html -share/doc/libofx/html/ofxpartner_8h.js -share/doc/libofx/html/ofxpartner_8h_source.html +share/doc/libofx/html/ofxconnect_2cmdline_8c_source.html +share/doc/libofx/html/ofxconnect_2cmdline_8h_source.html +share/doc/libofx/html/ofxdump_2cmdline_8c_source.html +share/doc/libofx/html/ofxdump_2cmdline_8h_source.html share/doc/libofx/html/open.png -share/doc/libofx/html/pages.html share/doc/libofx/html/resize.js +share/doc/libofx/html/splitbar.png share/doc/libofx/html/structErrorMsg.html share/doc/libofx/html/structErrorMsg.js share/doc/libofx/html/structLibofxFileFormatInfo.html diff --git a/finance/libofx/distinfo b/finance/libofx/distinfo index 22f10b7ed67..ddc3e8faa62 100644 --- a/finance/libofx/distinfo +++ b/finance/libofx/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2019/10/25 09:23:37 kamil Exp $ +$NetBSD: distinfo,v 1.16 2020/05/12 06:03:48 adam Exp $ -SHA1 (libofx-0.9.10.tar.gz) = 33f394c963c087217cb6c508af842d4844bc0823 -RMD160 (libofx-0.9.10.tar.gz) = 928069129cf945dc85521907325977a36dbeae7f -SHA512 (libofx-0.9.10.tar.gz) = 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895 -Size (libofx-0.9.10.tar.gz) = 1433837 bytes +SHA1 (libofx-0.9.15.tar.gz) = 96b9fad846652af5c3f2205e267dba8bf185d778 +RMD160 (libofx-0.9.15.tar.gz) = f1fdf640a482228176b5e1406e92e72512aaaeea +SHA512 (libofx-0.9.15.tar.gz) = 9d9c5e55bd4ac71d1158c7b8dfe7ecbcaba6f03afdbf3dc2f6d3699c5e4f3fce045400df0217d5f1f4ba45a0ee1b10862b0ebbe1a0f634d756c3b1b88872ce1f +Size (libofx-0.9.15.tar.gz) = 1298356 bytes SHA1 (patch-lib_Makefile.in) = 512cf3dbaa257205ffff18f3953a08eb81d015f4 -SHA1 (patch-lib_ofx__preproc.cpp) = 98ad35ccbd9b36ed486c6180287135b402e36558 +SHA1 (patch-lib_ofx__preproc.cpp) = 73f2b1f4fd30466e8af7fd87fba8815f5c206815 diff --git a/finance/libofx/patches/patch-lib_ofx__preproc.cpp b/finance/libofx/patches/patch-lib_ofx__preproc.cpp index 5e64a993b14..be0ad5f71fd 100644 --- a/finance/libofx/patches/patch-lib_ofx__preproc.cpp +++ b/finance/libofx/patches/patch-lib_ofx__preproc.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-lib_ofx__preproc.cpp,v 1.3 2019/10/25 09:23:37 kamil Exp $ +$NetBSD: patch-lib_ofx__preproc.cpp,v 1.4 2020/05/12 06:03:48 adam Exp $ Fix build on NetBSD where iconv has a different prototype. http://sourceforge.net/p/libofx/bugs/44/ ---- lib/ofx_preproc.cpp.orig 2014-09-12 19:26:30.000000000 +0000 +--- lib/ofx_preproc.cpp.orig 2020-05-10 08:10:38.019501839 +0000 +++ lib/ofx_preproc.cpp -@@ -34,6 +34,15 @@ +@@ -35,6 +35,15 @@ #include <iconv.h> #endif @@ -18,21 +18,15 @@ http://sourceforge.net/p/libofx/bugs/44/ +#endif +#endif + - #ifdef OS_WIN32 + #ifdef __WIN32__ # define DIRSEP "\\" #else -@@ -310,7 +319,7 @@ int ofx_proc_file(LibofxContextPtr ctx, +@@ -307,7 +316,7 @@ int ofx_proc_file(LibofxContextPtr ctx, size_t outbytesleft = inbytesleft * 2 - 1; - iconv_buffer = (char*) malloc (inbytesleft * 2); + char * iconv_buffer = (char*) malloc (inbytesleft * 2); memset(iconv_buffer, 0, inbytesleft * 2); --#if defined(OS_WIN32) || defined(__sun) -+#if defined(OS_WIN32) || defined(__sun) || (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) +-#if defined(__sun) || defined(__NetBSD__) ++#if defined(__sun) || (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) const char * inchar = (const char *)s_buffer.c_str(); #else char * inchar = (char *)s_buffer.c_str(); -@@ -655,5 +664,3 @@ std::string find_dtd(LibofxContextPtr ct - message_out(ERROR, "find_dtd():Unable to find the DTD named " + dtd_filename); - return ""; - } -- -- |