commit: 2d97594dad4854ffb0a0045b0d4c2279bbbb30d6 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Dec 26 16:23:50 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 26 16:23:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d97594d
sci-libs/libexcelformat: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/731886 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/libexcelformat-101016-Wliteral-suffix.patch | 13 +++++++++++++ ...ormat-101016.ebuild => libexcelformat-101016-r1.ebuild} | 14 ++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sci-libs/libexcelformat/files/libexcelformat-101016-Wliteral-suffix.patch b/sci-libs/libexcelformat/files/libexcelformat-101016-Wliteral-suffix.patch new file mode 100644 index 000000000000..9ce8f4a7aa85 --- /dev/null +++ b/sci-libs/libexcelformat/files/libexcelformat-101016-Wliteral-suffix.patch @@ -0,0 +1,13 @@ +Fix -Wliteral-suffix (#731886) + +--- a/BasicExcel.cpp ++++ b/BasicExcel.cpp +@@ -4913,7 +4913,7 @@ + do + { + char sname[50]; +- sprintf(sname, "Sheet"FMT_SIZE_T, sheetNo++); ++ sprintf(sname, "Sheet" FMT_SIZE_T, sheetNo++); + yesheet = AddWorksheet(sname, sheetIndex); + } while (!yesheet); + return yesheet; diff --git a/sci-libs/libexcelformat/libexcelformat-101016.ebuild b/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild similarity index 75% rename from sci-libs/libexcelformat/libexcelformat-101016.ebuild rename to sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild index c3014bcdc051..23fb0ef4f630 100644 --- a/sci-libs/libexcelformat/libexcelformat-101016.ebuild +++ b/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild @@ -1,28 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="reading, writing, and editing of XLS (BIFF8 format) files using C++" HOMEPAGE="https://www.codeproject.com/Articles/42504/ExcelFormat-Library"; SRC_URI="mirror://gentoo/${P}.tar.bz2" +S="${WORKDIR}/libExcelFormat" +LICENSE="CPOL" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="CPOL" -IUSE="" -S="${WORKDIR}"/libExcelFormat +PATCHES=( "${FILESDIR}"/${P}-Wliteral-suffix.patch ) -src_prepare() { - default +src_configure() { tc-export CXX } src_install() { doheader *.h* - dolib.so libExcelFormat.so* }
