[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/files/, sci-calculators/hcalc/
commit: 53e9cc2a47d42da13d71f5f6e40431d705ca95f5 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 28 18:46:45 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 28 20:43:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e9cc2a sci-calculators/hcalc: fix build with clang16 Closes: https://bugs.gentoo.org/870514 Signed-off-by: Ionen Wolkens gentoo.org> .../hcalc/files/hcalc-1.2-clang16.patch| 26 ++ sci-calculators/hcalc/hcalc-1.2-r1.ebuild | 7 -- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/sci-calculators/hcalc/files/hcalc-1.2-clang16.patch b/sci-calculators/hcalc/files/hcalc-1.2-clang16.patch new file mode 100644 index ..19b08726b18e --- /dev/null +++ b/sci-calculators/hcalc/files/hcalc-1.2-clang16.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/870514 +--- a/draw.c b/draw.c +@@ -63,2 +63,3 @@ + ++void + set_bits(int b) +@@ -70,2 +71,3 @@ + ++void + set_string(char *s) +--- a/hcalc.h b/hcalc.h +@@ -37 +37,12 @@ + #define HEIGHT 294 ++ ++void button(int b, int x, int y); ++void complete_paste(char *s, int n); ++void key(char c); ++void load_pixmaps(void); ++void process_input(void); ++void redraw(void); ++void send_current_display(void); ++void set_bits(int b); ++void set_string(char *s); ++void setup_x(int argc, char **argv); diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild index 6a6b90666a0a..b124b7c65f89 100644 --- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild +++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,10 @@ RDEPEND=" x11-libs/libXpm" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-clang16.patch +) pkg_postinst() { einfo "Enter hcalc to run and use kill or ctrl-c to exit."
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/files/, sci-calculators/hcalc/
commit: 2a1d01a2d1aff43310a0bf5337fcfffdaef00914 Author: Jakov Smolic sartura hr> AuthorDate: Sat Nov 28 23:09:09 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Nov 28 23:09:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1d01a2 sci-calculators/hcalc: port to EAPI 7 * Thanks to Jeroen Roovers for submitting the patch. Closes: https://bugs.gentoo.org/709722 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch | 13 + sci-calculators/hcalc/hcalc-1.2-r1.ebuild | 9 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch new file mode 100644 index 000..b8bdcc73e30 --- /dev/null +++ b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch @@ -0,0 +1,13 @@ +--- a/hcalc.h b/hcalc.h +@@ -25,8 +25,8 @@ + extern Pixmap face; + extern Pixmap chars; + +-int bit_on; +-int bit_off; ++extern int bit_on; ++extern int bit_off; + + extern int char_to_x[256]; + extern char charmap[]; diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild index bbd0de3fcfa..6a6b90666a0 100644 --- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild +++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="DJ's Hex Calculator" HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc"; @@ -12,13 +12,14 @@ SRC_URI="https://github.com/downloads/jlec/hcalc/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" RDEPEND=" x11-libs/libX11 x11-libs/libXpm" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + pkg_postinst() { einfo "Enter hcalc to run and use kill or ctrl-c to exit." }