1 |
commit: e125c1114ab32762846f27af587a8bdb22a985ef |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 14:47:51 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 14:47:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e125c111 |
7 |
|
8 |
app-misc/vcp: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707464 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
app-misc/vcp/files/vcp-2.2-fno-common.patch | 47 +++++++++++++++++++++++++++++ |
16 |
app-misc/vcp/vcp-2.2-r2.ebuild | 8 +++-- |
17 |
2 files changed, 52 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/vcp/files/vcp-2.2-fno-common.patch b/app-misc/vcp/files/vcp-2.2-fno-common.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..394cbaede85 |
22 |
--- /dev/null |
23 |
+++ b/app-misc/vcp/files/vcp-2.2-fno-common.patch |
24 |
@@ -0,0 +1,47 @@ |
25 |
+--- a/common.h |
26 |
++++ b/common.h |
27 |
+@@ -23,8 +23,8 @@ |
28 |
+ #define T_DIR 1 /* -> DIR */ |
29 |
+ #define T_NED 2 /* DIR -> NON-EXISTENT DIR */ |
30 |
+ |
31 |
+-WINDOW *mainw; |
32 |
+-WINDOW *logw; |
33 |
++extern WINDOW *mainw; |
34 |
++extern WINDOW *logw; |
35 |
+ |
36 |
+ struct dest_new { |
37 |
+ char *opath; |
38 |
+--- a/log.c |
39 |
++++ b/log.c |
40 |
+@@ -13,6 +13,8 @@ |
41 |
+ #include "screen.h" |
42 |
+ #include "color.h" |
43 |
+ |
44 |
++extern WINDOW *logw; |
45 |
++ |
46 |
+ int logaddi(int code, char *base, int var, int var2) { |
47 |
+ |
48 |
+ if(code == LOG_VRB && !vflag) |
49 |
+--- a/misc.c |
50 |
++++ b/misc.c |
51 |
+@@ -22,6 +22,8 @@ |
52 |
+ #include "color.h" |
53 |
+ #include "screen.h" |
54 |
+ |
55 |
++extern WINDOW *logw; |
56 |
++ |
57 |
+ int statit(char *path,struct stat *st,int cmdline) { |
58 |
+ if(Rflag) { |
59 |
+ if(pflag || ((Hflag) && !cmdline)) |
60 |
+--- a/screen.c |
61 |
++++ b/screen.c |
62 |
+@@ -17,6 +17,9 @@ |
63 |
+ int winw,winh,mainww; |
64 |
+ int mainwsbw; /* width of status bar */ |
65 |
+ |
66 |
++WINDOW *mainw; |
67 |
++WINDOW *logw; |
68 |
++ |
69 |
+ /* create windows, draw border and title */ |
70 |
+ void scrn_draw() { |
71 |
+ int dev_null; |
72 |
|
73 |
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild |
74 |
index c53cc103faa..686e5ab2df4 100644 |
75 |
--- a/app-misc/vcp/vcp-2.2-r2.ebuild |
76 |
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild |
77 |
@@ -1,7 +1,7 @@ |
78 |
-# Copyright 1999-2018 Gentoo Foundation |
79 |
+# Copyright 1999-2020 Gentoo Authors |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
|
82 |
-EAPI=6 |
83 |
+EAPI=7 |
84 |
|
85 |
inherit flag-o-matic toolchain-funcs |
86 |
|
87 |
@@ -17,8 +17,10 @@ DEPEND="sys-libs/ncurses:0=" |
88 |
RDEPEND="${DEPEND}" |
89 |
|
90 |
DOCS=( Changelog README INSTALL ) |
91 |
+ |
92 |
PATCHES=( |
93 |
- "${FILESDIR}"/${PN}-2.2-tinfo.patch |
94 |
+ "${FILESDIR}"/${P}-tinfo.patch |
95 |
+ "${FILESDIR}"/${P}-fno-common.patch |
96 |
) |
97 |
|
98 |
src_compile() { |