1 |
commit: 9bd3d07890af7ef0cb3ca1a6e9f952e4bd865fd7 |
2 |
Author: Takuto Yoshida <otakuto.gentoo <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Nov 27 13:57:48 2017 +0000 |
4 |
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 27 15:56:16 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd3d078 |
7 |
|
8 |
net-misc/tigervnc: remove 1.7.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/6316 |
12 |
|
13 |
net-misc/tigervnc/Manifest | 6 +- |
14 |
.../files/tigervnc-1.7.1-xserver119-compat.patch | 446 --------------------- |
15 |
net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild | 189 --------- |
16 |
net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild | 192 --------- |
17 |
4 files changed, 2 insertions(+), 831 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest |
20 |
index d6166e3e13d..b2eb9321a90 100644 |
21 |
--- a/net-misc/tigervnc/Manifest |
22 |
+++ b/net-misc/tigervnc/Manifest |
23 |
@@ -1,5 +1,3 @@ |
24 |
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481 |
25 |
-DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc |
26 |
-DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a WHIRLPOOL 4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0 |
27 |
-DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c |
28 |
+DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 |
29 |
+DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a |
30 |
DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 |
31 |
|
32 |
diff --git a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch |
33 |
deleted file mode 100644 |
34 |
index 192344257a5..00000000000 |
35 |
--- a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch |
36 |
+++ /dev/null |
37 |
@@ -1,446 +0,0 @@ |
38 |
-From 3fed95eda27dfbeee6535f987f5d14a66f64749b Mon Sep 17 00:00:00 2001 |
39 |
-From: Hans de Goede <hdegoede@××××××.com> |
40 |
-Date: Wed, 5 Oct 2016 11:15:27 +0200 |
41 |
-Subject: [PATCH] Add xorg-xserver 1.19 support |
42 |
- |
43 |
---- |
44 |
- unix/xserver/hw/vnc/XserverDesktop.cc | 183 ++++++++++++++++++++++++++++++++++ |
45 |
- unix/xserver/hw/vnc/XserverDesktop.h | 7 ++ |
46 |
- unix/xserver/hw/vnc/vncBlockHandler.c | 19 ++++ |
47 |
- unix/xserver/hw/vnc/vncExtInit.cc | 13 +++ |
48 |
- unix/xserver/hw/vnc/vncExtInit.h | 5 + |
49 |
- unix/xserver/hw/vnc/vncHooks.c | 21 +++- |
50 |
- unix/xserver/hw/vnc/xorg-version.h | 4 +- |
51 |
- unix/xserver119.patch | 95 ++++++++++++++++++ |
52 |
- 8 files changed, 343 insertions(+), 4 deletions(-) |
53 |
- create mode 100644 unix/xserver119.patch |
54 |
- |
55 |
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc |
56 |
-index 4f82a54..8cc0b0b 100644 |
57 |
---- a/unix/xserver/hw/vnc/XserverDesktop.cc |
58 |
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc |
59 |
-@@ -90,6 +90,30 @@ class FileHTTPServer : public rfb::HTTPServer { |
60 |
- XserverDesktop* desktop; |
61 |
- }; |
62 |
- |
63 |
-+#if XORG >= 119 |
64 |
-+extern "C" { |
65 |
-+/* |
66 |
-+ * xserver NotifyFd callbacks. Note we also expect write notifies to work, |
67 |
-+ * which only works with xserver >= 1.19. |
68 |
-+ */ |
69 |
-+#include "os.h" |
70 |
-+ |
71 |
-+static void HandleListenFd(int fd, int xevents, void *data) |
72 |
-+{ |
73 |
-+ XserverDesktop *desktop = (XserverDesktop *)data; |
74 |
-+ |
75 |
-+ desktop->handleListenFd(fd); |
76 |
-+} |
77 |
-+ |
78 |
-+static void HandleSocketFd(int fd, int xevents, void *data) |
79 |
-+{ |
80 |
-+ XserverDesktop *desktop = (XserverDesktop *)data; |
81 |
-+ |
82 |
-+ desktop->handleSocketFd(fd, xevents); |
83 |
-+} |
84 |
-+ |
85 |
-+} |
86 |
-+#endif |
87 |
- |
88 |
- XserverDesktop::XserverDesktop(int screenIndex_, |
89 |
- std::list<network::TcpListener*> listeners_, |
90 |
-@@ -111,15 +135,35 @@ XserverDesktop::XserverDesktop(int screenIndex_, |
91 |
- |
92 |
- if (!httpListeners.empty ()) |
93 |
- httpServer = new FileHTTPServer(this); |
94 |
-+ |
95 |
-+#if XORG >= 119 |
96 |
-+ for (std::list<TcpListener*>::iterator i = listeners.begin(); |
97 |
-+ i != listeners.end(); |
98 |
-+ i++) { |
99 |
-+ SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this); |
100 |
-+ } |
101 |
-+ |
102 |
-+ for (std::list<TcpListener*>::iterator i = httpListeners.begin(); |
103 |
-+ i != httpListeners.end(); |
104 |
-+ i++) { |
105 |
-+ SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this); |
106 |
-+ } |
107 |
-+#endif |
108 |
- } |
109 |
- |
110 |
- XserverDesktop::~XserverDesktop() |
111 |
- { |
112 |
- while (!listeners.empty()) { |
113 |
-+#if XORG >= 119 |
114 |
-+ RemoveNotifyFd(listeners.back()->getFd()); |
115 |
-+#endif |
116 |
- delete listeners.back(); |
117 |
- listeners.pop_back(); |
118 |
- } |
119 |
- while (!httpListeners.empty()) { |
120 |
-+#if XORG >= 119 |
121 |
-+ RemoveNotifyFd(listeners.back()->getFd()); |
122 |
-+#endif |
123 |
- delete httpListeners.back(); |
124 |
- httpListeners.pop_back(); |
125 |
- } |
126 |
-@@ -389,6 +433,140 @@ void XserverDesktop::add_copied(const rfb::Region &dest, const rfb::Point &delta |
127 |
- } |
128 |
- } |
129 |
- |
130 |
-+#if XORG >= 119 |
131 |
-+void XserverDesktop::handleListenFd(int fd) |
132 |
-+{ |
133 |
-+ std::list<TcpListener*>::iterator i; |
134 |
-+ SocketServer *fd_server = NULL; |
135 |
-+ bool is_http = false; |
136 |
-+ |
137 |
-+ for (i = listeners.begin(); i != listeners.end(); i++) { |
138 |
-+ if ((*i)->getFd() == fd) { |
139 |
-+ fd_server = server; |
140 |
-+ break; |
141 |
-+ } |
142 |
-+ } |
143 |
-+ if (httpServer && !fd_server) { |
144 |
-+ for (i = httpListeners.begin(); i != httpListeners.end(); i++) { |
145 |
-+ if ((*i)->getFd() == fd) { |
146 |
-+ fd_server = httpServer; |
147 |
-+ is_http = true; |
148 |
-+ break; |
149 |
-+ } |
150 |
-+ } |
151 |
-+ } |
152 |
-+ if (!fd_server) { |
153 |
-+ vlog.error("XserverDesktop::handleListenFd: Error cannot find fd"); |
154 |
-+ return; |
155 |
-+ } |
156 |
-+ |
157 |
-+ Socket* sock = (*i)->accept(); |
158 |
-+ sock->outStream().setBlocking(false); |
159 |
-+ vlog.debug("new %sclient, sock %d", is_http ? "http " : "", sock->getFd()); |
160 |
-+ fd_server->addSocket(sock); |
161 |
-+ SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this); |
162 |
-+} |
163 |
-+ |
164 |
-+void XserverDesktop::handleSocketFd(int fd, int xevents) |
165 |
-+{ |
166 |
-+ std::list<Socket*> sockets; |
167 |
-+ std::list<Socket*>::iterator i; |
168 |
-+ SocketServer *fd_server = NULL; |
169 |
-+ bool is_http = false; |
170 |
-+ |
171 |
-+ server->getSockets(&sockets); |
172 |
-+ for (i = sockets.begin(); i != sockets.end(); i++) { |
173 |
-+ if ((*i)->getFd() == fd) { |
174 |
-+ fd_server = server; |
175 |
-+ break; |
176 |
-+ } |
177 |
-+ } |
178 |
-+ if (httpServer && !fd_server) { |
179 |
-+ httpServer->getSockets(&sockets); |
180 |
-+ for (i = sockets.begin(); i != sockets.end(); i++) { |
181 |
-+ if ((*i)->getFd() == fd) { |
182 |
-+ fd_server = httpServer; |
183 |
-+ is_http = true; |
184 |
-+ break; |
185 |
-+ } |
186 |
-+ } |
187 |
-+ } |
188 |
-+ if (!fd_server) { |
189 |
-+ vlog.error("XserverDesktop::handleSocketFd: Error cannot find fd"); |
190 |
-+ return; |
191 |
-+ } |
192 |
-+ |
193 |
-+ if (xevents & X_NOTIFY_READ) |
194 |
-+ fd_server->processSocketReadEvent(*i); |
195 |
-+ |
196 |
-+ if (xevents & X_NOTIFY_WRITE) |
197 |
-+ fd_server->processSocketWriteEvent(*i); |
198 |
-+ |
199 |
-+ if ((*i)->isShutdown()) { |
200 |
-+ vlog.debug("%sclient gone, sock %d", is_http ? "http " : "", fd); |
201 |
-+ RemoveNotifyFd(fd); |
202 |
-+ fd_server->removeSocket(*i); |
203 |
-+ if (!is_http) |
204 |
-+ vncClientGone(fd); |
205 |
-+ delete (*i); |
206 |
-+ } |
207 |
-+} |
208 |
-+ |
209 |
-+void XserverDesktop::blockHandler(int* timeout) |
210 |
-+{ |
211 |
-+ // We don't have a good callback for when we can init input devices[1], |
212 |
-+ // so we abuse the fact that this routine will be called first thing |
213 |
-+ // once the dix is done initialising. |
214 |
-+ // [1] Technically Xvnc has InitInput(), but libvnc.so has nothing. |
215 |
-+ vncInitInputDevice(); |
216 |
-+ |
217 |
-+ try { |
218 |
-+ std::list<Socket*> sockets; |
219 |
-+ std::list<Socket*>::iterator i; |
220 |
-+ server->getSockets(&sockets); |
221 |
-+ for (i = sockets.begin(); i != sockets.end(); i++) { |
222 |
-+ int fd = (*i)->getFd(); |
223 |
-+ if ((*i)->isShutdown()) { |
224 |
-+ vlog.debug("client gone, sock %d",fd); |
225 |
-+ server->removeSocket(*i); |
226 |
-+ vncClientGone(fd); |
227 |
-+ delete (*i); |
228 |
-+ } else { |
229 |
-+ /* Update existing NotifyFD to listen for write (or not) */ |
230 |
-+ if ((*i)->outStream().bufferUsage() > 0) |
231 |
-+ SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this); |
232 |
-+ else |
233 |
-+ SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this); |
234 |
-+ } |
235 |
-+ } |
236 |
-+ if (httpServer) { |
237 |
-+ httpServer->getSockets(&sockets); |
238 |
-+ for (i = sockets.begin(); i != sockets.end(); i++) { |
239 |
-+ int fd = (*i)->getFd(); |
240 |
-+ if ((*i)->isShutdown()) { |
241 |
-+ vlog.debug("http client gone, sock %d",fd); |
242 |
-+ httpServer->removeSocket(*i); |
243 |
-+ delete (*i); |
244 |
-+ } else { |
245 |
-+ /* Update existing NotifyFD to listen for write (or not) */ |
246 |
-+ if ((*i)->outStream().bufferUsage() > 0) |
247 |
-+ SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this); |
248 |
-+ else |
249 |
-+ SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this); |
250 |
-+ } |
251 |
-+ } |
252 |
-+ } |
253 |
-+ |
254 |
-+ int nextTimeout = server->checkTimeouts(); |
255 |
-+ if (nextTimeout > 0 && (*timeout == -1 || nextTimeout < *timeout)) |
256 |
-+ *timeout = nextTimeout; |
257 |
-+ } catch (rdr::Exception& e) { |
258 |
-+ vlog.error("XserverDesktop::blockHandler: %s",e.str()); |
259 |
-+ } |
260 |
-+} |
261 |
-+ |
262 |
-+#else |
263 |
-+ |
264 |
- void XserverDesktop::readBlockHandler(fd_set* fds, struct timeval ** timeout) |
265 |
- { |
266 |
- // We don't have a good callback for when we can init input devices[1], |
267 |
-@@ -603,10 +781,15 @@ void XserverDesktop::writeWakeupHandler(fd_set* fds, int nfds) |
268 |
- } |
269 |
- } |
270 |
- |
271 |
-+#endif |
272 |
-+ |
273 |
- void XserverDesktop::addClient(Socket* sock, bool reverse) |
274 |
- { |
275 |
- vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse); |
276 |
- server->addSocket(sock, reverse); |
277 |
-+#if XORG >= 119 |
278 |
-+ SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this); |
279 |
-+#endif |
280 |
- } |
281 |
- |
282 |
- void XserverDesktop::disconnectClients() |
283 |
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h |
284 |
-index c069028..9e77627 100644 |
285 |
---- a/unix/xserver/hw/vnc/XserverDesktop.h |
286 |
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h |
287 |
-@@ -38,6 +38,7 @@ |
288 |
- #include <rfb/VNCServerST.h> |
289 |
- #include <rdr/SubstitutingInStream.h> |
290 |
- #include "Input.h" |
291 |
-+#include "xorg-version.h" |
292 |
- |
293 |
- namespace rfb { |
294 |
- class VNCServerST; |
295 |
-@@ -69,10 +70,16 @@ class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer, |
296 |
- const unsigned char *rgbaData); |
297 |
- void add_changed(const rfb::Region ®ion); |
298 |
- void add_copied(const rfb::Region &dest, const rfb::Point &delta); |
299 |
-+#if XORG >= 119 |
300 |
-+ void handleListenFd(int fd); |
301 |
-+ void handleSocketFd(int fd, int xevents); |
302 |
-+ void blockHandler(int* timeout); |
303 |
-+#else |
304 |
- void readBlockHandler(fd_set* fds, struct timeval ** timeout); |
305 |
- void readWakeupHandler(fd_set* fds, int nfds); |
306 |
- void writeBlockHandler(fd_set* fds, struct timeval ** timeout); |
307 |
- void writeWakeupHandler(fd_set* fds, int nfds); |
308 |
-+#endif |
309 |
- void addClient(network::Socket* sock, bool reverse); |
310 |
- void disconnectClients(); |
311 |
- |
312 |
-diff --git a/unix/xserver/hw/vnc/vncBlockHandler.c b/unix/xserver/hw/vnc/vncBlockHandler.c |
313 |
-index 4e44478..baebc3d 100644 |
314 |
---- a/unix/xserver/hw/vnc/vncBlockHandler.c |
315 |
-+++ b/unix/xserver/hw/vnc/vncBlockHandler.c |
316 |
-@@ -30,6 +30,23 @@ |
317 |
- |
318 |
- #include "vncExtInit.h" |
319 |
- #include "vncBlockHandler.h" |
320 |
-+#include "xorg-version.h" |
321 |
-+ |
322 |
-+#if XORG >= 119 |
323 |
-+ |
324 |
-+static void vncBlockHandler(void* data, void* timeout) |
325 |
-+{ |
326 |
-+ vncCallBlockHandlers(timeout); |
327 |
-+} |
328 |
-+ |
329 |
-+void vncRegisterBlockHandlers(void) |
330 |
-+{ |
331 |
-+ if (!RegisterBlockAndWakeupHandlers(vncBlockHandler, |
332 |
-+ (ServerWakeupHandlerProcPtr)NoopDDA, 0)) |
333 |
-+ FatalError("RegisterBlockAndWakeupHandlers() failed\n"); |
334 |
-+} |
335 |
-+ |
336 |
-+#else |
337 |
- |
338 |
- static void vncBlockHandler(void * data, OSTimePtr t, void * readmask); |
339 |
- static void vncWakeupHandler(void * data, int nfds, void * readmask); |
340 |
-@@ -144,3 +161,5 @@ static void vncWriteWakeupHandlerFallback(void) |
341 |
- |
342 |
- vncWriteWakeupHandler(ret, &fallbackFds); |
343 |
- } |
344 |
-+ |
345 |
-+#endif |
346 |
-diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc |
347 |
-index dea3cb8..9d70e44 100644 |
348 |
---- a/unix/xserver/hw/vnc/vncExtInit.cc |
349 |
-+++ b/unix/xserver/hw/vnc/vncExtInit.cc |
350 |
-@@ -249,6 +249,17 @@ int vncExtensionIsActive(int scrIdx) |
351 |
- return (desktop[scrIdx] != NULL); |
352 |
- } |
353 |
- |
354 |
-+#if XORG >= 119 |
355 |
-+ |
356 |
-+void vncCallBlockHandlers(int* timeout) |
357 |
-+{ |
358 |
-+ for (int scr = 0; scr < vncGetScreenCount(); scr++) |
359 |
-+ if (desktop[scr]) |
360 |
-+ desktop[scr]->blockHandler(timeout); |
361 |
-+} |
362 |
-+ |
363 |
-+#else |
364 |
-+ |
365 |
- void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout) |
366 |
- { |
367 |
- for (int scr = 0; scr < vncGetScreenCount(); scr++) |
368 |
-@@ -277,6 +288,8 @@ void vncCallWriteWakeupHandlers(fd_set * fds, int nfds) |
369 |
- desktop[scr]->writeWakeupHandler(fds, nfds); |
370 |
- } |
371 |
- |
372 |
-+#endif |
373 |
-+ |
374 |
- int vncGetAvoidShiftNumLock(void) |
375 |
- { |
376 |
- return (bool)avoidShiftNumLock; |
377 |
-diff --git a/unix/xserver/hw/vnc/vncExtInit.h b/unix/xserver/hw/vnc/vncExtInit.h |
378 |
-index 9785d11..3164528 100644 |
379 |
---- a/unix/xserver/hw/vnc/vncExtInit.h |
380 |
-+++ b/unix/xserver/hw/vnc/vncExtInit.h |
381 |
-@@ -22,6 +22,7 @@ |
382 |
- #include <stdint.h> |
383 |
- #include <stddef.h> |
384 |
- #include <sys/select.h> |
385 |
-+#include "xorg-version.h" |
386 |
- |
387 |
- // Only from C++ |
388 |
- #ifdef __cplusplus |
389 |
-@@ -50,10 +51,14 @@ extern int vncInetdSock; |
390 |
- void vncExtensionInit(void); |
391 |
- int vncExtensionIsActive(int scrIdx); |
392 |
- |
393 |
-+#if XORG >= 119 |
394 |
-+void vncCallBlockHandlers(int* timeout); |
395 |
-+#else |
396 |
- void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout); |
397 |
- void vncCallReadWakeupHandlers(fd_set * fds, int nfds); |
398 |
- void vncCallWriteBlockHandlers(fd_set * fds, struct timeval ** timeout); |
399 |
- void vncCallWriteWakeupHandlers(fd_set * fds, int nfds); |
400 |
-+#endif |
401 |
- |
402 |
- int vncGetAvoidShiftNumLock(void); |
403 |
- |
404 |
-diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c |
405 |
-index 22ea9ea..29f3f8b 100644 |
406 |
---- a/unix/xserver/hw/vnc/vncHooks.c |
407 |
-+++ b/unix/xserver/hw/vnc/vncHooks.c |
408 |
-@@ -128,9 +128,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, |
409 |
- #if XORG <= 112 |
410 |
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, |
411 |
- pointer pReadmask); |
412 |
--#else |
413 |
-+#elif XORG <= 118 |
414 |
- static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout, |
415 |
- void * pReadmask); |
416 |
-+#else |
417 |
-+static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout); |
418 |
- #endif |
419 |
- #ifdef RENDER |
420 |
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, |
421 |
-@@ -716,9 +718,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, |
422 |
- #if XORG <= 112 |
423 |
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, |
424 |
- pointer pReadmask) |
425 |
--#else |
426 |
-+#elif XORG <= 118 |
427 |
- static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout, |
428 |
- void * pReadmask) |
429 |
-+#else |
430 |
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout) |
431 |
- #endif |
432 |
- { |
433 |
- #if XORG <= 112 |
434 |
-@@ -731,8 +735,10 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout, |
435 |
- |
436 |
- #if XORG <= 112 |
437 |
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); |
438 |
--#else |
439 |
-+#elif XORG <= 118 |
440 |
- (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); |
441 |
-+#else |
442 |
-+ (*pScreen->BlockHandler) (pScreen, pTimeout); |
443 |
- #endif |
444 |
- |
445 |
- vncHooksScreen->ignoreHooks--; |
446 |
-@@ -1033,12 +1039,21 @@ static void vncHooksCopyClip(GCPtr dst, GCPtr src) { |
447 |
- |
448 |
- // Unwrap and rewrap helpers |
449 |
- |
450 |
-+#if XORG >= 116 |
451 |
-+#define GC_OP_PROLOGUE(pGC, name)\ |
452 |
-+ vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\ |
453 |
-+ const GCFuncs *oldFuncs = pGC->funcs;\ |
454 |
-+ pGC->funcs = pGCPriv->wrappedFuncs;\ |
455 |
-+ pGC->ops = pGCPriv->wrappedOps; \ |
456 |
-+ DBGPRINT((stderr,"vncHooks" #name " called\n")) |
457 |
-+#else |
458 |
- #define GC_OP_PROLOGUE(pGC, name)\ |
459 |
- vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\ |
460 |
- GCFuncs *oldFuncs = pGC->funcs;\ |
461 |
- pGC->funcs = pGCPriv->wrappedFuncs;\ |
462 |
- pGC->ops = pGCPriv->wrappedOps; \ |
463 |
- DBGPRINT((stderr,"vncHooks" #name " called\n")) |
464 |
-+#endif |
465 |
- |
466 |
- #define GC_OP_EPILOGUE(pGC)\ |
467 |
- pGCPriv->wrappedOps = pGC->ops;\ |
468 |
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h |
469 |
-index 60610cb..9d1c0eb 100644 |
470 |
---- a/unix/xserver/hw/vnc/xorg-version.h |
471 |
-+++ b/unix/xserver/hw/vnc/xorg-version.h |
472 |
-@@ -50,8 +50,10 @@ |
473 |
- #define XORG 117 |
474 |
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000)) |
475 |
- #define XORG 118 |
476 |
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000)) |
477 |
-+#define XORG 119 |
478 |
- #else |
479 |
--#error "X.Org newer than 1.18 is not supported" |
480 |
-+#error "X.Org newer than 1.19 is not supported" |
481 |
- #endif |
482 |
- |
483 |
- #endif |
484 |
|
485 |
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild |
486 |
deleted file mode 100644 |
487 |
index 0f71cfb4d1b..00000000000 |
488 |
--- a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild |
489 |
+++ /dev/null |
490 |
@@ -1,189 +0,0 @@ |
491 |
-# Copyright 1999-2017 Gentoo Foundation |
492 |
-# Distributed under the terms of the GNU General Public License v2 |
493 |
- |
494 |
-EAPI="6" |
495 |
- |
496 |
-CMAKE_IN_SOURCE_BUILD=1 |
497 |
- |
498 |
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd |
499 |
- |
500 |
-XSERVER_VERSION="1.19.1" |
501 |
- |
502 |
-DESCRIPTION="Remote desktop viewer display system" |
503 |
-HOMEPAGE="http://www.tigervnc.org" |
504 |
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
505 |
- https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 |
506 |
- mirror://gentoo/${PN}.png |
507 |
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
508 |
- |
509 |
-LICENSE="GPL-2" |
510 |
-SLOT="0" |
511 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86" |
512 |
-IUSE="+drm gnutls java +opengl pam server +xorgmodule" |
513 |
- |
514 |
-CDEPEND="virtual/jpeg:0 |
515 |
- sys-libs/zlib |
516 |
- >=x11-libs/libXtst-1.0.99.2 |
517 |
- >=x11-libs/fltk-1.3.1 |
518 |
- gnutls? ( net-libs/gnutls:= ) |
519 |
- pam? ( virtual/pam ) |
520 |
- server? ( |
521 |
- dev-lang/perl |
522 |
- >=x11-libs/libXi-1.2.99.1 |
523 |
- >=x11-libs/libXfont-1.4.2 |
524 |
- >=x11-libs/libxkbfile-1.0.4 |
525 |
- x11-libs/libXrender |
526 |
- >=x11-libs/pixman-0.27.2 |
527 |
- >=x11-apps/xauth-1.0.3 |
528 |
- x11-apps/xsetroot |
529 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
530 |
- opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) |
531 |
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
532 |
- drm? ( x11-libs/libdrm ) |
533 |
- )" |
534 |
- |
535 |
-RDEPEND="${CDEPEND} |
536 |
- java? ( >=virtual/jre-1.5:* ) |
537 |
- !net-misc/vnc |
538 |
- !net-misc/tightvnc |
539 |
- !net-misc/xf4vnc" |
540 |
- |
541 |
-DEPEND="${CDEPEND} |
542 |
- amd64? ( dev-lang/nasm ) |
543 |
- x86? ( dev-lang/nasm ) |
544 |
- >=x11-proto/inputproto-2.2.99.1 |
545 |
- >=x11-proto/xextproto-7.2.99.901 |
546 |
- >=x11-proto/xproto-7.0.31 |
547 |
- x11-libs/libXfont2 |
548 |
- java? ( >=virtual/jdk-1.5 ) |
549 |
- server? ( |
550 |
- virtual/pkgconfig |
551 |
- media-fonts/font-util |
552 |
- x11-misc/util-macros |
553 |
- >=x11-proto/bigreqsproto-1.1.0 |
554 |
- >=x11-proto/compositeproto-0.4 |
555 |
- >=x11-proto/damageproto-1.1 |
556 |
- >=x11-proto/fixesproto-5.0 |
557 |
- >=x11-proto/fontsproto-2.1.3 |
558 |
- >=x11-proto/glproto-1.4.17 |
559 |
- >=x11-proto/randrproto-1.4.0 |
560 |
- >=x11-proto/renderproto-0.11 |
561 |
- >=x11-proto/resourceproto-1.2.0 |
562 |
- >=x11-proto/scrnsaverproto-1.1 |
563 |
- >=x11-proto/videoproto-2.2.2 |
564 |
- >=x11-proto/xcmiscproto-1.2.0 |
565 |
- >=x11-proto/xineramaproto-1.1.3 |
566 |
- >=x11-libs/xtrans-1.3.3 |
567 |
- >=x11-proto/dri2proto-2.8 |
568 |
- opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
569 |
- )" |
570 |
- |
571 |
-PATCHES=( |
572 |
- "${WORKDIR}"/patches/010_libvnc-os.patch |
573 |
- "${WORKDIR}"/patches/030_manpages.patch |
574 |
- "${WORKDIR}"/patches/055_xstartup.patch |
575 |
-) |
576 |
- |
577 |
-src_prepare() { |
578 |
- if use server ; then |
579 |
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die |
580 |
- fi |
581 |
- |
582 |
- cmake-utils_src_prepare |
583 |
- |
584 |
- if use server; then |
585 |
- eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch" |
586 |
- cd unix/xserver || die |
587 |
- eapply "${FILESDIR}/xserver119.patch" |
588 |
- eautoreconf |
589 |
- fi |
590 |
-} |
591 |
- |
592 |
-src_configure() { |
593 |
- use arm || use hppa && append-flags "-fPIC" |
594 |
- |
595 |
- local mycmakeargs=( |
596 |
- -DENABLE_GNUTLS=$(usex gnutls) |
597 |
- -DENABLE_PAM=$(usex pam) |
598 |
- -DBUILD_JAVA=$(usex java) |
599 |
- ) |
600 |
- |
601 |
- cmake-utils_src_configure |
602 |
- |
603 |
- if use server; then |
604 |
- cd unix/xserver || die |
605 |
- econf \ |
606 |
- $(use_enable opengl glx) \ |
607 |
- $(use_enable drm libdrm) \ |
608 |
- --disable-config-hal \ |
609 |
- --disable-config-udev \ |
610 |
- --disable-devel-docs \ |
611 |
- --disable-dmx \ |
612 |
- --disable-dri \ |
613 |
- --disable-dri3 \ |
614 |
- --disable-glamor \ |
615 |
- --disable-kdrive \ |
616 |
- --disable-libunwind \ |
617 |
- --disable-linux-acpi \ |
618 |
- --disable-record \ |
619 |
- --disable-selective-werror \ |
620 |
- --disable-silent-rules \ |
621 |
- --disable-static \ |
622 |
- --disable-tslib \ |
623 |
- --disable-unit-tests \ |
624 |
- --disable-xephyr \ |
625 |
- --disable-xinerama \ |
626 |
- --disable-xnest \ |
627 |
- --disable-xorg \ |
628 |
- --disable-xvfb \ |
629 |
- --disable-xwin \ |
630 |
- --disable-xwayland \ |
631 |
- --enable-dri2 \ |
632 |
- --with-pic \ |
633 |
- --without-dtrace \ |
634 |
- --disable-present \ |
635 |
- --disable-unit-tests |
636 |
- fi |
637 |
-} |
638 |
- |
639 |
-src_compile() { |
640 |
- cmake-utils_src_compile |
641 |
- |
642 |
- if use server; then |
643 |
- # deps of the vnc module and the module itself |
644 |
- local d subdirs=( |
645 |
- fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb |
646 |
- composite dix mi os hw/vnc |
647 |
- ) |
648 |
- for d in "${subdirs[@]}"; do |
649 |
- emake -C unix/xserver/"${d}" |
650 |
- done |
651 |
- fi |
652 |
-} |
653 |
- |
654 |
-src_install() { |
655 |
- cmake-utils_src_install |
656 |
- |
657 |
- newicon "${DISTDIR}"/tigervnc.png vncviewer.png |
658 |
- make_desktop_entry vncviewer vncviewer vncviewer Network |
659 |
- |
660 |
- if use server ; then |
661 |
- emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
662 |
- if ! use xorgmodule; then |
663 |
- rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die |
664 |
- else |
665 |
- rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
666 |
- fi |
667 |
- |
668 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
669 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
670 |
- systemd_douserunit contrib/systemd/user/vncserver@.service |
671 |
- else |
672 |
- local f |
673 |
- cd "${ED}" || die |
674 |
- for f in vncserver vncpasswd x0vncserver vncconfig; do |
675 |
- rm usr/bin/$f || die |
676 |
- rm usr/share/man/man1/$f.1 || die |
677 |
- done |
678 |
- fi |
679 |
-} |
680 |
|
681 |
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild |
682 |
deleted file mode 100644 |
683 |
index 3cac464560b..00000000000 |
684 |
--- a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild |
685 |
+++ /dev/null |
686 |
@@ -1,192 +0,0 @@ |
687 |
-# Copyright 1999-2017 Gentoo Foundation |
688 |
-# Distributed under the terms of the GNU General Public License v2 |
689 |
- |
690 |
-EAPI="6" |
691 |
- |
692 |
-CMAKE_IN_SOURCE_BUILD=1 |
693 |
- |
694 |
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd |
695 |
- |
696 |
-XSERVER_VERSION="1.19.1" |
697 |
- |
698 |
-DESCRIPTION="Remote desktop viewer display system" |
699 |
-HOMEPAGE="http://www.tigervnc.org" |
700 |
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
701 |
- https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 |
702 |
- mirror://gentoo/${PN}.png |
703 |
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
704 |
- |
705 |
-LICENSE="GPL-2" |
706 |
-SLOT="0" |
707 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" |
708 |
-IUSE="+drm gnutls nls java +opengl pam server +xorgmodule" |
709 |
- |
710 |
-CDEPEND="virtual/jpeg:0 |
711 |
- sys-libs/zlib |
712 |
- >=x11-libs/libXtst-1.0.99.2 |
713 |
- >=x11-libs/fltk-1.3.1 |
714 |
- gnutls? ( net-libs/gnutls:= ) |
715 |
- nls? ( virtual/libiconv ) |
716 |
- pam? ( virtual/pam ) |
717 |
- server? ( |
718 |
- dev-lang/perl |
719 |
- >=x11-libs/libXi-1.2.99.1 |
720 |
- >=x11-libs/libXfont-1.4.2 |
721 |
- >=x11-libs/libxkbfile-1.0.4 |
722 |
- x11-libs/libXrender |
723 |
- >=x11-libs/pixman-0.27.2 |
724 |
- >=x11-apps/xauth-1.0.3 |
725 |
- x11-apps/xsetroot |
726 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
727 |
- opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) |
728 |
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
729 |
- drm? ( x11-libs/libdrm ) |
730 |
- )" |
731 |
- |
732 |
-RDEPEND="${CDEPEND} |
733 |
- !net-misc/tightvnc |
734 |
- !net-misc/vnc |
735 |
- !net-misc/xf4vnc |
736 |
- java? ( >=virtual/jre-1.5:* )" |
737 |
- |
738 |
-DEPEND="${CDEPEND} |
739 |
- amd64? ( dev-lang/nasm ) |
740 |
- x86? ( dev-lang/nasm ) |
741 |
- >=x11-proto/inputproto-2.2.99.1 |
742 |
- >=x11-proto/xextproto-7.2.99.901 |
743 |
- >=x11-proto/xproto-7.0.31 |
744 |
- x11-libs/libXfont2 |
745 |
- nls? ( sys-devel/gettext ) |
746 |
- java? ( >=virtual/jdk-1.5 ) |
747 |
- server? ( |
748 |
- virtual/pkgconfig |
749 |
- media-fonts/font-util |
750 |
- x11-misc/util-macros |
751 |
- >=x11-proto/bigreqsproto-1.1.0 |
752 |
- >=x11-proto/compositeproto-0.4 |
753 |
- >=x11-proto/damageproto-1.1 |
754 |
- >=x11-proto/fixesproto-5.0 |
755 |
- >=x11-proto/fontsproto-2.1.3 |
756 |
- >=x11-proto/glproto-1.4.17 |
757 |
- >=x11-proto/randrproto-1.4.0 |
758 |
- >=x11-proto/renderproto-0.11 |
759 |
- >=x11-proto/resourceproto-1.2.0 |
760 |
- >=x11-proto/scrnsaverproto-1.1 |
761 |
- >=x11-proto/videoproto-2.2.2 |
762 |
- >=x11-proto/xcmiscproto-1.2.0 |
763 |
- >=x11-proto/xineramaproto-1.1.3 |
764 |
- >=x11-libs/xtrans-1.3.3 |
765 |
- >=x11-proto/dri2proto-2.8 |
766 |
- opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
767 |
- )" |
768 |
- |
769 |
-PATCHES=( |
770 |
- "${WORKDIR}"/patches/010_libvnc-os.patch |
771 |
- "${WORKDIR}"/patches/030_manpages.patch |
772 |
- "${WORKDIR}"/patches/055_xstartup.patch |
773 |
-) |
774 |
- |
775 |
-src_prepare() { |
776 |
- if use server ; then |
777 |
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die |
778 |
- fi |
779 |
- |
780 |
- cmake-utils_src_prepare |
781 |
- |
782 |
- if use server; then |
783 |
- eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch" |
784 |
- cd unix/xserver || die |
785 |
- eapply "${FILESDIR}/xserver119.patch" |
786 |
- eautoreconf |
787 |
- fi |
788 |
-} |
789 |
- |
790 |
-src_configure() { |
791 |
- use arm || use hppa && append-flags "-fPIC" |
792 |
- |
793 |
- local mycmakeargs=( |
794 |
- -DENABLE_GNUTLS=$(usex gnutls) |
795 |
- -DENABLE_NLS=$(usex nls) |
796 |
- -DENABLE_PAM=$(usex pam) |
797 |
- -DBUILD_JAVA=$(usex java) |
798 |
- ) |
799 |
- |
800 |
- cmake-utils_src_configure |
801 |
- |
802 |
- if use server; then |
803 |
- cd unix/xserver || die |
804 |
- econf \ |
805 |
- $(use_enable opengl glx) \ |
806 |
- $(use_enable drm libdrm) \ |
807 |
- --disable-config-hal \ |
808 |
- --disable-config-udev \ |
809 |
- --disable-devel-docs \ |
810 |
- --disable-dmx \ |
811 |
- --disable-dri \ |
812 |
- --disable-dri3 \ |
813 |
- --disable-glamor \ |
814 |
- --disable-kdrive \ |
815 |
- --disable-libunwind \ |
816 |
- --disable-linux-acpi \ |
817 |
- --disable-record \ |
818 |
- --disable-selective-werror \ |
819 |
- --disable-silent-rules \ |
820 |
- --disable-static \ |
821 |
- --disable-tslib \ |
822 |
- --disable-unit-tests \ |
823 |
- --disable-xephyr \ |
824 |
- --disable-xinerama \ |
825 |
- --disable-xnest \ |
826 |
- --disable-xorg \ |
827 |
- --disable-xvfb \ |
828 |
- --disable-xwin \ |
829 |
- --disable-xwayland \ |
830 |
- --enable-dri2 \ |
831 |
- --with-pic \ |
832 |
- --without-dtrace \ |
833 |
- --disable-present \ |
834 |
- --disable-unit-tests |
835 |
- fi |
836 |
-} |
837 |
- |
838 |
-src_compile() { |
839 |
- cmake-utils_src_compile |
840 |
- |
841 |
- if use server; then |
842 |
- # deps of the vnc module and the module itself |
843 |
- local d subdirs=( |
844 |
- fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb |
845 |
- composite dix mi os hw/vnc |
846 |
- ) |
847 |
- for d in "${subdirs[@]}"; do |
848 |
- emake -C unix/xserver/"${d}" |
849 |
- done |
850 |
- fi |
851 |
-} |
852 |
- |
853 |
-src_install() { |
854 |
- cmake-utils_src_install |
855 |
- |
856 |
- newicon "${DISTDIR}"/tigervnc.png vncviewer.png |
857 |
- make_desktop_entry vncviewer vncviewer vncviewer Network |
858 |
- |
859 |
- if use server ; then |
860 |
- emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
861 |
- if ! use xorgmodule; then |
862 |
- rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die |
863 |
- else |
864 |
- rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
865 |
- fi |
866 |
- |
867 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
868 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
869 |
- systemd_douserunit contrib/systemd/user/vncserver@.service |
870 |
- else |
871 |
- local f |
872 |
- cd "${ED}" || die |
873 |
- for f in vncserver x0vncserver vncconfig; do |
874 |
- rm usr/bin/$f || die |
875 |
- rm usr/share/man/man1/$f.1 || die |
876 |
- done |
877 |
- fi |
878 |
-} |