commit: 3d6091d06150c1b7318cbcb7fb472dc942d42848 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Sep 6 05:02:53 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 6 05:03:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6091d0
dev-libs/libofx: fix version in header file; fix parallel build Bug: https://github.com/libofx/libofx/issues/76 Signed-off-by: Sam James <sam <AT> gentoo.org> ...ix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch | 45 ++++++++++++++++++++++ ...ix-parallel-build-issue-with-ofxconnect-o.patch | 34 ++++++++++++++++ ...ibofx-0.10.6.ebuild => libofx-0.10.6-r1.ebuild} | 14 ++++++- 3 files changed, 92 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000000000000..283e852fef0f --- /dev/null +++ b/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch @@ -0,0 +1,45 @@ +https://github.com/libofx/libofx/pull/77 + +From a8326e0800c5c28228624005566ae9f37a775367 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +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 <[email protected]> +--- 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 new file mode 100644 index 000000000000..c6ac9035ff47 --- /dev/null +++ b/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch @@ -0,0 +1,34 @@ +https://github.com/libofx/libofx/pull/77 + +From 8383d1245468db3aa944e77b38b681249073eb6b Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +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. + +Signed-off-by: Sam James <[email protected]> +--- a/ofxconnect/Makefile.am ++++ b/ofxconnect/Makefile.am +@@ -25,7 +25,7 @@ EXTRA_DIST = cmdline.ggo test-privateserver.sh CMakeLists.txt + # the key needed to run this test. + TESTS = test-privateserver.sh + +-ofxconnect.1: $(top_srcdir)/configure.ac ++ofxconnect.1: $(top_srcdir)/configure.ac ofxconnect + 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: $(top_srcdir)/configure.ac ofxdump + 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.ebuild b/dev-libs/libofx/libofx-0.10.6-r1.ebuild similarity index 76% rename from dev-libs/libofx/libofx-0.10.6.ebuild rename to dev-libs/libofx/libofx-0.10.6-r1.ebuild index 87cfdff2482d..fb768f5ba89e 100644 --- a/dev-libs/libofx/libofx-0.10.6.ebuild +++ b/dev-libs/libofx/libofx-0.10.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic DESCRIPTION="Library to support the Open Financial eXchange XML format" HOMEPAGE="https://github.com/libofx/libofx"; @@ -31,6 +31,18 @@ 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
