* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libofx/, dev-libs/libofx/files/
@ 2016-04-14 15:28 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-04-14 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 432a2f2ecf9d6161f4f9bf10c10205b8a27724fc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 15:28:00 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 15:28:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432a2f2e
dev-libs/libofx: remove old
Package-Manager: portage-2.2.28
dev-libs/libofx/Manifest | 1 -
dev-libs/libofx/files/libofx-0.9.5-gcc47.patch | 11 ------
dev-libs/libofx/libofx-0.9.5.ebuild | 47 --------------------------
3 files changed, 59 deletions(-)
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 8939ecd..32f190d 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,2 +1 @@
DIST libofx-0.9.10.tar.gz 1433837 SHA256 54e26a4944ef2785087cfd8ed8f187ab9d397d9b92b5acc199dd7d5d095cf695 SHA512 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895 WHIRLPOOL 2cf39474bde30086b51529d4fccae51c6b1728b413ddf45768283e1404d0b8bb0316a532c3a1436dfee22d4953df8ef42470bf4414cbd1aef7b9fb7c8661ce38
-DIST libofx-0.9.5.tar.gz 1526857 SHA256 a075c5634b94bad16f8c949eeb77625d31bedea3bb10a8da174b989ffab7e78e SHA512 f7c6e0d85ee1f01216678ec51939ffe09c4a4c5ccc97a5928be45bd2be27418a95004a8a46f17225366908cdd8bb43b19bf95295f0e6422802d3a935a63eb0a9 WHIRLPOOL 67f61361417636e297f45f7c9d3d4de9e88a20c9af4b1a6f811d4b6d6d671f045f3f485b193d24372e89fdbfbd944565bb3ec224578351c1d31cf9c109921d5f
diff --git a/dev-libs/libofx/files/libofx-0.9.5-gcc47.patch b/dev-libs/libofx/files/libofx-0.9.5-gcc47.patch
deleted file mode 100644
index 2e6ee8b..0000000
--- a/dev-libs/libofx/files/libofx-0.9.5-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN libofx-0.9.5.orig/ofxconnect/ofxpartner.cpp libofx-0.9.5/ofxconnect/ofxpartner.cpp
---- libofx-0.9.5.orig/ofxconnect/ofxpartner.cpp 2011-03-31 00:30:50.000000000 +0200
-+++ libofx-0.9.5/ofxconnect/ofxpartner.cpp 2012-06-30 21:57:35.747989782 +0200
-@@ -37,6 +37,7 @@
- #include <vector>
- #include <algorithm>
- #include <string.h>
-+#include <unistd.h>
-
- using std::string;
- using std::vector;
diff --git a/dev-libs/libofx/libofx-0.9.5.ebuild b/dev-libs/libofx/libofx-0.9.5.ebuild
deleted file mode 100644
index ec7f03d..0000000
--- a/dev-libs/libofx/libofx-0.9.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="A library to support the Open Financial eXchange XML format"
-HOMEPAGE="http://libofx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
-IUSE="doc static-libs test"
-
-RDEPEND=">=app-text/opensp-1.5
- dev-cpp/libxmlpp:2.6
- >=net-misc/curl-7.9.7"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( sys-apps/help2man )
- test? ( app-crypt/gnupg )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc47.patch" )
-
-src_prepare() {
- base_src_prepare
- # Be sure DTD gets installed in correct path after redefining docdir in install
- sed -i \
- -e 's:$(DESTDIR)$(docdir):$(DESTDIR)$(LIBOFX_DTD_DIR):' \
- dtd/Makefile.in || die
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --disable-doxygen
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-
- rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL}
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libofx/, dev-libs/libofx/files/
@ 2021-03-06 6:28 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-06 6:28 UTC (permalink / raw
To: gentoo-commits
commit: e2969e5bc45ec484cd75e6aaf0d403a7a14044d1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 06:26:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 06:28:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2969e5b
dev-libs/libofx: fix libdir for OpenSP, doc fixes
* Fix libdir for OpenSP (respect --libdir)
* Enable building HTML docs (we looked for Doxygen but didn't use it)
* Use patches being upstreamed for respecting libdir + docdir
See: https://github.com/libofx/libofx/pull/40
Closes: https://bugs.gentoo.org/693458
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libofx/files/libofx-0.10.1-docdir.patch | 41 ++++++++++++++++++++++
.../libofx/files/libofx-0.10.1-opensp-libdir.patch | 38 ++++++++++++++++++++
dev-libs/libofx/libofx-0.10.1-r1.ebuild | 18 +++++++---
3 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
new file mode 100644
index 00000000000..f99730daa02
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
@@ -0,0 +1,41 @@
+https://github.com/libofx/libofx/pull/40
+
+From 379745ff481f2cc99f96836de0307b8074bf0788 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 6 Mar 2021 06:09:11 +0000
+Subject: [PATCH] Makefile.am, doc/Makefile.am: don't override docdir
+
+'docdir' is already provided by autotools. By not overriding it,
+we allow the directory to be easily overriden at build time.
+
+By default, docdir is /usr/share/doc/libofx, so no change!
+
+e.g. In Gentoo, we prefer to use --docdir=/usr/share/doc/${PF}
+where ${PF} represents the upstream version combined with any
+internal distribution changes made.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,8 +6,6 @@ endif
+ DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
+ SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
+
+-docdir = $(datadir)/doc/libofx
+-
+ doc_DATA = \
+ AUTHORS \
+ COPYING \
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 23e9d34..bd0a04d 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,5 @@
+ SUBDIRS =
+
+-docdir = ${prefix}/share/doc/libofx
+-
+ EXTRA_DIST = \
+ doxygen.cfg \
+ ofx_sample_files \
diff --git a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
new file mode 100644
index 00000000000..548d0ec9cff
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
@@ -0,0 +1,38 @@
+https://github.com/libofx/libofx/pull/40
+
+From a8f262bf557f4d49e8dbdf4e1082879020b7c7b9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 6 Mar 2021 05:57:49 +0000
+Subject: [PATCH] configure.ac: Respect --libdir for OpenSP
+
+When searching for OpenSP, we want to use
+the libdir passed in to autotools (--libdir)
+to ensure that we find the library
+for the correct ABI.
+
+It is possible that we pick up the wrong
+copy from e.g. /usr/lib/ where a 32-bit
+copy of OpenSP exists
+when we're in the middle of a 64-bit build.
+
+Use ${libdir} to ensure we respect
+any preferences/information given and
+search for OpenSP in the right place.
+
+Bug: https://bugs.gentoo.org/693458
+Signed-off-by: Sam James <sam@gentoo.org>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -110,9 +110,9 @@ AC_ARG_WITH(opensp-includes,
+
+ AC_ARG_WITH(opensp-libs,
+ [ --with-opensp-libs=PATH specify where to look for libosp
+- - default is /usr/lib],
++ - default is /usr/lib}],
+ OPENSPLIBPATH="$with_opensp_libs",
+- OPENSPLIBPATH="/usr/lib")
++ OPENSPLIBPATH="${libdir}")
+
+ echo $OPENSPLIBPATH
+ for d in /usr/include/OpenSP /usr/local/include/OpenSP /usr/include/sp/generic /usr/local/include/sp/generic; do
diff --git a/dev-libs/libofx/libofx-0.10.1-r1.ebuild b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
index 0db669fdea8..11e25cba6dd 100644
--- a/dev-libs/libofx/libofx-0.10.1-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/10"
KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="test"
+IUSE="doc test"
RESTRICT="!test? ( test )"
BDEPEND="
dev-util/gengetopt
sys-apps/help2man
virtual/pkgconfig
+ doc? ( app-doc/doxygen )
test? ( app-crypt/gnupg )
"
RDEPEND="
@@ -30,13 +31,16 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/libofx-0.10.1-opensp-libdir.patch
+ "${FILESDIR}"/libofx-0.10.1-docdir.patch
+)
+
src_prepare() {
default
# Not included in the tarball
sed -i -e '/INSTALL/d' Makefile.am || die
- # Use correct location for docs
- sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
# bug #566456
append-cxxflags -std=c++14
@@ -45,11 +49,17 @@ src_prepare() {
}
src_configure() {
- econf --disable-static
+ econf \
+ $(use_enable doc html-docs) \
+ --disable-static
}
src_compile() {
emake -j1
+
+ if use doc ; then
+ emake doc
+ fi
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libofx/, dev-libs/libofx/files/
@ 2021-03-06 7:24 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-06 7:24 UTC (permalink / raw
To: gentoo-commits
commit: f5f012fe61ddbc06a51684967e3bb753960f1318
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 07:23:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 07:23:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f012fe
dev-libs/libofx: drop 0.9.15, 0.10.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libofx/Manifest | 2 -
.../files/libofx-0.9.15-docdir-nothanks.patch | 22 ---------
dev-libs/libofx/libofx-0.10.0.ebuild | 56 ----------------------
dev-libs/libofx/libofx-0.9.15.ebuild | 50 -------------------
4 files changed, 130 deletions(-)
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 020b39511de..3fe202d0c09 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,3 +1 @@
-DIST libofx-0.10.0.tar.gz 225574 BLAKE2B 29ce24ce8f0a333e2d35371cba217223e59e72e1f41051279c15033fecd5f33d7381e9be8403f2e639c007ca6aca1d53cf651e057c9842350772c2296b92c436 SHA512 b7767088701e22a2eba072c365d379987c6e9b2403888550068d6f62f48eaee7935e5355fa6ec97ac7a79bb847c833552250c0bd3065f9274b209585a7884f1d
DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
-DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
diff --git a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch b/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
deleted file mode 100644
index 6b8cc215ead..00000000000
--- a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am 2019-09-30 22:33:58.000000000 +0200
-+++ b/Makefile.am 2019-10-12 22:46:00.915146241 +0200
-@@ -4,18 +4,7 @@
- MAYBE_OFXCONNECT = ofxconnect
- endif
- DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
--SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
--
--docdir = $(datadir)/doc/libofx
--
--doc_DATA = \
-- AUTHORS \
-- COPYING \
-- INSTALL \
-- NEWS \
-- README \
-- ChangeLog \
-- totest.txt
-+SUBDIRS = m4 inc dtd lib . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
-
- EXTRA_DIST = \
- libofx.spec.in \
diff --git a/dev-libs/libofx/libofx-0.10.0.ebuild b/dev-libs/libofx/libofx-0.10.0.ebuild
deleted file mode 100644
index 72d72da9a57..00000000000
--- a/dev-libs/libofx/libofx-0.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-util/gengetopt
- sys-apps/help2man
- virtual/pkgconfig
- test? ( app-crypt/gnupg )
-"
-RDEPEND="
- >app-text/opensp-1.5
- >=dev-cpp/libxmlpp-2.40.1:2.6
- >=net-misc/curl-7.9.7
- virtual/libiconv
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- # Not included in the tarball
- sed -i -e '/INSTALL/d' Makefile.am || die
- # Use correct location for docs
- sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
-
- eautoreconf
- append-cxxflags -std=c++14 # bug #566456
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -type f -delete || die
-
- if ! use static-libs; then
- find "${ED}" -name '*.a' -type f -delete || die
- fi
-}
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
deleted file mode 100644
index 81c4ebbb55b..00000000000
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-util/gengetopt
- sys-apps/help2man
- virtual/pkgconfig
- test? ( app-crypt/gnupg )
-"
-RDEPEND="
- >=dev-cpp/libxmlpp-2.40.1:2.6
- >=net-misc/curl-7.9.7
- virtual/libiconv
-"
-DEPEND="${RDEPEND}
- >app-text/opensp-1.5
-"
-
-PATCHES=( "${FILESDIR}/${P}-docdir-nothanks.patch" )
-
-# workaround needed for ofxconnect to compile
-MAKEOPTS="-j1"
-
-src_prepare() {
- default
- eautoreconf
- append-cxxflags -std=c++14 # bug #566456
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
- if ! use static-libs; then
- find "${D}" -name '*.a' -type f -delete || die
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libofx/, dev-libs/libofx/files/
@ 2022-09-09 3:35 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-09-09 3:35 UTC (permalink / raw
To: gentoo-commits
commit: c4d47c9df98b4b8693dbf54b2bf8bd9095177c21
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 03:09:34 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 03:09:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d47c9d
dev-libs/libofx: add 0.10.7, drop 0.10.6-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libofx/Manifest | 2 +-
...ix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch | 45 -------------------
...ix-parallel-build-issue-with-ofxconnect-o.patch | 50 ----------------------
...ibofx-0.10.6-r1.ebuild => libofx-0.10.7.ebuild} | 14 +-----
4 files changed, 2 insertions(+), 109 deletions(-)
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index bd8bd434efdf..bded13c24c1a 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,2 +1,2 @@
DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
-DIST libofx-0.10.6.tar.gz 1836880 BLAKE2B 4c5fd24576f969e9ced311e112f183596905bd1225dbfe8646a8f24d545d49fe3b496baadf46e174bfb708ffbaac67b44e746cc8acb8e74509ef5ec22f8f3972 SHA512 8c8a569ca3083c7101c051857d286c3615461fdd88065666d7d6dc53a95d1251a6e5fd44be6cbf54e3591d9ba2b3916c846a4e9e83d6a6c4724e35a193c6a679
+DIST libofx-0.10.7.tar.gz 1420230 BLAKE2B 03a98fa3dc79519a7e84b5c0df1686ef523c2f2209caa4f4cb3e40f2cbac0172956cab107ef4086f0e13aea2898bdd36e7a56140874cbd8a2a88d5634ef988c2 SHA512 da96d24675cf681d007e3d4f7d83f4fc2ca56d991b4128f4e3a870fd66d70302950b24b1e17e78a9795d19704f1af7cd2102929b3290f27204499f42a24502a2
diff --git a/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch b/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
deleted file mode 100644
index 283e852fef0f..000000000000
--- a/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/libofx/libofx/pull/77
-
-From a8326e0800c5c28228624005566ae9f37a775367 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Sep 2022 05:47:00 +0100
-Subject: [PATCH 1/2] autotools: fix LIBOFX_MAJOR_VERSION and friends in
- libofx.h
-
-Closes: https://github.com/libofx/libofx/issues/76
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,17 +8,15 @@ dnl Process this file with autoconf to produce a configure script.
- # FUNCTION:
- # implements checks for a variety of system-specific functions
-
--
--
--LIBOFX_MAJOR_VERSION=0
--LIBOFX_MINOR_VERSION=10
--LIBOFX_MICRO_VERSION=6
--AC_INIT(libofx, 0.10.6) # must repeat the version number here, sorry
-+AC_INIT([libofx], [0.10.6]) # must repeat the version number here, sorry
-+AC_SUBST([LIBOFX_MAJOR_VERSION], [0])
-+AC_SUBST([LIBOFX_MINOR_VERSION], [10])
-+AC_SUBST([LIBOFX_MICRO_VERSION], [6])
-
- LIBOFX_VERSION_RELEASE_STRING="$LIBOFX_MAJOR_VERSION.$LIBOFX_MINOR_VERSION.$LIBOFX_MICRO_VERSION"
-
- AC_CONFIG_SRCDIR(inc/libofx.h.in)
--AM_CONFIG_HEADER(config.h)
-+AM_CONFIG_HEADER([config.h])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(m4)
- AC_PROG_CC
-@@ -57,9 +55,6 @@ CXXFLAGS="-DIN_LIBOFX $CXXFLAGS"
-
- LIBOFX_VERSION=$LIBOFX_MAJOR_VERSION.$LIBOFX_MINOR_VERSION.$LIBOFX_MICRO_VERSION
-
--AC_SUBST(LIBOFX_MAJOR_VERSION)
--AC_SUBST(LIBOFX_MINOR_VERSION)
--AC_SUBST(LIBOFX_MICRO_VERSION)
- LIBOFX_BUILD_VERSION=0
- AC_SUBST(LIBOFX_BUILD_VERSION)
- AC_SUBST(LIBOFX_VERSION_RELEASE_STRING)
diff --git a/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch b/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
deleted file mode 100644
index 8288aac50947..000000000000
--- a/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/libofx/libofx/pull/77
-
-From 55923eba7617c7c4056b21ddf3b569adaea43858 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Sep 2022 06:00:04 +0100
-Subject: [PATCH 2/2] autotools: fix parallel build issue with ofxconnect,
- ofxdump
-
-We need to build the relevant tool before calling help2man, as
-help2man tries to call the tool itself.
-
-Otherwise, we get:
-```
-help2man: can't get `--help' info from ./ofxdump
-Try `--no-discard-stderr' if option outputs to stderr
-make[2]: *** [Makefile:1211: ofxdump.1] Error 127
-make[2]: *** Waiting for unfinished jobs....
-```
-
-Ends up building okay as a workaround with -j1.
-
-Bug: https://github.com/libofx/libofx/pull/56
-See: 0597b8a0a9da3226af0779163fbb3ca389d70bc9
-Fixes: 76dae192b4bf642b311084043cf9d6273dd69bb2
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/ofxconnect/Makefile.am
-+++ b/ofxconnect/Makefile.am
-@@ -23,9 +23,9 @@ EXTRA_DIST = cmdline.ggo test-privateserver.sh CMakeLists.txt
-
- # See README.privateserver for details on this server and how to get
- # the key needed to run this test.
--TESTS = test-privateserver.sh
-+TESTS = test-privateserver.sh
-
--ofxconnect.1: $(top_srcdir)/configure.ac
-+ofxconnect.1: ofxconnect$(EXEEXT)
- if HAVE_HELP2MAN
- $(HELP2MAN) -n 'Create a statement request file' -N --output=ofxconnect.1 ./ofxconnect$(EXEEXT)
- else
---- a/ofxdump/Makefile.am
-+++ b/ofxdump/Makefile.am
-@@ -15,7 +15,7 @@ cmdline.c cmdline.h: cmdline.ggo Makefile
-
- endif
-
--ofxdump.1: $(top_srcdir)/configure.ac
-+ofxdump.1: ofxdump$(EXEEXT)
- if HAVE_HELP2MAN
- $(HELP2MAN) -n 'Dump content of OFX files as human-readable text' -N --output=ofxdump.1 ./ofxdump$(EXEEXT)
- else
diff --git a/dev-libs/libofx/libofx-0.10.6-r1.ebuild b/dev-libs/libofx/libofx-0.10.7.ebuild
similarity index 76%
rename from dev-libs/libofx/libofx-0.10.6-r1.ebuild
rename to dev-libs/libofx/libofx-0.10.7.ebuild
index fb768f5ba89e..87cfdff2482d 100644
--- a/dev-libs/libofx/libofx-0.10.6-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools flag-o-matic
+inherit flag-o-matic
DESCRIPTION="Library to support the Open Financial eXchange XML format"
HOMEPAGE="https://github.com/libofx/libofx"
@@ -31,18 +31,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
- "${FILESDIR}"/${PN}-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
-)
-
-src_prepare() {
- default
-
- # Needed for header version patch
- eautoreconf
-}
-
src_configure() {
# bug #566456
append-cxxflags -std=c++14
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-09 3:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-06 7:24 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libofx/, dev-libs/libofx/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-09-09 3:35 Sam James
2021-03-06 6:28 Sam James
2016-04-14 15:28 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox