Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/files/, sci-calculators/hcalc/
Date: Wed, 28 Sep 2022 20:44:16
Message-Id: 1664397798.53e9cc2a47d42da13d71f5f6e40431d705ca95f5.ionen@gentoo
1 commit: 53e9cc2a47d42da13d71f5f6e40431d705ca95f5
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 28 18:46:45 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 28 20:43:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e9cc2a
7
8 sci-calculators/hcalc: fix build with clang16
9
10 Closes: https://bugs.gentoo.org/870514
11 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
12
13 .../hcalc/files/hcalc-1.2-clang16.patch | 26 ++++++++++++++++++++++
14 sci-calculators/hcalc/hcalc-1.2-r1.ebuild | 7 ++++--
15 2 files changed, 31 insertions(+), 2 deletions(-)
16
17 diff --git a/sci-calculators/hcalc/files/hcalc-1.2-clang16.patch b/sci-calculators/hcalc/files/hcalc-1.2-clang16.patch
18 new file mode 100644
19 index 000000000000..19b08726b18e
20 --- /dev/null
21 +++ b/sci-calculators/hcalc/files/hcalc-1.2-clang16.patch
22 @@ -0,0 +1,26 @@
23 +https://bugs.gentoo.org/870514
24 +--- a/draw.c
25 ++++ b/draw.c
26 +@@ -63,2 +63,3 @@
27 +
28 ++void
29 + set_bits(int b)
30 +@@ -70,2 +71,3 @@
31 +
32 ++void
33 + set_string(char *s)
34 +--- a/hcalc.h
35 ++++ b/hcalc.h
36 +@@ -37 +37,12 @@
37 + #define HEIGHT 294
38 ++
39 ++void button(int b, int x, int y);
40 ++void complete_paste(char *s, int n);
41 ++void key(char c);
42 ++void load_pixmaps(void);
43 ++void process_input(void);
44 ++void redraw(void);
45 ++void send_current_display(void);
46 ++void set_bits(int b);
47 ++void set_string(char *s);
48 ++void setup_x(int argc, char **argv);
49
50 diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
51 index 6a6b90666a0a..b124b7c65f89 100644
52 --- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
53 +++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
54 @@ -1,4 +1,4 @@
55 -# Copyright 1999-2020 Gentoo Authors
56 +# Copyright 1999-2022 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 EAPI=7
60 @@ -18,7 +18,10 @@ RDEPEND="
61 x11-libs/libXpm"
62 DEPEND="${RDEPEND}"
63
64 -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
65 +PATCHES=(
66 + "${FILESDIR}"/${P}-fno-common.patch
67 + "${FILESDIR}"/${P}-clang16.patch
68 +)
69
70 pkg_postinst() {
71 einfo "Enter hcalc to run and use kill or ctrl-c to exit."