1 |
commit: 95708ebf53cd9d24a8ad11f6ccea6fca8818fafc |
2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 1 18:12:04 2021 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 18:12:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95708ebf |
7 |
|
8 |
sys-fs/lde: fix ncurses[tinfo], fix -fno-common, EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/692966 |
11 |
Closes: https://bugs.gentoo.org/692966 |
12 |
Closes: https://bugs.gentoo.org/690512 |
13 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
14 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
15 |
|
16 |
sys-fs/lde/files/lde-2.6.1-fno-common.patch | 32 +++++++++++++++++++++++++++++ |
17 |
sys-fs/lde/files/lde-2.6.1-respect-ar.patch | 11 ++++++++++ |
18 |
sys-fs/lde/files/lde-2.6.1-tinfo.patch | 22 ++++++++++++++++++++ |
19 |
sys-fs/lde/lde-2.6.1-r1.ebuild | 25 +++++++++++++++++----- |
20 |
4 files changed, 85 insertions(+), 5 deletions(-) |
21 |
|
22 |
diff --git a/sys-fs/lde/files/lde-2.6.1-fno-common.patch b/sys-fs/lde/files/lde-2.6.1-fno-common.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..8e246aea95a |
25 |
--- /dev/null |
26 |
+++ b/sys-fs/lde/files/lde-2.6.1-fno-common.patch |
27 |
@@ -0,0 +1,32 @@ |
28 |
+--- a/src/lde.h |
29 |
++++ b/src/lde.h |
30 |
+@@ -211,7 +211,7 @@ struct fs_constants { |
31 |
+ }; |
32 |
+ |
33 |
+ /* File system specific commands */ |
34 |
+-struct { |
35 |
++struct _FS_cmd { |
36 |
+ /* Check if inode is marked in use */ |
37 |
+ int (*inode_in_use)(unsigned long n); |
38 |
+ /* Check if data zone/block is marked in use */ |
39 |
+@@ -231,7 +231,9 @@ struct { |
40 |
+ unsigned long (*map_inode)(unsigned long n); |
41 |
+ /* Map block number in file chain to physical block on disk */ |
42 |
+ int (*map_block)(unsigned long zone_index[], unsigned long blknr, unsigned long *mapped_block); |
43 |
+-} FS_cmd; |
44 |
++}; |
45 |
++ |
46 |
++extern struct _FS_cmd FS_cmd; |
47 |
+ |
48 |
+ /* Flags */ |
49 |
+ struct _lde_flags { |
50 |
+--- a/src/main_lde.c |
51 |
++++ b/src/main_lde.c |
52 |
+@@ -90,6 +90,7 @@ int (*mgetch)(void) = tty_mgetch; |
53 |
+ |
54 |
+ struct _lde_typedata lde_typedata[] = LDE_ALLTYPES; |
55 |
+ |
56 |
++struct _FS_cmd FS_cmd; |
57 |
+ |
58 |
+ /* Check if device is mounted, return 1 if is mounted else 0 */ |
59 |
+ static int check_mount(char *device_name) |
60 |
|
61 |
diff --git a/sys-fs/lde/files/lde-2.6.1-respect-ar.patch b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch |
62 |
new file mode 100644 |
63 |
index 00000000000..104aaf45b77 |
64 |
--- /dev/null |
65 |
+++ b/sys-fs/lde/files/lde-2.6.1-respect-ar.patch |
66 |
@@ -0,0 +1,11 @@ |
67 |
+--- a/macros/configure.in |
68 |
++++ b/macros/configure.in |
69 |
+@@ -30,7 +30,7 @@ AC_PROG_CC |
70 |
+ AC_PROG_INSTALL |
71 |
+ AC_PROG_MAKE_SET |
72 |
+ AC_PATH_PROG(RM, rm, rm) |
73 |
+-AC_PATH_PROG(AR, ar, ar) |
74 |
++AM_PROG_AR |
75 |
+ |
76 |
+ AC_CHECK_PROG(system,uname,`uname`,unknown) |
77 |
+ |
78 |
|
79 |
diff --git a/sys-fs/lde/files/lde-2.6.1-tinfo.patch b/sys-fs/lde/files/lde-2.6.1-tinfo.patch |
80 |
new file mode 100644 |
81 |
index 00000000000..bb4c6c2386c |
82 |
--- /dev/null |
83 |
+++ b/sys-fs/lde/files/lde-2.6.1-tinfo.patch |
84 |
@@ -0,0 +1,22 @@ |
85 |
+--- a/macros/configure.in |
86 |
++++ b/macros/configure.in |
87 |
+@@ -14,7 +14,6 @@ AC_SUBST(STATIC_LDFLAGS) |
88 |
+ AC_DEFINE(_GNU_SOURCE) |
89 |
+ |
90 |
+ dnl Must use builtin() as it is overridden by some AC_ macros |
91 |
+-builtin(include,./curses.m4) |
92 |
+ builtin(include,./misctests.m4) |
93 |
+ |
94 |
+ dnl Search for ncurses by default |
95 |
+@@ -187,7 +186,10 @@ AC_ARG_WITH(gpm, |
96 |
+ dnl ------------------------------------------------------------------ |
97 |
+ dnl Search for some version of curses |
98 |
+ dnl ------------------------------------------------------------------ |
99 |
+-AC_CHECK_CURSES |
100 |
++has_curses=false |
101 |
++AC_SUBST(CURSES_INCLUDEDIR) |
102 |
++AC_SUBST(CURSES_LIBS) |
103 |
++PKG_CHECK_MODULES(ncurses, ncurses, [CURSES_LIBS="$ncurses_LIBS" CURSES_INCLUDEDIR="$ncurses_CFLAGS" has_curses=true]) |
104 |
+ if test "$has_curses" = true |
105 |
+ then |
106 |
+ AC_DEFINE(LDE_CURSES) |
107 |
|
108 |
diff --git a/sys-fs/lde/lde-2.6.1-r1.ebuild b/sys-fs/lde/lde-2.6.1-r1.ebuild |
109 |
index 30c88f3438e..ed69cd92632 100644 |
110 |
--- a/sys-fs/lde/lde-2.6.1-r1.ebuild |
111 |
+++ b/sys-fs/lde/lde-2.6.1-r1.ebuild |
112 |
@@ -1,7 +1,9 @@ |
113 |
-# Copyright 1999-2017 Gentoo Foundation |
114 |
+# Copyright 1999-2021 Gentoo Authors |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
|
117 |
-EAPI=6 |
118 |
+EAPI=7 |
119 |
+ |
120 |
+inherit autotools |
121 |
|
122 |
DESCRIPTION="ext2fs and minix disk editor for linux" |
123 |
HOMEPAGE="http://lde.sourceforge.net/" |
124 |
@@ -12,20 +14,33 @@ SLOT="0" |
125 |
KEYWORDS="~amd64 ~x86" |
126 |
|
127 |
RDEPEND="sys-libs/ncurses:0=" |
128 |
-DEPEND=" |
129 |
- ${RDEPEND} |
130 |
- dev-util/yacc" |
131 |
+DEPEND="${RDEPEND}" |
132 |
+BDEPEND=" |
133 |
+ virtual/pkgconfig |
134 |
+ virtual/yacc |
135 |
+" |
136 |
|
137 |
S="${WORKDIR}/${PN}" |
138 |
|
139 |
PATCHES=( |
140 |
"${FILESDIR}/${P}-no-shadowing.patch" |
141 |
+ "${FILESDIR}/${P}-fno-common.patch" |
142 |
+ "${FILESDIR}/${P}-tinfo.patch" |
143 |
+ "${FILESDIR}/${P}-respect-ar.patch" |
144 |
) |
145 |
|
146 |
DOCS=( WARNING README TODO COPYING ) |
147 |
|
148 |
RESTRICT="test" |
149 |
|
150 |
+src_prepare() { |
151 |
+ default |
152 |
+ |
153 |
+ cd macros || die |
154 |
+ mv configure.{in,ac} || die |
155 |
+ eautoreconf |
156 |
+} |
157 |
+ |
158 |
src_install() { |
159 |
dosbin "${PN}" |
160 |
newman "doc/${PN}.man" "${PN}.8" |