1 |
commit: 95200636f12d2b1a8b5ef65c7719b02822060f39 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Nov 30 21:04:39 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 30 21:04:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95200636 |
7 |
|
8 |
app-editors/hexcurse: fix compilation with GCC 10 |
9 |
|
10 |
* Fixed compilation with GCC10 |
11 |
* Update to EAPI 7 |
12 |
|
13 |
Closes: https://github.com/gentoo/gentoo/pull/16129 |
14 |
Closes: https://bugs.gentoo.org/706762 |
15 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
16 |
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> |
17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
18 |
|
19 |
.../hexcurse/files/hexcurse-1.60.0-gcc10.patch | 41 ++++++++++++++++++++++ |
20 |
app-editors/hexcurse/hexcurse-1.60.0.ebuild | 23 +++++------- |
21 |
2 files changed, 50 insertions(+), 14 deletions(-) |
22 |
|
23 |
diff --git a/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch |
24 |
new file mode 100644 |
25 |
index 00000000000..dfd8f4c2c55 |
26 |
--- /dev/null |
27 |
+++ b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch |
28 |
@@ -0,0 +1,41 @@ |
29 |
+From 9cf7c9dcd012656df949d06f2986b57db3a72bdc Mon Sep 17 00:00:00 2001 |
30 |
+From: "Azamat H. Hackimov" <azamat.hackimov@×××××.com> |
31 |
+Date: Tue, 9 Jun 2020 01:25:04 +0300 |
32 |
+Subject: [PATCH] Fix compilation with GCC 10 |
33 |
+ |
34 |
+Fixed compilation with -fno-common, which enabled in GCC 10 by default. |
35 |
+See https://bugs.gentoo.org/706762. |
36 |
+--- |
37 |
+ include/hex.h | 2 +- |
38 |
+ src/hexcurse.c | 2 ++ |
39 |
+ 2 files changed, 3 insertions(+), 1 deletion(-) |
40 |
+ |
41 |
+diff --git a/include/hex.h b/include/hex.h |
42 |
+index 57845c0..845bac0 100644 |
43 |
+--- a/include/hex.h |
44 |
++++ b/include/hex.h |
45 |
+@@ -126,7 +126,7 @@ extern bool color_enabled; |
46 |
+ #define max(a,b) ((a) >(b) ? (a) : (b)) |
47 |
+ #endif |
48 |
+ |
49 |
+-FILE *fpIN; /* global file ptr */ |
50 |
++extern FILE *fpIN; /* global file ptr */ |
51 |
+ |
52 |
+ /* function prototypes */ |
53 |
+ |
54 |
+diff --git a/src/hexcurse.c b/src/hexcurse.c |
55 |
+index e723ddc..3c167b6 100644 |
56 |
+--- a/src/hexcurse.c |
57 |
++++ b/src/hexcurse.c |
58 |
+@@ -27,6 +27,8 @@ |
59 |
+ /*#define DEBUG_LLIST*/ |
60 |
+ /*#define DEBUG_GOTO*/ |
61 |
+ |
62 |
++FILE *fpIN; |
63 |
++ |
64 |
+ int BASE, MAXY, resize = 0; |
65 |
+ int MIN_ADDR_LENGTH; |
66 |
+ hexList *head; /* linked list struct */ |
67 |
+-- |
68 |
+2.26.2 |
69 |
+ |
70 |
|
71 |
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild |
72 |
index 95d89712514..3512038ef7e 100644 |
73 |
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild |
74 |
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild |
75 |
@@ -1,7 +1,8 @@ |
76 |
# Copyright 1999-2020 Gentoo Authors |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
|
79 |
-EAPI=6 |
80 |
+EAPI=7 |
81 |
+ |
82 |
inherit autotools |
83 |
|
84 |
DESCRIPTION="ncurses based hex editor" |
85 |
@@ -12,23 +13,17 @@ LICENSE="GPL-2" |
86 |
SLOT="0" |
87 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
88 |
|
89 |
-RDEPEND=" |
90 |
- >=sys-libs/ncurses-5.2:0= |
91 |
-" |
92 |
-DEPEND=" |
93 |
- ${RDEPEND} |
94 |
-" |
95 |
+RDEPEND=">=sys-libs/ncurses-5.2:0=" |
96 |
+DEPEND="${RDEPEND}" |
97 |
+ |
98 |
PATCHES=( |
99 |
- "${FILESDIR}"/${PN}-1.60.0-Werror.patch |
100 |
- "${FILESDIR}"/${PN}-1.60.0-tinfo.patch |
101 |
+ "${FILESDIR}"/${P}-Werror.patch |
102 |
+ "${FILESDIR}"/${P}-tinfo.patch |
103 |
+ "${FILESDIR}"/${P}-gcc10.patch |
104 |
) |
105 |
|
106 |
src_prepare() { |
107 |
default |
108 |
+ rm README.Irix || die |
109 |
eautoreconf |
110 |
} |
111 |
- |
112 |
-src_install() { |
113 |
- emake install DESTDIR="${D}" |
114 |
- dodoc AUTHORS ChangeLog NEWS README |
115 |
-} |