1 |
commit: 8afe91df854a6ba393b2dfbaff2e434ada44670f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 1 05:57:59 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 1 05:57:59 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afe91df |
7 |
|
8 |
x11-misc/seetxt: fix build with gcc 10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707402 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
x11-misc/seetxt/files/seetxt-0.72-fno-common.patch | 24 ++++++++++++++++++++++ |
15 |
x11-misc/seetxt/seetxt-0.72-r1.ebuild | 21 +++++++++++-------- |
16 |
2 files changed, 36 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..f1d69b20d42 |
21 |
--- /dev/null |
22 |
+++ b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch |
23 |
@@ -0,0 +1,24 @@ |
24 |
+https://sources.debian.org/patches/see/0.72-7/40-fix_ftbfs.patch/ |
25 |
+https://bugs.gentoo.org/707402 |
26 |
+--- a/src/main.h |
27 |
++++ b/src/main.h |
28 |
+@@ -92,7 +92,8 @@ typedef struct { |
29 |
+ struct matchspec { |
30 |
+ int bgn; |
31 |
+ int end; |
32 |
+-} rgxp; |
33 |
++}; |
34 |
++extern struct matchspec rgxp; |
35 |
+ |
36 |
+ /* see.c */ |
37 |
+ void addtohistory (char *line); |
38 |
+--- a/src/util.c |
39 |
++++ b/src/util.c |
40 |
+@@ -11,6 +11,7 @@ Public License along with this program. |
41 |
+ #include "main.h" |
42 |
+ |
43 |
+ char *EXDline, Me[64]; |
44 |
++struct matchspec rgxp; |
45 |
+ |
46 |
+ int buflen (char *buffer) { |
47 |
+ int blen = strlen(buffer), NofL=0, i; |
48 |
|
49 |
diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild |
50 |
index a61c7e23447..db739453023 100644 |
51 |
--- a/x11-misc/seetxt/seetxt-0.72-r1.ebuild |
52 |
+++ b/x11-misc/seetxt/seetxt-0.72-r1.ebuild |
53 |
@@ -1,9 +1,9 @@ |
54 |
-# Copyright 1999-2014 Gentoo Foundation |
55 |
+# Copyright 1999-2020 Gentoo Authors |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
|
58 |
-EAPI=5 |
59 |
+EAPI=7 |
60 |
|
61 |
-inherit autotools eutils |
62 |
+inherit autotools |
63 |
|
64 |
DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows" |
65 |
HOMEPAGE="https://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/" |
66 |
@@ -12,16 +12,19 @@ SRC_URI="https://seetxt.googlecode.com/files/${P}.tar.bz2" |
67 |
LICENSE="GPL-3" |
68 |
SLOT="0" |
69 |
KEYWORDS="~amd64" |
70 |
-IUSE="" |
71 |
|
72 |
+BDEPEND="virtual/pkgconfig" |
73 |
RDEPEND="x11-libs/gtk+:2" |
74 |
-DEPEND="${RDEPEND} |
75 |
- virtual/pkgconfig" |
76 |
+DEPEND="${RDEPEND}" |
77 |
+ |
78 |
+PATCHES=( |
79 |
+ "${FILESDIR}/${PV}-0001-fix-linking.patch" |
80 |
+ "${FILESDIR}/${PV}-0002-fix-shared-files-install.patch" |
81 |
+ "${FILESDIR}/${PN}-0.72-fno-common.patch" |
82 |
+) |
83 |
|
84 |
src_prepare() { |
85 |
- epatch \ |
86 |
- "${FILESDIR}/${PV}-0001-fix-linking.patch" \ |
87 |
- "${FILESDIR}/${PV}-0002-fix-shared-files-install.patch" |
88 |
+ default |
89 |
eautoreconf |
90 |
} |