1 |
commit: 7ef2291f68b16dd0e5c53ee0e760a39c089e048a |
2 |
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in> |
3 |
AuthorDate: Fri Mar 10 21:23:42 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 3 21:26:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef2291f |
7 |
|
8 |
dev-libs/tvision: Fix gcc-6 compilation errors |
9 |
|
10 |
Gentoo-bug: 594176 |
11 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/4182 |
13 |
|
14 |
.../tvision/files/tvision-2.1.0_pre2-gcc6.patch | 149 +++++++++++++++++++++ |
15 |
dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild | 3 +- |
16 |
2 files changed, 151 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..30f8ade3354 |
21 |
--- /dev/null |
22 |
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch |
23 |
@@ -0,0 +1,149 @@ |
24 |
+Fix gcc-6 compilation errors; bug 594176 |
25 |
+ |
26 |
+--- a/classes/tdesktop.cc |
27 |
++++ b/classes/tdesktop.cc |
28 |
+@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET) |
29 |
+ #define Uses_TVCodePage |
30 |
+ #include <tv.h> |
31 |
+ |
32 |
++#include <cmath> |
33 |
++ |
34 |
++using std::abs; |
35 |
++ |
36 |
+ TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) : |
37 |
+ createBackground( cBackground ) |
38 |
+ { |
39 |
+--- a/classes/tdisplay.cc |
40 |
++++ b/classes/tdisplay.cc |
41 |
+@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes. |
42 |
+ #define Uses_TVCodePage |
43 |
+ #include <tv.h> |
44 |
+ |
45 |
++#include <cmath> |
46 |
++ |
47 |
++using std::abs; |
48 |
++ |
49 |
+ // Remove me please! |
50 |
+ int TDisplay::dual_display=0; |
51 |
+ |
52 |
+--- a/classes/tvtext1.cc |
53 |
++++ b/classes/tvtext1.cc |
54 |
+@@ -110,10 +110,10 @@ |
55 |
+ char TCheckBoxes::button[] = " [ ] "; |
56 |
+ char TCheckBoxes::obutton[] = " [ ] "; |
57 |
+ |
58 |
+-TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178}; // ±þ² |
59 |
+-TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // ±þ² |
60 |
+-TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // ±þ² |
61 |
+-TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // ±þ² |
62 |
++TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ² |
63 |
++TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ² |
64 |
++TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ² |
65 |
++TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ² |
66 |
+ |
67 |
+ char TButton::shadows[] = "\xDC\xDB\xDF"; // ÜÛß |
68 |
+ char TButton::oshadows[] = "\xDC\xDB\xDF"; // ÜÛß |
69 |
+--- a/classes/x11/x11src.cc |
70 |
++++ b/classes/x11/x11src.cc |
71 |
+@@ -94,6 +94,10 @@ |
72 |
+ #define TIMER_ALARM SIGALRM |
73 |
+ #endif |
74 |
+ |
75 |
++#include <cmath> |
76 |
++ |
77 |
++using std::abs; |
78 |
++ |
79 |
+ const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32; |
80 |
+ const int cursorDelay=300000; |
81 |
+ |
82 |
+@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor, |
83 |
+ TScreenX11::leftPtr; |
84 |
+ char TScreenX11::busyCursorMap[]= |
85 |
+ { |
86 |
+- 0xff, 0xff, 0xff, 0x1f, |
87 |
+- 0xfd, 0xff, 0xff, 0x1f, |
88 |
+- 0xf9, 0xff, 0xff, 0x1f, |
89 |
+- 0xf1, 0xff, 0xff, 0x1f, |
90 |
+- 0xe1, 0x7f, 0xc0, 0x1f, |
91 |
+- 0xc1, 0x7f, 0xc0, 0x1f, |
92 |
+- 0x81, 0x3f, 0x80, 0x1f, |
93 |
+- 0x01, 0x9f, 0x3b, 0x1f, |
94 |
+- 0x01, 0xce, 0x7b, 0x1e, |
95 |
+- 0xc1, 0xef, 0xfb, 0x1e, |
96 |
+- 0xc9, 0xef, 0xf1, 0x18, |
97 |
+- 0x9d, 0xef, 0xf1, 0x18, |
98 |
+- 0x9f, 0xef, 0xfe, 0x18, |
99 |
+- 0x3f, 0x6f, 0xff, 0x1e, |
100 |
+- 0x3f, 0xcf, 0x7f, 0x1e, |
101 |
+- 0xff, 0x9f, 0x3f, 0x1f, |
102 |
+- 0xff, 0x3f, 0x80, 0x1f, |
103 |
+- 0xff, 0x7f, 0xc0, 0x1f, |
104 |
+- 0xff, 0x7f, 0xc0, 0x1f, |
105 |
+- 0xff, 0xff, 0xff, 0x1f |
106 |
++ (char)0xff, (char)0xff, (char)0xff, (char)0x1f, |
107 |
++ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f, |
108 |
++ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f, |
109 |
++ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f, |
110 |
++ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f, |
111 |
++ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f, |
112 |
++ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f, |
113 |
++ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f, |
114 |
++ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e, |
115 |
++ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e, |
116 |
++ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18, |
117 |
++ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18, |
118 |
++ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18, |
119 |
++ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e, |
120 |
++ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e, |
121 |
++ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f, |
122 |
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f, |
123 |
++ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f, |
124 |
++ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f, |
125 |
++ (char)0xff, (char)0xff, (char)0xff, (char)0x1f |
126 |
+ }; |
127 |
+ char TScreenX11::busyCursorMask[]= |
128 |
+ { |
129 |
+- 0xfc, 0xff, 0xff, 0x1f, |
130 |
+- 0xf8, 0xff, 0xff, 0x1f, |
131 |
+- 0xf0, 0xff, 0xff, 0x1f, |
132 |
+- 0xe0, 0x3f, 0x80, 0x1f, |
133 |
+- 0xc0, 0x3f, 0x80, 0x1f, |
134 |
+- 0x80, 0x3f, 0x80, 0x1f, |
135 |
+- 0x00, 0x1f, 0x00, 0x1f, |
136 |
+- 0x00, 0x0e, 0x00, 0x1e, |
137 |
+- 0x00, 0x04, 0x00, 0x1c, |
138 |
+- 0x00, 0x04, 0x00, 0x10, |
139 |
+- 0x80, 0x07, 0x00, 0x10, |
140 |
+- 0x08, 0x07, 0x00, 0x10, |
141 |
+- 0x0c, 0x07, 0x00, 0x10, |
142 |
+- 0x1f, 0x06, 0x00, 0x10, |
143 |
+- 0x1f, 0x06, 0x00, 0x1c, |
144 |
+- 0x3f, 0x0f, 0x00, 0x1e, |
145 |
+- 0xff, 0x1f, 0x00, 0x1f, |
146 |
+- 0xff, 0x3f, 0x80, 0x1f, |
147 |
+- 0xff, 0x3f, 0x80, 0x1f, |
148 |
+- 0xff, 0x3f, 0x80, 0x1f |
149 |
++ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f, |
150 |
++ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f, |
151 |
++ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f, |
152 |
++ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f, |
153 |
++ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f, |
154 |
++ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f, |
155 |
++ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f, |
156 |
++ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e, |
157 |
++ (char)0x00, (char)0x04, (char)0x00, (char)0x1c, |
158 |
++ (char)0x00, (char)0x04, (char)0x00, (char)0x10, |
159 |
++ (char)0x80, (char)0x07, (char)0x00, (char)0x10, |
160 |
++ (char)0x08, (char)0x07, (char)0x00, (char)0x10, |
161 |
++ (char)0x0c, (char)0x07, (char)0x00, (char)0x10, |
162 |
++ (char)0x1f, (char)0x06, (char)0x00, (char)0x10, |
163 |
++ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c, |
164 |
++ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e, |
165 |
++ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f, |
166 |
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f, |
167 |
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f, |
168 |
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f |
169 |
+ }; |
170 |
+ |
171 |
+ /* This is the function which creates cursors. On success it return |
172 |
+ |
173 |
|
174 |
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild |
175 |
index b013170a41d..01dccfa54ed 100644 |
176 |
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild |
177 |
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild |
178 |
@@ -1,4 +1,4 @@ |
179 |
-# Copyright 1999-2012 Gentoo Foundation |
180 |
+# Copyright 1999-2017 Gentoo Foundation |
181 |
# Distributed under the terms of the GNU General Public License v2 |
182 |
|
183 |
inherit eutils multilib |
184 |
@@ -24,6 +24,7 @@ src_unpack() { |
185 |
epatch "${FILESDIR}"/${P}-gcc44.patch |
186 |
epatch "${FILESDIR}"/${P}-ldconfig.patch |
187 |
epatch "${FILESDIR}"/${P}-flags.patch |
188 |
+ epatch "${FILESDIR}"/${P}-gcc6.patch |
189 |
} |
190 |
|
191 |
src_compile() { |