From 2d97594dad4854ffb0a0045b0d4c2279bbbb30d6 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Mon, 26 Dec 2022 17:23:50 +0100 Subject: sci-libs/libexcelformat: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/731886 Signed-off-by: David Seifert --- .../libexcelformat-101016-Wliteral-suffix.patch | 13 ++++++++++ .../libexcelformat/libexcelformat-101016-r1.ebuild | 26 ++++++++++++++++++++ .../libexcelformat/libexcelformat-101016.ebuild | 28 ---------------------- 3 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 sci-libs/libexcelformat/files/libexcelformat-101016-Wliteral-suffix.patch create mode 100644 sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild delete mode 100644 sci-libs/libexcelformat/libexcelformat-101016.ebuild (limited to 'sci-libs') 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-r1.ebuild b/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild new file mode 100644 index 000000000000..23fb0ef4f630 --- /dev/null +++ b/sci-libs/libexcelformat/libexcelformat-101016-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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" + +PATCHES=( "${FILESDIR}"/${P}-Wliteral-suffix.patch ) + +src_configure() { + tc-export CXX +} + +src_install() { + doheader *.h* + dolib.so libExcelFormat.so* +} diff --git a/sci-libs/libexcelformat/libexcelformat-101016.ebuild b/sci-libs/libexcelformat/libexcelformat-101016.ebuild deleted file mode 100644 index c3014bcdc051..000000000000 --- a/sci-libs/libexcelformat/libexcelformat-101016.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -LICENSE="CPOL" -IUSE="" - -S="${WORKDIR}"/libExcelFormat - -src_prepare() { - default - tc-export CXX -} - -src_install() { - doheader *.h* - - dolib.so libExcelFormat.so* -} -- cgit v1.2.3-65-gdbad